Add annotation.type

Author: epou

api/filters.py

@@ -263,6 +263,15 @@ def filter_by_is_favourite(self, queryset, name, value):
             )
         ).filter(is_favourite=value)
 
+    type = filters.ChoiceFilter(
+        choices=[('short', 'short'), ('long', 'long')],
+        method="filter_by_type"
+    )
+    def filter_by_type(self, queryset, name, value):
+        if not value:
+            return queryset
+        return queryset.filter(simplified_annotation=(value == 'short'))
+
     order_by = filters.OrderingFilter(
         fields=(("created", "created_at"), ("last_modified", "updated_at"))
     )

api/serializers.py

@@ -809,6 +809,7 @@ class Meta:
     best_photo_uuid = serializers.UUIDField(write_only=True, required=False)
     best_photo = SimplePhotoSerializer(read_only=True, allow_null=True)
     tags = TagListSerializerField(required=False, allow_empty=True)
+    type = serializers.SerializerMethodField()
 
     is_flagged = WritableSerializerMethodField(
         field_class=serializers.BooleanField,
@@ -825,6 +826,9 @@ class Meta:
         default=False,
     )
 
+    def get_type(self, obj) -> Literal['short', 'long']:
+        return 'short' if obj.simplified_annotation else 'long'
+
     def get_is_flagged(self, obj) -> bool:
         return obj.status == ExpertReportAnnotation.STATUS_FLAGGED
 
@@ -898,6 +902,7 @@ class Meta:
             "best_photo",
             "classification",
             "feedback",
+            "type",
             "is_flagged",
             "is_decisive",
             "is_favourite",

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

@@ -89,6 +89,7 @@ stages:
           public_note: null
           internal_note: null
           user_note: null
+        type: !anystr
         is_flagged: false
         is_decisive: false
         is_favourite: false
@@ -152,6 +153,7 @@ stages:
           public_note: null
           internal_note: null
           user_note: null
+        type: !anystr
         is_flagged: false
         is_decisive: false
         is_favourite: false

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

@@ -19,6 +19,7 @@ variables:
       public_note: !anything
       internal_note: !anything
       user_note: !anything
+    type: !anystr
     is_flagged: !anybool
     is_decisive: !anybool
     is_favourite: !anybool

tigaserver_project/settings.py

@@ -280,6 +280,7 @@
         'ReportTypeEnum': 'tigaserver_app.models.Report.TYPE_CHOICES',
         "DeviceTypeEnum": 'fcm_django.models.DeviceType',
         "ValidationErrorEnum": "drf_standardized_errors.openapi_serializers.ValidationErrorEnum.choices",
+        "AnnotationTypeEnum": ['short', 'long'],
         "ClientErrorEnum": "drf_standardized_errors.openapi_serializers.ClientErrorEnum.choices",
         "ServerErrorEnum": "drf_standardized_errors.openapi_serializers.ServerErrorEnum.choices",
         "ErrorCode401Enum": "api.error_serializers.ErrorCode401Enum.choices",