Merge pull request #264 from Mosquito-Alert/remove_unused_field

Replace ExpandedPointField to PointField

Author: epou

api/fields.py

@@ -10,7 +10,6 @@
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
 
-from drf_extra_fields.geo_fields import PointField
 from timezone_field.utils import use_pytz_default
 from timezone_field.rest_framework import TimeZoneSerializerField
 
@@ -27,11 +26,6 @@ def to_internal_value(self, value):
         return super().to_internal_value(value=value)
 
 
-class ExpandedPointField(PointField):
-    def __init__(self, *args, **kwargs):
-        super().__init__(str_points=True, *args, **kwargs)
-
-
 class IntegerDefaultField(serializers.IntegerField):
     # When db value is None, use the default.
     def get_attribute(self, instance):

api/schema.py

@@ -7,18 +7,19 @@
 from drf_spectacular.plumbing import force_instance
 
 
-class ExpandedPointFieldExtension(OpenApiSerializerFieldExtension):
-    target_class = "api.fields.ExpandedPointField"
+class PointFieldExtension(OpenApiSerializerFieldExtension):
+    target_class = "drf_extra_fields.geo_fields.PointField"
 
     def map_serializer_field(self, auto_schema, direction):
+        openapi_type = OpenApiTypes.STR if self.target.str_points else OpenApiTypes.FLOAT
         return build_object_type(
             properties={
-                "latitude": build_basic_type(OpenApiTypes.FLOAT),
-                "longitude": build_basic_type(OpenApiTypes.FLOAT),
-            }
+                "latitude": build_basic_type(openapi_type),
+                "longitude": build_basic_type(openapi_type),
+            },
+            required=["latitude", "longitude"] if self.target.required else None
         )
 
-
 class FieldPolymorphicSerializerExtension(OpenApiSerializerExtension):
     target_class = "api.base_serializers.FieldPolymorphicSerializer"
 
@@ -59,4 +60,4 @@ def map_serializer_field(self, auto_schema, direction):
             field=self.target.deserializer_field if direction == 'request' else self.target.serializer_field,
             direction=direction,
             bypass_extensions=True
-        )
+        )

api/serializers.py

@@ -9,6 +9,8 @@
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.types import OpenApiTypes
 
+from drf_extra_fields.geo_fields import PointField
+
 from tigaserver_app.models import (
     NotificationContent,
     Notification,
@@ -23,7 +25,6 @@
 )
 from .base_serializers import FieldPolymorphicSerializer
 from .fields import (
-    ExpandedPointField,
     TimezoneAwareDateTimeField,
     WritableSerializerMethodField,
     TimeZoneSerializerChoiceField,
@@ -275,7 +276,7 @@ class Meta(BaseNotificationCreateSerializer.Meta):
 #### END NOTIFICATION SERIALIZERS ####
 
 class PartnerSerializer(serializers.ModelSerializer):
-    point = ExpandedPointField(srid=4326)
+    point = PointField()
 
     class Meta:
         model = OrganizationPin
@@ -320,7 +321,7 @@ class Meta:
             }
 
     class ReportLocationSerializer(serializers.ModelSerializer):
-        point = ExpandedPointField(srid=4326, required=True, allow_null=True)
+        point = PointField(required=True, allow_null=True)
 
         def to_internal_value(self, data):
             ret = super().to_internal_value(data)

api/tests/integration/partners/schema.yml

@@ -8,8 +8,8 @@ variables:
   response_data_validation: &retrieve_validation
     id: !anyint
     point:
-      latitude: !anystr
-      longitude: !anystr
+      latitude: !anyfloat
+      longitude: !anyfloat
     description: !anystr
     url: !anystr
   response_list_data_validation: &response_list_validation

api/tests/integration/reports/create.tavern.yml

@@ -76,8 +76,8 @@ stages:
         location:
           type: 'current'
           point:
-            latitude: "41.67419"
-            longitude: "2.79036"
+            latitude: 41.67419
+            longitude: 2.79036
           country_id: !anything
           nuts_2: !anything
           nuts_3: !anything
@@ -168,8 +168,8 @@ stages:
         location:
           type: 'current'
           point:
-            latitude: "41.67419"
-            longitude: "2.79036"
+            latitude: 41.67419
+            longitude: 2.79036
           country_id: !anything
           nuts_2: !anything
           nuts_3: !anything
@@ -265,8 +265,8 @@ stages:
         location:
           type: 'current'
           point:
-            latitude: "41.67419"
-            longitude: "2.79036"
+            latitude: 41.67419
+            longitude: 2.79036
           country_id: !anything
           nuts_2: !anything
           nuts_3: !anything

api/tests/integration/reports/get.tavern.yml

@@ -159,8 +159,8 @@ stages:
         location:
           type: !anystr
           point:
-            latitude: !anystr
-            longitude: !anystr
+            latitude: !anyfloat
+            longitude: !anyfloat
           country_id: !anything
           nuts_2: !anything
           nuts_3: !anything