Added first_name, last_name, full_name for any kind of user

Author: epou

api/serializers.py

@@ -49,31 +49,6 @@
 
 User = get_user_model()
 
-
-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 = (
-            'uuid',
-            'username',
-            'first_name',
-            'last_name',
-            'full_name'
-        )
-        extra_kwargs = {
-            "id": {"read_only": True},
-        }
-
 class CampaignSerializer(serializers.ModelSerializer):
     class Meta:
         model = OWCampaigns
@@ -139,6 +114,9 @@ class Meta:
     uuid = serializers.UUIDField(source="user_UUID", read_only=True)
     language_iso = serializers.SerializerMethodField(help_text='ISO 639-1 code', default='en')
     username = serializers.SerializerMethodField()
+    first_name = serializers.SerializerMethodField()
+    last_name = serializers.SerializerMethodField()
+    full_name = serializers.SerializerMethodField()
     is_guest = serializers.SerializerMethodField()
     score = UserScoreSerializer(source='*', read_only=True)
 
@@ -148,6 +126,21 @@ def get_is_guest(self, obj) -> bool:
     def get_username(self, obj) -> str:
         return obj.get_username()
 
+    def get_first_name(self, obj) -> str:
+        if isinstance(obj, User):
+            return obj.first_name
+        return 'Anonymous'
+
+    def get_last_name(self, obj) -> str:
+        if isinstance(obj, User):
+            return obj.last_name
+        return 'User'
+
+    def get_full_name(self, obj) -> str:
+        if isinstance(obj, User):
+            return obj.get_full_name()
+        return 'Anonymous User'
+
     def get_language_iso(self, obj) -> str:
         return obj.language_iso2
 
@@ -157,6 +150,9 @@ def to_representation(self, instance):
             data = {}
             data['uuid'] = UUID(int=instance.pk)
             data['username'] = instance.get_username()
+            data['first_name'] = self.get_first_name(obj=instance)
+            data['last_name'] = self.get_last_name(obj=instance)
+            data['full_name'] = self.get_full_name(obj=instance)
             data['registration_time'] = instance.date_joined
             data['locale'] = 'en'
             data['language_iso'] = 'en'
@@ -165,7 +161,10 @@ def to_representation(self, instance):
                 'value': 0,
                 'updated_at': None
             }
-            return data
+            return {
+                k: v for k, v in data.items()
+                if k in self.fields.keys()
+            }
 
         return super().to_representation(instance)
 
@@ -174,6 +173,9 @@ class Meta:
         fields = (
             "uuid",
             "username",
+            "first_name",
+            "last_name",
+            "full_name",
             "registration_time",
             "locale",
             "language_iso",
@@ -189,6 +191,23 @@ class Meta:
         }
 
 class SimpleUserSerializer(UserSerializer):
+
+    uuid = serializers.SerializerMethodField()
+
+    def get_uuid(self, obj) -> UUID:
+        return UUID(int=obj.pk)
+
+    class Meta(UserSerializer.Meta):
+        model = User
+        fields = (
+            'uuid',
+            'username',
+            'first_name',
+            'last_name',
+            'full_name'
+        )
+
+class MinimalUserSerializer(UserSerializer):
     class Meta(UserSerializer.Meta):
         fields = (
             "uuid",
@@ -711,7 +730,7 @@ class SimplifiedObservationWithPhotosSerializer(BaseSimplifiedReportSerializerWi
     class Meta(BaseSimplifiedReportSerializerWithPhoto.Meta):
         pass
 
-class SimpleAnnotatorUserSerializer(SimpleRegularUserSerializer):
+class SimpleAnnotatorUserSerializer(SimpleUserSerializer):
     def to_representation(self, instance):
         # Get the request user
         user = self.context.get('request').user
@@ -1019,7 +1038,7 @@ class Meta:
 
 class AssignmentSerializer(BaseAssignmentSerializer):
     class AssignedObservationSerializer(SimplifiedObservationWithPhotosSerializer):
-        user = SimpleUserSerializer(read_only=True)
+        user = MinimalUserSerializer(read_only=True)
         class Meta(SimplifiedObservationWithPhotosSerializer.Meta):
             fields = tuple(
                 fname for fname in SimplifiedObservationWithPhotosSerializer.Meta.fields if fname != 'user_uuid'

api/tests/integration/users/get_my_profile.tavern.yml

@@ -32,6 +32,9 @@ stages:
         - json:off
       json:
         username: "{user.username}"
+        first_name: "{user.first_name}"
+        last_name: "{user.last_name}"
+        full_name: "{user.first_name} {user.last_name}"
         is_guest: false
   - name: Check schema for authorized user without permission can not get user even if they have view permissions.
     request:
@@ -55,6 +58,9 @@ stages:
       json:
         uuid: "{app_user.pk}"
         username: "{app_user.pk}"
+        first_name: "Anonymous"
+        last_name: "User"
+        full_name: "Anonymous User"
         is_guest: true
   - name: Check schema for mobile user get their profile
     request:

api/tests/integration/users/schema.yml

@@ -8,6 +8,9 @@ variables:
   response_data_validation:
     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
+    full_name: !anystr
     registration_time: !re_fullmatch \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6}Z
     locale: !anything
     is_guest: !anybool