Use uuid instead of id for User

Author: epou

api/serializers.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from typing import Literal, Optional
-import uuid
+from uuid import UUID
 
 from django.contrib.auth import get_user_model
 from django.db import transaction
@@ -52,15 +52,19 @@
 
 class SimpleRegularUserSerializer(serializers.ModelSerializer):
 
+    uuid = serializers.SerializerMethodField()
     full_name = serializers.SerializerMethodField()
 
+    def get_uuid(self, obj) -> UUID:
+        return UUID(int=obj.pk)
+
     def get_full_name(self, obj) -> str:
         return obj.get_full_name()
 
     class Meta:
         model = User
         fields = (
-            'id',
+            'uuid',
             'username',
             'first_name',
             'last_name',
@@ -151,7 +155,7 @@ def to_representation(self, instance):
         if isinstance(instance, User):
             # NOTE: this must be the same structure as defined.
             data = {}
-            data['uuid'] = uuid.UUID(int=instance.pk)
+            data['uuid'] = UUID(int=instance.pk)
             data['username'] = instance.get_username()
             data['registration_time'] = instance.date_joined
             data['locale'] = 'en'
@@ -717,7 +721,7 @@ def to_representation(self, instance):
             'app_label': UserStat._meta.app_label,
             'model_name': UserStat._meta.model_name
         }):
-            new_instance = User(id=-1, username='expert', first_name='Expert', last_name='Annotator')
+            new_instance = User(id=0, username='expert', first_name='Expert', last_name='Annotator')
 
         return super().to_representation(new_instance)
 

api/tests/integration/identification_tasks/annotations/create.tavern.yml

@@ -69,7 +69,7 @@ stages:
         id: !anyint
         observation_uuid: "{identification_task.report.pk}"
         user:
-          id: !int "{user.pk}"
+          uuid: !re_fullmatch "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
           username: "{user.username}"
           first_name: "{user.first_name}"
           last_name: "{user.last_name}"
@@ -133,7 +133,7 @@ stages:
         id: !anyint
         observation_uuid: "{identification_task.report.pk}"
         user:
-          id: !int "{user.pk}"
+          uuid: !re_fullmatch "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
           username: "{user.username}"
           first_name: "{user.first_name}"
           last_name: "{user.last_name}"

api/tests/integration/identification_tasks/annotations/get.tavern.yml

@@ -164,7 +164,7 @@ stages:
         - json:off
       json:
         user:
-          id: !int "{user.pk}"
+          uuid: !re_fullmatch "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
           username: "{user.username}"
           first_name: "{user.first_name}"
           last_name: "{user.last_name}"
@@ -197,7 +197,7 @@ stages:
         - json:off
       json:
         user:
-          id: -1
+          uuid: '00000000-0000-0000-0000-000000000000'
           username: 'expert'
           first_name: 'Expert'
           last_name: 'Annotator'
@@ -232,7 +232,7 @@ stages:
         - json:off
       json:
         user:
-          id: !int "{another_user.pk}"
+          uuid: !re_fullmatch "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
           username: "{another_user.username}"
           first_name: "{another_user.first_name}"
           last_name: "{another_user.last_name}"

api/tests/integration/identification_tasks/annotations/schema.yml

@@ -8,7 +8,7 @@ variables:
     id: !anyint
     observation_uuid: !re_fullmatch "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
     user:
-      id: !anyint
+      uuid: !re_fullmatch "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
       username: !anystr
       first_name: !anystr
       last_name: !anystr