From 26255fadecd6551da4b27cf7aa3b0425ab675d79 Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 20 Nov 2024 00:23:20 +0100 Subject: [PATCH] drop v1 API and rename id columns --- core/authentication/api_v2.py | 41 +---- core/authentication/serializers.py | 32 ++++ core/core/urls.py | 3 - core/files/api_v1.py | 27 ---- core/files/media_v1.py | 65 -------- core/files/tests/v1/__init__.py | 0 core/files/tests/v1/test_files.py | 68 -------- core/inventory/api_v1.py | 150 ------------------ core/inventory/api_v2.py | 3 +- ...ntainer_id_rename_eid_event_id_and_more.py | 52 ++++++ .../migrations/0006_alter_event_table.py | 17 ++ core/inventory/models.py | 29 ++-- core/inventory/serializers.py | 20 +-- core/inventory/tests/v1/__init__.py | 0 core/inventory/tests/v1/test_api.py | 34 ---- core/inventory/tests/v1/test_containers.py | 59 ------- core/inventory/tests/v1/test_events.py | 56 ------- core/inventory/tests/v1/test_items.py | 133 ---------------- core/inventory/tests/v2/test_containers.py | 14 +- core/inventory/tests/v2/test_events.py | 4 +- core/inventory/tests/v2/test_items.py | 58 ++++--- 21 files changed, 179 insertions(+), 686 deletions(-) create mode 100644 core/authentication/serializers.py delete mode 100644 core/files/api_v1.py delete mode 100644 core/files/media_v1.py delete mode 100644 core/files/tests/v1/__init__.py delete mode 100644 core/files/tests/v1/test_files.py delete mode 100644 core/inventory/api_v1.py create mode 100644 core/inventory/migrations/0005_rename_cid_container_id_rename_eid_event_id_and_more.py create mode 100644 core/inventory/migrations/0006_alter_event_table.py delete mode 100644 core/inventory/tests/v1/__init__.py delete mode 100644 core/inventory/tests/v1/test_api.py delete mode 100644 core/inventory/tests/v1/test_containers.py delete mode 100644 core/inventory/tests/v1/test_events.py delete mode 100644 core/inventory/tests/v1/test_items.py diff --git a/core/authentication/api_v2.py b/core/authentication/api_v2.py index 514a697..2547b6d 100644 --- a/core/authentication/api_v2.py +++ b/core/authentication/api_v2.py @@ -12,25 +12,7 @@ from knox.models import AuthToken from knox.views import LoginView as KnoxLoginView from authentication.models import ExtendedUser - - -class UserSerializer(serializers.ModelSerializer): - permissions = serializers.SerializerMethodField() - groups = serializers.SlugRelatedField(many=True, read_only=True, slug_field='name') - - class Meta: - model = ExtendedUser - fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups') - read_only_fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups') - - def get_permissions(self, obj): - return list(set(obj.get_permissions())) - - -@receiver(post_save, sender=ExtendedUser) -def create_auth_token(sender, instance=None, created=False, **kwargs): - if created: - AuthToken.objects.create(user=instance) +from authentication.serializers import UserSerializer, GroupSerializer class UserViewSet(viewsets.ModelViewSet): @@ -38,26 +20,17 @@ class UserViewSet(viewsets.ModelViewSet): serializer_class = UserSerializer -class GroupSerializer(serializers.ModelSerializer): - permissions = serializers.SerializerMethodField() - members = serializers.SerializerMethodField() - - class Meta: - model = Group - fields = ('id', 'name', 'permissions', 'members') - - def get_permissions(self, obj): - return ["*:" + p.codename for p in obj.permissions.all()] - - def get_members(self, obj): - return [u.username for u in obj.user_set.all()] - - class GroupViewSet(viewsets.ModelViewSet): queryset = Group.objects.all() serializer_class = GroupSerializer +@receiver(post_save, sender=ExtendedUser) +def create_auth_token(sender, instance=None, created=False, **kwargs): + if created: + AuthToken.objects.create(user=instance) + + @api_view(['GET']) @permission_classes([IsAuthenticated]) def selfUser(request): diff --git a/core/authentication/serializers.py b/core/authentication/serializers.py new file mode 100644 index 0000000..0581865 --- /dev/null +++ b/core/authentication/serializers.py @@ -0,0 +1,32 @@ +from rest_framework import serializers +from django.contrib.auth.models import Group + +from authentication.models import ExtendedUser + + +class UserSerializer(serializers.ModelSerializer): + permissions = serializers.SerializerMethodField() + groups = serializers.SlugRelatedField(many=True, read_only=True, slug_field='name') + + class Meta: + model = ExtendedUser + fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups') + read_only_fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups') + + def get_permissions(self, obj): + return list(set(obj.get_permissions())) + + +class GroupSerializer(serializers.ModelSerializer): + permissions = serializers.SerializerMethodField() + members = serializers.SerializerMethodField() + + class Meta: + model = Group + fields = ('id', 'name', 'permissions', 'members') + + def get_permissions(self, obj): + return ["*:" + p.codename for p in obj.permissions.all()] + + def get_members(self, obj): + return [u.username for u in obj.user_set.all()] diff --git a/core/core/urls.py b/core/core/urls.py index df6e0d0..1c5f158 100644 --- a/core/core/urls.py +++ b/core/core/urls.py @@ -21,9 +21,6 @@ from .version import get_info urlpatterns = [ path('djangoadmin/', admin.site.urls), - path('api/1/', include('inventory.api_v1')), - path('api/1/', include('files.api_v1')), - path('api/1/', include('files.media_v1')), path('api/2/', include('inventory.api_v2')), path('api/2/', include('files.api_v2')), path('media/2/', include('files.media_v2')), diff --git a/core/files/api_v1.py b/core/files/api_v1.py deleted file mode 100644 index ce9730f..0000000 --- a/core/files/api_v1.py +++ /dev/null @@ -1,27 +0,0 @@ -from rest_framework import serializers, viewsets, routers - -from files.models import File - - -class FileSerializer(serializers.ModelSerializer): - data = serializers.CharField(max_length=1000000, write_only=True) - - class Meta: - model = File - fields = ['hash', 'data'] - read_only_fields = ['hash'] - - -class FileViewSet(viewsets.ModelViewSet): - serializer_class = FileSerializer - queryset = File.objects.all() - lookup_field = 'hash' - permission_classes = [] - authentication_classes = [] - - -router = routers.SimpleRouter(trailing_slash=False) -router.register(r'files', FileViewSet, basename='files') -router.register(r'file', FileViewSet, basename='files') - -urlpatterns = router.urls diff --git a/core/files/media_v1.py b/core/files/media_v1.py deleted file mode 100644 index d80ce64..0000000 --- a/core/files/media_v1.py +++ /dev/null @@ -1,65 +0,0 @@ -import os -from django.http import HttpResponse -from django.urls import path -from drf_yasg.utils import swagger_auto_schema -from rest_framework import status -from rest_framework.decorators import api_view, permission_classes, authentication_classes -from rest_framework.response import Response - -from core.settings import MEDIA_ROOT -from files.models import File - - -@swagger_auto_schema(method='GET', auto_schema=None) -@api_view(['GET']) -@permission_classes([]) -@authentication_classes([]) -def media_urls(request, hash): - try: - file = File.objects.get(hash=hash) - hash_path = file.file - return HttpResponse(status=status.HTTP_200_OK, - content_type=file.mime_type, - headers={ - 'X-Accel-Redirect': f'/redirect_media/{hash_path}', - 'Access-Control-Allow-Origin': '*', - }) # TODO Expires and Cache-Control - - except File.DoesNotExist: - return Response(status=status.HTTP_404_NOT_FOUND) - - -@swagger_auto_schema(method='GET', auto_schema=None) -@api_view(['GET']) -@permission_classes([]) -@authentication_classes([]) -def thumbnail_urls(request, hash): - size = 200 - try: - file = File.objects.get(hash=hash) - hash_path = file.file - if not os.path.exists(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}'): - from PIL import Image - image = Image.open(file.file) - image.thumbnail((size, size)) - rgb_image = image.convert('RGB') - thumb_dir = os.path.dirname(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}') - if not os.path.exists(thumb_dir): - os.makedirs(thumb_dir) - rgb_image.save(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}', 'jpeg', quality=90) - - return HttpResponse(status=status.HTTP_200_OK, - content_type="image/jpeg", - headers={ - 'X-Accel-Redirect': f'/redirect_thumbnail/{size}/{hash_path}', - 'Access-Control-Allow-Origin': '*', - }) # TODO Expires and Cache-Control - - except File.DoesNotExist: - return Response(status=status.HTTP_404_NOT_FOUND) - - -urlpatterns = [ - path('thumbs/', thumbnail_urls), - path('images/', media_urls), -] diff --git a/core/files/tests/v1/__init__.py b/core/files/tests/v1/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/core/files/tests/v1/test_files.py b/core/files/tests/v1/test_files.py deleted file mode 100644 index ce59b2c..0000000 --- a/core/files/tests/v1/test_files.py +++ /dev/null @@ -1,68 +0,0 @@ -from django.test import TestCase, Client -from django.core.files.base import ContentFile - -from files.models import File -from inventory.models import Event, Container, Item - -client = Client() - - -class FileTestCase(TestCase): - - def setUp(self): - super().setUp() - self.event = Event.objects.create(slug='EVENT', name='Event') - self.box = Container.objects.create(name='BOX') - - def test_create_file_raw(self): - from hashlib import sha256 - content = b"foo" - chash = sha256(content).hexdigest() - item = Item.objects.create(container=self.box, event=self.event, description='1') - file = File.objects.create(file=ContentFile(b"foo"), mime_type='text/plain', hash=chash, item=item) - file.save() - self.assertEqual(1, len(File.objects.all())) - self.assertEqual(content, File.objects.all()[0].file.read()) - self.assertEqual(chash, File.objects.all()[0].hash) - - def test_list_files(self): - import base64 - - item = File.objects.create(data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) - response = client.get('/api/1/files') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()[0]['hash'], item.hash) - self.assertEqual(len(response.json()[0]['hash']), 64) - self.assertEqual(len(File.objects.all()), 1) - self.assertEqual(File.objects.all()[0].file.read(), b"foo") - - def test_one_file(self): - import base64 - item = File.objects.create(data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) - response = client.get(f'/api/1/file/{item.hash}') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['hash'], item.hash) - self.assertEqual(len(response.json()['hash']), 64) - self.assertEqual(len(File.objects.all()), 1) - self.assertEqual(File.objects.all()[0].file.read(), b"foo") - - def test_create_file(self): - import base64 - Item.objects.create(container=self.box, event=self.event, description='1') - item = Item.objects.create(container=self.box, event=self.event, description='2') - response = client.post('/api/1/file', - {'data': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')}, - content_type='application/json') - self.assertEqual(response.status_code, 201) - self.assertEqual(len(response.json()['hash']), 64) - self.assertEqual(len(File.objects.all()), 1) - self.assertEqual(File.objects.all()[0].file.read(), b"foo") - - def test_delete_file(self): - import base64 - item = Item.objects.create(container=self.box, event=self.event, description='1') - File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) - file = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"bar").decode('utf-8')) - self.assertEqual(len(File.objects.all()), 2) - response = client.delete(f'/api/1/file/{file.hash}') - self.assertEqual(response.status_code, 204) diff --git a/core/inventory/api_v1.py b/core/inventory/api_v1.py deleted file mode 100644 index e9e670d..0000000 --- a/core/inventory/api_v1.py +++ /dev/null @@ -1,150 +0,0 @@ -from django.utils import timezone -from django.urls import re_path -from rest_framework import routers, viewsets, serializers -from rest_framework.decorators import api_view, permission_classes, authentication_classes -from rest_framework.response import Response - -from files.models import File -from inventory.models import Event, Container, Item -from inventory.serializers import EventSerializer, ContainerSerializer - - -class EventViewSet(viewsets.ModelViewSet): - serializer_class = EventSerializer - queryset = Event.objects.all() - permission_classes = [] - authentication_classes = [] - - -class ContainerViewSet(viewsets.ModelViewSet): - serializer_class = ContainerSerializer - queryset = Container.objects.all() - permission_classes = [] - authentication_classes = [] - - -class ItemSerializer(serializers.ModelSerializer): - dataImage = serializers.CharField(write_only=True, required=False) - cid = serializers.SerializerMethodField() - box = serializers.SerializerMethodField() - file = serializers.SerializerMethodField() - - class Meta: - model = Item - fields = ['cid', 'box', 'uid', 'description', 'file', 'dataImage'] - read_only_fields = ['uid'] - - def get_cid(self, instance): - return instance.container.cid - - def get_box(self, instance): - return instance.container.name - - def get_file(self, instance): - if len(instance.files.all()) > 0: - return instance.files.all().order_by('-created_at')[0].hash - return None - - def to_internal_value(self, data): - if 'cid' in data: - container = Container.objects.get(cid=data['cid']) - internal = super().to_internal_value(data) - internal['container'] = container - return internal - return super().to_internal_value(data) - - def validate(self, attrs): - return super().validate(attrs) - - def create(self, validated_data): - if 'dataImage' in validated_data: - file = File.objects.create(data=validated_data['dataImage']) - validated_data.pop('dataImage') - item = Item.objects.create(**validated_data) - item.files.set([file]) - return item - return Item.objects.create(**validated_data) - - def update(self, instance, validated_data): - if 'returned' in validated_data: - if validated_data['returned']: - validated_data['returned_at'] = timezone.now() - validated_data.pop('returned') - if 'dataImage' in validated_data: - file = File.objects.create(data=validated_data['dataImage']) - validated_data.pop('dataImage') - instance.files.add(file) - return super().update(instance, validated_data) - - -@api_view(['GET']) -@permission_classes([]) -@authentication_classes([]) -def search_items(request, event_slug, query): - try: - event = Event.objects.get(slug=event_slug) - query_tokens = query.split(' ') - q = Item.objects.filter(event=event) - for token in query_tokens: - if token: - q = q.filter(description__icontains=token) - return Response(ItemSerializer(q, many=True).data) - except Event.DoesNotExist: - return Response(status=404) - - -@api_view(['GET', 'POST']) -@permission_classes([]) -@authentication_classes([]) -def item(request, event_slug): - try: - event = Event.objects.get(slug=event_slug) - if request.method == 'GET': - return Response(ItemSerializer(Item.objects.filter(event=event), many=True).data) - elif request.method == 'POST': - validated_data = ItemSerializer(data=request.data) - if validated_data.is_valid(): - validated_data.save(event=event) - return Response(validated_data.data, status=201) - except Event.DoesNotExist: - return Response(status=404) - - -@api_view(['GET', 'PUT', 'DELETE']) -@permission_classes([]) -@authentication_classes([]) -def item_by_id(request, event_slug, id): - try: - event = Event.objects.get(slug=event_slug) - item = Item.objects.get(event=event, uid=id) - if request.method == 'GET': - return Response(ItemSerializer(item).data) - elif request.method == 'PUT': - validated_data = ItemSerializer(item, data=request.data) - if validated_data.is_valid(): - validated_data.save() - return Response(validated_data.data) - elif request.method == 'DELETE': - item.delete() - return Response(status=204) - except Item.DoesNotExist: - return Response(status=404) - except Event.DoesNotExist: - return Response(status=404) - - -urlpatterns = [ - re_path('events/?$', EventViewSet.as_view({'get': 'list', 'post': 'create'})), - re_path('events/(?P[0-9]+)/?$', - EventViewSet.as_view({'get': 'retrieve', 'put': 'update', 'delete': 'destroy'})), - re_path('boxes/?$', ContainerViewSet.as_view({'get': 'list', 'post': 'create'})), - re_path('boxes/(?P[0-9]+)/?$', - ContainerViewSet.as_view({'get': 'retrieve', 'put': 'update', 'delete': 'destroy'})), - re_path('box/?$', ContainerViewSet.as_view({'get': 'list', 'post': 'create'})), - re_path('box/(?P[0-9]+)/?$', - ContainerViewSet.as_view({'get': 'retrieve', 'put': 'update', 'delete': 'destroy'})), - re_path('(?P[a-zA-Z0-9]+)/items/?$', item), - re_path('(?P[a-zA-Z0-9]+)/items/(?P[^/]+)/?$', search_items), - re_path('(?P[a-zA-Z0-9]+)/item/?$', item), - re_path('(?P[a-zA-Z0-9]+)/item/(?P[0-9]+)/?$', item_by_id), -] diff --git a/core/inventory/api_v2.py b/core/inventory/api_v2.py index b539e97..f853b47 100644 --- a/core/inventory/api_v2.py +++ b/core/inventory/api_v2.py @@ -54,6 +54,7 @@ def item(request, event_slug): if validated_data.is_valid(): validated_data.save(event=event) return Response(validated_data.data, status=201) + return Response(status=400) except Event.DoesNotExist: return Response(status=404) @@ -63,7 +64,7 @@ def item(request, event_slug): def item_by_id(request, event_slug, id): try: event = Event.objects.get(slug=event_slug) - item = Item.objects.get(event=event, uid=id) + item = Item.objects.get(event=event, id=id) if request.method == 'GET': if not request.user.has_event_perm(event, 'view_item'): return Response(status=403) diff --git a/core/inventory/migrations/0005_rename_cid_container_id_rename_eid_event_id_and_more.py b/core/inventory/migrations/0005_rename_cid_container_id_rename_eid_event_id_and_more.py new file mode 100644 index 0000000..fcd4b8d --- /dev/null +++ b/core/inventory/migrations/0005_rename_cid_container_id_rename_eid_event_id_and_more.py @@ -0,0 +1,52 @@ +# Generated by Django 4.2.7 on 2024-11-19 22:56 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0004_alter_event_created_at_alter_item_created_at'), + ] + + operations = [ + migrations.RenameField( + model_name='container', + old_name='cid', + new_name='id', + ), + migrations.RenameField( + model_name='event', + old_name='eid', + new_name='id', + ), + migrations.RenameField( + model_name='item', + old_name='iid', + new_name='id', + ), + migrations.RenameField( + model_name='item', + old_name='uid', + new_name='uid_deprecated', + ), + migrations.AlterUniqueTogether( + name='item', + unique_together=set(), + ), + migrations.AlterField( + model_name='item', + name='container', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inventory.container'), + ), + migrations.AlterField( + model_name='item', + name='event', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inventory.event'), + ), + migrations.AlterUniqueTogether( + name='item', + unique_together={('uid_deprecated', 'event')}, + ), + ] diff --git a/core/inventory/migrations/0006_alter_event_table.py b/core/inventory/migrations/0006_alter_event_table.py new file mode 100644 index 0000000..2fa421a --- /dev/null +++ b/core/inventory/migrations/0006_alter_event_table.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.7 on 2024-11-20 01:39 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0005_rename_cid_container_id_rename_eid_event_id_and_more'), + ] + + operations = [ + migrations.AlterModelTable( + name='event', + table='common_event', + ), + ] diff --git a/core/inventory/models.py b/core/inventory/models.py index 8b3d018..5a10202 100644 --- a/core/inventory/models.py +++ b/core/inventory/models.py @@ -6,10 +6,10 @@ from django_softdelete.models import SoftDeleteModel, SoftDeleteManager class ItemManager(SoftDeleteManager): def create(self, **kwargs): - if 'uid' in kwargs: - raise ValueError('uid must not be set manually') - uid = Item.all_objects.filter(event=kwargs['event']).count() + 1 - kwargs['uid'] = uid + if 'uid_deprecated' in kwargs: + raise ValueError('uid_deprecated must not be set manually') + uid_deprecated = Item.all_objects.filter(event=kwargs['event']).count() + 1 + kwargs['uid_deprecated'] = uid_deprecated return super().create(**kwargs) def get_queryset(self): @@ -17,11 +17,11 @@ class ItemManager(SoftDeleteManager): class Item(SoftDeleteModel): - iid = models.AutoField(primary_key=True) - uid = models.IntegerField() + id = models.AutoField(primary_key=True) + uid_deprecated = models.IntegerField() description = models.TextField() - event = models.ForeignKey('Event', models.CASCADE, db_column='eid') - container = models.ForeignKey('Container', models.CASCADE, db_column='cid') + event = models.ForeignKey('Event', models.CASCADE) + container = models.ForeignKey('Container', models.CASCADE) returned_at = models.DateTimeField(blank=True, null=True) created_at = models.DateTimeField(null=True, auto_now_add=True) updated_at = models.DateTimeField(blank=True, null=True) @@ -30,27 +30,27 @@ class Item(SoftDeleteModel): all_objects = models.Manager() class Meta: - unique_together = (('uid', 'event'),) + unique_together = (('uid_deprecated', 'event'),) permissions = [ ('match_item', 'Can match item') ] def __str__(self): - return '[' + str(self.uid) + ']' + self.description + return '[' + str(self.id) + ']' + self.description class Container(SoftDeleteModel): - cid = models.AutoField(primary_key=True) + id = models.AutoField(primary_key=True) name = models.CharField(max_length=255) created_at = models.DateTimeField(blank=True, null=True) updated_at = models.DateTimeField(blank=True, null=True) def __str__(self): - return '[' + str(self.cid) + ']' + self.name + return '[' + str(self.id) + ']' + self.name class Event(models.Model): - eid = models.AutoField(primary_key=True) + id = models.AutoField(primary_key=True) name = models.CharField(max_length=255) slug = models.CharField(max_length=255, unique=True) start = models.DateTimeField(blank=True, null=True) @@ -62,3 +62,6 @@ class Event(models.Model): def __str__(self): return '[' + str(self.slug) + ']' + self.name + + class Meta: + db_table = 'common_event' \ No newline at end of file diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 3c0eb7e..0230644 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -17,8 +17,8 @@ class EventSerializer(serializers.ModelSerializer): class Meta: model = Event - fields = ['eid', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] - read_only_fields = ['eid'] + fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] + read_only_fields = ['id'] class ContainerSerializer(serializers.ModelSerializer): @@ -26,11 +26,11 @@ class ContainerSerializer(serializers.ModelSerializer): class Meta: model = Container - fields = ['cid', 'name', 'itemCount'] - read_only_fields = ['cid', 'itemCount'] + fields = ['id', 'name', 'itemCount'] + read_only_fields = ['id', 'itemCount'] def get_itemCount(self, instance): - return Item.objects.filter(container=instance.cid).count() + return Item.objects.filter(container=instance.id).count() class ItemSerializer(serializers.ModelSerializer): @@ -44,11 +44,11 @@ class ItemSerializer(serializers.ModelSerializer): class Meta: model = Item - fields = ['cid', 'box', 'uid', 'description', 'file', 'dataImage', 'returned', 'event'] - read_only_fields = ['uid'] + fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event'] + read_only_fields = ['id'] def get_cid(self, instance): - return instance.container.cid + return instance.container.id def get_box(self, instance): return instance.container.name @@ -65,7 +65,7 @@ class ItemSerializer(serializers.ModelSerializer): container = None returned = False if 'cid' in data: - container = Container.objects.get(cid=data['cid']) + container = Container.objects.get(id=data['cid']) if 'returned' in data: returned = data['returned'] internal = super().to_internal_value(data) @@ -76,6 +76,8 @@ class ItemSerializer(serializers.ModelSerializer): return internal def validate(self, attrs): + if not 'container' in attrs and not self.partial: + raise serializers.ValidationError("This field cannot be empty.") return super().validate(attrs) def create(self, validated_data): diff --git a/core/inventory/tests/v1/__init__.py b/core/inventory/tests/v1/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/core/inventory/tests/v1/test_api.py b/core/inventory/tests/v1/test_api.py deleted file mode 100644 index db1df0a..0000000 --- a/core/inventory/tests/v1/test_api.py +++ /dev/null @@ -1,34 +0,0 @@ -from django.test import TestCase, Client - -client = Client() - - -class ApiTest(TestCase): - - def test_root(self): - from core.settings import SYSTEM3_VERSION - response = client.get('/api/') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()["framework_version"], SYSTEM3_VERSION) - - def test_events(self): - response = client.get('/api/1/events') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), []) - - def test_containers(self): - response = client.get('/api/1/boxes') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), []) - - def test_files(self): - response = client.get('/api/1/files') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), []) - - def test_items(self): - from inventory.models import Event - Event.objects.create(slug='TEST1', name='Event') - response = client.get('/api/1/TEST1/items') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), []) diff --git a/core/inventory/tests/v1/test_containers.py b/core/inventory/tests/v1/test_containers.py deleted file mode 100644 index 78b82c1..0000000 --- a/core/inventory/tests/v1/test_containers.py +++ /dev/null @@ -1,59 +0,0 @@ -from django.test import TestCase, Client -from inventory.models import Container - -client = Client() - - -class ContainerTestCase(TestCase): - - def test_empty(self): - response = client.get('/api/1/boxes') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), []) - - def test_members(self): - Container.objects.create(name='BOX') - response = client.get('/api/1/boxes') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]['cid'], 1) - self.assertEqual(response.json()[0]['name'], 'BOX') - self.assertEqual(response.json()[0]['itemCount'], 0) - - def test_multi_members(self): - Container.objects.create(name='BOX 1') - Container.objects.create(name='BOX 2') - Container.objects.create(name='BOX 3') - response = client.get('/api/1/boxes') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 3) - - def test_create_container(self): - response = client.post('/api/1/box', {'name': 'BOX'}) - self.assertEqual(response.status_code, 201) - self.assertEqual(response.json()['cid'], 1) - self.assertEqual(response.json()['name'], 'BOX') - self.assertEqual(response.json()['itemCount'], 0) - self.assertEqual(len(Container.objects.all()), 1) - self.assertEqual(Container.objects.all()[0].cid, 1) - self.assertEqual(Container.objects.all()[0].name, 'BOX') - - def test_update_container(self): - from rest_framework.test import APIClient - box = Container.objects.create(name='BOX 1') - response = APIClient().put(f'/api/1/box/{box.cid}', {'name': 'BOX 2'}) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['cid'], 1) - self.assertEqual(response.json()['name'], 'BOX 2') - self.assertEqual(response.json()['itemCount'], 0) - self.assertEqual(len(Container.objects.all()), 1) - self.assertEqual(Container.objects.all()[0].cid, 1) - self.assertEqual(Container.objects.all()[0].name, 'BOX 2') - - def test_delete_container(self): - box = Container.objects.create(name='BOX 1') - Container.objects.create(name='BOX 2') - self.assertEqual(len(Container.objects.all()), 2) - response = client.delete(f'/api/1/box/{box.cid}') - self.assertEqual(response.status_code, 204) - self.assertEqual(len(Container.objects.all()), 1) diff --git a/core/inventory/tests/v1/test_events.py b/core/inventory/tests/v1/test_events.py deleted file mode 100644 index a861f12..0000000 --- a/core/inventory/tests/v1/test_events.py +++ /dev/null @@ -1,56 +0,0 @@ -from django.test import TestCase, Client -from inventory.models import Event - -client = Client() - - -class EventTestCase(TestCase): - - def test_empty(self): - response = client.get('/api/1/events') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), []) - - def test_members(self): - Event.objects.create(slug='EVENT', name='Event') - response = client.get('/api/1/events') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]['slug'], 'EVENT') - self.assertEqual(response.json()[0]['name'], 'Event') - - def test_multi_members(self): - Event.objects.create(slug='EVENT1', name='Event 1') - Event.objects.create(slug='EVENT2', name='Event 2') - Event.objects.create(slug='EVENT3', name='Event 3') - response = client.get('/api/1/events') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 3) - - def test_create_event(self): - response = client.post('/api/1/events', {'slug': 'EVENT', 'name': 'Event'}) - self.assertEqual(response.status_code, 201) - self.assertEqual(response.json()['slug'], 'EVENT') - self.assertEqual(response.json()['name'], 'Event') - self.assertEqual(len(Event.objects.all()), 1) - self.assertEqual(Event.objects.all()[0].slug, 'EVENT') - self.assertEqual(Event.objects.all()[0].name, 'Event') - - def test_update_event(self): - from rest_framework.test import APIClient - event = Event.objects.create(slug='EVENT1', name='Event 1') - response = APIClient().put(f'/api/1/events/{event.eid}', {'slug': 'EVENT2', 'name': 'Event 2 new'}) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['slug'], 'EVENT2') - self.assertEqual(response.json()['name'], 'Event 2 new') - self.assertEqual(len(Event.objects.all()), 1) - self.assertEqual(Event.objects.all()[0].slug, 'EVENT2') - self.assertEqual(Event.objects.all()[0].name, 'Event 2 new') - - def test_remove_event(self): - event = Event.objects.create(slug='EVENT1', name='Event 1') - Event.objects.create(slug='EVENT2', name='Event 2') - self.assertEqual(len(Event.objects.all()), 2) - response = client.delete(f'/api/1/events/{event.eid}') - self.assertEqual(response.status_code, 204) - self.assertEqual(len(Event.objects.all()), 1) diff --git a/core/inventory/tests/v1/test_items.py b/core/inventory/tests/v1/test_items.py deleted file mode 100644 index e13bcba..0000000 --- a/core/inventory/tests/v1/test_items.py +++ /dev/null @@ -1,133 +0,0 @@ -from django.test import TestCase, Client - -from files.models import File -from inventory.models import Event, Container, Item - -client = Client() - - -class ItemTestCase(TestCase): - - def setUp(self): - super().setUp() - self.event = Event.objects.create(slug='EVENT', name='Event') - self.box = Container.objects.create(name='BOX') - - def test_empty(self): - response = client.get(f'/api/1/{self.event.slug}/item') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, b'[]') - - def test_members(self): - item = Item.objects.create(container=self.box, event=self.event, description='1') - response = client.get(f'/api/1/{self.event.slug}/item') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), - [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None}]) - - def test_members_with_file(self): - import base64 - item = Item.objects.create(container=self.box, event=self.event, description='1') - file = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) - response = client.get(f'/api/1/{self.event.slug}/item') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), - [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': file.hash}]) - - def test_multi_members(self): - Item.objects.create(container=self.box, event=self.event, description='1') - Item.objects.create(container=self.box, event=self.event, description='2') - Item.objects.create(container=self.box, event=self.event, description='3') - response = client.get(f'/api/1/{self.event.slug}/item') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 3) - - def test_create_item(self): - response = client.post(f'/api/1/{self.event.slug}/item', {'cid': self.box.cid, 'description': '1'}) - self.assertEqual(response.status_code, 201) - self.assertEqual(response.json(), - {'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None}) - self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) - self.assertEqual(Item.objects.all()[0].description, '1') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) - - def test_create_item_with_file(self): - import base64 - response = client.post(f'/api/1/{self.event.slug}/item', - {'cid': self.box.cid, 'description': '1', - 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode( - 'utf-8')}, content_type='application/json') - self.assertEqual(response.status_code, 201) - self.assertEqual(response.json()['uid'], 1) - self.assertEqual(response.json()['description'], '1') - self.assertEqual(response.json()['box'], 'BOX') - self.assertEqual(response.json()['cid'], self.box.cid) - self.assertEqual(len(response.json()['file']), 64) - self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) - self.assertEqual(Item.objects.all()[0].description, '1') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) - self.assertEqual(len(File.objects.all()), 1) - - def test_update_item(self): - item = Item.objects.create(container=self.box, event=self.event, description='1') - response = client.put(f'/api/1/{self.event.slug}/item/{item.uid}', {'description': '2'}, - content_type='application/json') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), - {'uid': 1, 'description': '2', 'box': 'BOX', 'cid': self.box.cid, 'file': None}) - self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) - self.assertEqual(Item.objects.all()[0].description, '2') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) - - def test_update_item_with_file(self): - import base64 - item = Item.objects.create(container=self.box, event=self.event, description='1') - response = client.put(f'/api/1/{self.event.slug}/item/{item.uid}', - {'description': '2', - 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')}, - content_type='application/json') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['uid'], 1) - self.assertEqual(response.json()['description'], '2') - self.assertEqual(response.json()['box'], 'BOX') - self.assertEqual(response.json()['cid'], self.box.cid) - self.assertEqual(len(response.json()['file']), 64) - self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) - self.assertEqual(Item.objects.all()[0].description, '2') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) - self.assertEqual(len(File.objects.all()), 1) - - def test_delete_item(self): - item = Item.objects.create(container=self.box, event=self.event, description='1') - Item.objects.create(container=self.box, event=self.event, description='2') - self.assertEqual(len(Item.objects.all()), 2) - response = client.delete(f'/api/1/{self.event.slug}/item/{item.uid}') - self.assertEqual(response.status_code, 204) - self.assertEqual(len(Item.objects.all()), 1) - - def test_delete_item2(self): - Item.objects.create(container=self.box, event=self.event, description='1') - item2 = Item.objects.create(container=self.box, event=self.event, description='2') - self.assertEqual(len(Item.objects.all()), 2) - response = client.delete(f'/api/1/{self.event.slug}/item/{item2.uid}') - self.assertEqual(response.status_code, 204) - self.assertEqual(len(Item.objects.all()), 1) - item3 = Item.objects.create(container=self.box, event=self.event, description='3') - self.assertEqual(item3.uid, 3) - self.assertEqual(len(Item.objects.all()), 2) - - def test_item_count(self): - Item.objects.create(container=self.box, event=self.event, description='1') - Item.objects.create(container=self.box, event=self.event, description='2') - response = client.get('/api/1/boxes') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]['itemCount'], 2) - - def test_item_nonexistent(self): - response = client.get(f'/api/1/NOEVENT/item') - self.assertEqual(response.status_code, 404) diff --git a/core/inventory/tests/v2/test_containers.py b/core/inventory/tests/v2/test_containers.py index 58322cc..b74a4a7 100644 --- a/core/inventory/tests/v2/test_containers.py +++ b/core/inventory/tests/v2/test_containers.py @@ -24,7 +24,7 @@ class ContainerTestCase(TestCase): response = self.client.get('/api/2/boxes/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]['cid'], 1) + self.assertEqual(response.json()[0]['id'], 1) self.assertEqual(response.json()[0]['name'], 'BOX') self.assertEqual(response.json()[0]['itemCount'], 0) @@ -39,28 +39,28 @@ class ContainerTestCase(TestCase): def test_create_container(self): response = self.client.post('/api/2/box/', {'name': 'BOX'}) self.assertEqual(response.status_code, 201) - self.assertEqual(response.json()['cid'], 1) + self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['name'], 'BOX') self.assertEqual(response.json()['itemCount'], 0) self.assertEqual(len(Container.objects.all()), 1) - self.assertEqual(Container.objects.all()[0].cid, 1) + self.assertEqual(Container.objects.all()[0].id, 1) self.assertEqual(Container.objects.all()[0].name, 'BOX') def test_update_container(self): box = Container.objects.create(name='BOX 1') - response = self.client.put(f'/api/2/box/{box.cid}/', {'name': 'BOX 2'}, content_type='application/json') + response = self.client.put(f'/api/2/box/{box.id}/', {'name': 'BOX 2'}, content_type='application/json') self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['cid'], 1) + self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['name'], 'BOX 2') self.assertEqual(response.json()['itemCount'], 0) self.assertEqual(len(Container.objects.all()), 1) - self.assertEqual(Container.objects.all()[0].cid, 1) + self.assertEqual(Container.objects.all()[0].id, 1) self.assertEqual(Container.objects.all()[0].name, 'BOX 2') def test_delete_container(self): box = Container.objects.create(name='BOX 1') Container.objects.create(name='BOX 2') self.assertEqual(len(Container.objects.all()), 2) - response = self.client.delete(f'/api/2/box/{box.cid}/') + response = self.client.delete(f'/api/2/box/{box.id}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Container.objects.all()), 1) diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index affbd0e..6d6cadb 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -39,7 +39,7 @@ class EventTestCase(TestCase): def test_update_event(self): from rest_framework.test import APIClient event = Event.objects.create(slug='EVENT1', name='Event 1') - response = APIClient().put(f'/api/2/events/{event.eid}/', {'slug': 'EVENT2', 'name': 'Event 2 new'}) + response = APIClient().put(f'/api/2/events/{event.id}/', {'slug': 'EVENT2', 'name': 'Event 2 new'}) self.assertEqual(response.status_code, 200) self.assertEqual(response.json()['slug'], 'EVENT2') self.assertEqual(response.json()['name'], 'Event 2 new') @@ -51,7 +51,7 @@ class EventTestCase(TestCase): event = Event.objects.create(slug='EVENT1', name='Event 1') Event.objects.create(slug='EVENT2', name='Event 2') self.assertEqual(len(Event.objects.all()), 2) - response = client.delete(f'/api/2/events/{event.eid}/') + response = client.delete(f'/api/2/events/{event.id}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Event.objects.all()), 1) diff --git a/core/inventory/tests/v2/test_items.py b/core/inventory/tests/v2/test_items.py index a955161..1832872 100644 --- a/core/inventory/tests/v2/test_items.py +++ b/core/inventory/tests/v2/test_items.py @@ -29,7 +29,7 @@ class ItemTestCase(TestCase): response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(response.json(), - [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None, + [{'id': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.id, 'file': None, 'returned': False, 'event': self.event.slug}]) def test_members_with_file(self): @@ -39,7 +39,7 @@ class ItemTestCase(TestCase): response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(response.json(), - [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': file.hash, + [{'id': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.id, 'file': file.hash, 'returned': False, 'event': self.event.slug}]) def test_multi_members(self): @@ -51,71 +51,79 @@ class ItemTestCase(TestCase): self.assertEqual(len(response.json()), 3) def test_create_item(self): - response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.cid, 'description': '1'}) + response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.id, 'description': '1'}) self.assertEqual(response.status_code, 201) self.assertEqual(response.json(), - {'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None, + {'id': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.id, 'file': None, 'returned': False, 'event': self.event.slug}) self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) + self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '1') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) + + def test_create_item_without_container(self): + response = self.client.post(f'/api/2/{self.event.slug}/item/', {'description': '1'}) + self.assertEqual(response.status_code, 400) + + def test_create_item_without_description(self): + response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.id}) + self.assertEqual(response.status_code, 400) def test_create_item_with_file(self): import base64 response = self.client.post(f'/api/2/{self.event.slug}/item/', - {'cid': self.box.cid, 'description': '1', + {'cid': self.box.id, 'description': '1', 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode( 'utf-8')}, content_type='application/json') self.assertEqual(response.status_code, 201) - self.assertEqual(response.json()['uid'], 1) + self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['description'], '1') self.assertEqual(response.json()['box'], 'BOX') - self.assertEqual(response.json()['cid'], self.box.cid) + self.assertEqual(response.json()['id'], self.box.id) self.assertEqual(len(response.json()['file']), 64) self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) + self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '1') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) self.assertEqual(len(File.objects.all()), 1) def test_update_item(self): item = Item.objects.create(container=self.box, event=self.event, description='1') - response = self.client.put(f'/api/2/{self.event.slug}/item/{item.uid}/', {'description': '2'}, + response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', {'description': '2'}, content_type='application/json') self.assertEqual(response.status_code, 200) self.assertEqual(response.json(), - {'uid': 1, 'description': '2', 'box': 'BOX', 'cid': self.box.cid, 'file': None, + {'id': 1, 'description': '2', 'box': 'BOX', 'cid': self.box.id, 'file': None, 'returned': False, 'event': self.event.slug}) self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) + self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '2') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) def test_update_item_with_file(self): import base64 item = Item.objects.create(container=self.box, event=self.event, description='1') - response = self.client.put(f'/api/2/{self.event.slug}/item/{item.uid}/', + response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', {'description': '2', 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')}, content_type='application/json') self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['uid'], 1) + self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['description'], '2') self.assertEqual(response.json()['box'], 'BOX') - self.assertEqual(response.json()['cid'], self.box.cid) + self.assertEqual(response.json()['id'], self.box.id) self.assertEqual(len(response.json()['file']), 64) self.assertEqual(len(Item.objects.all()), 1) - self.assertEqual(Item.objects.all()[0].uid, 1) + self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '2') - self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) self.assertEqual(len(File.objects.all()), 1) def test_delete_item(self): item = Item.objects.create(container=self.box, event=self.event, description='1') Item.objects.create(container=self.box, event=self.event, description='2') self.assertEqual(len(Item.objects.all()), 2) - response = self.client.delete(f'/api/2/{self.event.slug}/item/{item.uid}/') + response = self.client.delete(f'/api/2/{self.event.slug}/item/{item.id}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Item.objects.all()), 1) @@ -123,11 +131,11 @@ class ItemTestCase(TestCase): Item.objects.create(container=self.box, event=self.event, description='1') item2 = Item.objects.create(container=self.box, event=self.event, description='2') self.assertEqual(len(Item.objects.all()), 2) - response = self.client.delete(f'/api/2/{self.event.slug}/item/{item2.uid}/') + response = self.client.delete(f'/api/2/{self.event.slug}/item/{item2.id}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Item.objects.all()), 1) item3 = Item.objects.create(container=self.box, event=self.event, description='3') - self.assertEqual(item3.uid, 3) + self.assertEqual(item3.id, 3) self.assertEqual(len(Item.objects.all()), 2) def test_item_count(self): @@ -148,7 +156,7 @@ class ItemTestCase(TestCase): response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 1) - response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.uid}/', {'returned': True}, + response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', {'returned': True}, content_type='application/json') self.assertEqual(response.status_code, 200) item.refresh_from_db() @@ -168,4 +176,4 @@ class ItemTestCase(TestCase): response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]['uid'], item1.uid) + self.assertEqual(response.json()[0]['id'], item1.id)