Add permission for the region level validator and change location_json field

Author: susilnem

local_units/admin.py

@@ -14,6 +14,7 @@
     HealthData,
     HospitalType,
     LocalUnit,
+    LocalUnitChangeRequest,
     LocalUnitLevel,
     LocalUnitType,
     PrimaryHCC,
@@ -64,6 +65,41 @@ def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
 
 
+@admin.register(LocalUnitChangeRequest)
+class LocalUnitChangeRequestAdmin(admin.ModelAdmin):
+    autocomplete_fields = (
+        "local_unit",
+        "triggered_by",
+    )
+    search_fields = (
+        "local_unit__id",
+        "local_unit__english_branch_name",
+        "local_unit__local_branch_name",
+    )
+    list_filter = ("status",)
+    list_display = (
+        "local_unit",
+        "status",
+        "current_validator",
+    )
+    readonly_fields = (
+        "previous_data",
+        "rejected_data",
+        "rejected_reason",
+    )
+    ordering = ("id",)
+
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .select_related(
+                "local_unit",
+                "triggered_by",
+            )
+        )
+
+
 @admin.register(DelegationOffice)
 class DelegationOfficeAdmin(admin.OSMGeoAdmin):
     search_fields = ("name", "city", "country__name")

local_units/migrations/0018_localunit_deprecated_reason_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.16 on 2024-11-29 11:02
+# Generated by Django 4.2.16 on 2024-12-11 09:28
 
 import django.db.models.deletion
 from django.conf import settings
@@ -36,14 +36,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="localunit",
             name="is_deprecated",
-            field=models.BooleanField(blank=True, default=False, null=True, verbose_name="Is deprecated?"),
+            field=models.BooleanField(default=False, verbose_name="Is deprecated?"),
         ),
         migrations.AddField(
             model_name="localunit",
-            name="status",
-            field=models.IntegerField(
-                blank=True, choices=[(1, "Verified"), (2, "Unverified")], default=2, null=True, verbose_name="status"
-            ),
+            name="is_locked",
+            field=models.BooleanField(default=False, verbose_name="Is locked?"),
         ),
         migrations.CreateModel(
             name="LocalUnitChangeRequest",
@@ -62,7 +60,7 @@ class Migration(migrations.Migration):
                         choices=[(1, "Local"), (2, "Regional"), (3, "Global")], default=1, verbose_name="Current validator"
                     ),
                 ),
-                ("triggered_at", models.DateTimeField(auto_now=True, verbose_name="Triggered at")),
+                ("triggered_at", models.DateTimeField(auto_now_add=True, verbose_name="Triggered at")),
                 ("updated_at", models.DateTimeField(auto_now=True, verbose_name="Updated at")),
                 ("rejected_data", models.JSONField(default=dict, verbose_name="Rejected data")),
                 ("rejected_reason", models.TextField(blank=True, null=True, verbose_name="Rejected reason")),
@@ -96,5 +94,8 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
+            options={
+                "ordering": ("id",),
+            },
         ),
     ]

local_units/migrations/0019_alter_localunit_is_deprecated_alter_localunit_status_and_more.py

@@ -3,7 +3,7 @@
 
 
 class ValidateLocalUnitPermission(permissions.BasePermission):
-    message = "You need to be super user/ country admin to validate local unit"
+    message = "You need to be super user/ country admin/ region admin to validate local unit"
 
     def has_object_permission(self, request, view, object):
         user = request.user
@@ -16,7 +16,14 @@ def has_object_permission(self, request, view, object):
                 codename__startswith="country_admin_",
             ).values_list("codename", flat=True)
         ]
-        if object.country_id in country_admin_ids:
+        region_admin_ids = [
+            int(codename.replace("region_admin_", ""))
+            for codename in Permission.objects.filter(
+                group__user=user,
+                codename__startswith="region_admin_",
+            ).values_list("codename", flat=True)
+        ]
+        if object.country_id in country_admin_ids or object.region_id in region_admin_ids:
             return True
         return False
 

local_units/migrations/0020_alter_localunitchangerequest_options_and_more.py

@@ -31,6 +31,11 @@
 )
 
 
+class LocationSerializer(serializers.Serializer):
+    lat = serializers.FloatField(required=True)
+    lng = serializers.FloatField(required=True)
+
+
 class GeneralMedicalServiceSerializer(serializers.ModelSerializer):
     class Meta:
         model = GeneralMedicalService
@@ -191,7 +196,7 @@ class LocalUnitDetailSerializer(serializers.ModelSerializer):
     type_details = LocalUnitTypeSerializer(source="type", read_only=True)
     level_details = LocalUnitLevelSerializer(source="level", read_only=True)
     health = HealthDataSerializer(required=False, allow_null=True)
-    location_details = serializers.SerializerMethodField()
+    location_geojson = serializers.SerializerMethodField()
     visibility_display = serializers.CharField(source="get_visibility_display", read_only=True)
     validated = serializers.BooleanField(read_only=True)
 
@@ -220,13 +225,13 @@ class Meta:
             "level",
             "health",
             "visibility_display",
-            "location_details",
+            "location_geojson",
             "type_details",
             "level_details",
             "country_details",
         )
 
-    def get_location_details(self, unit) -> dict:
+    def get_location_geojson(self, unit) -> dict:
         return json.loads(unit.location.geojson)
 
 
@@ -235,10 +240,11 @@ class PrivateLocalUnitDetailSerializer(NestedCreateMixin, NestedUpdateMixin):
     type_details = LocalUnitTypeSerializer(source="type", read_only=True)
     level_details = LocalUnitLevelSerializer(source="level", read_only=True)
     health = HealthDataSerializer(required=False, allow_null=True)
-    location_details = serializers.SerializerMethodField(read_only=True)
+    # NOTE: location_geojson contains the geojson of the location
+    location_geojson = serializers.SerializerMethodField(read_only=True)
     visibility_display = serializers.CharField(source="get_visibility_display", read_only=True)
     validated = serializers.BooleanField(read_only=True)
-    location_json = serializers.JSONField(required=True, write_only=True)
+    location_json = LocationSerializer(required=True)
     location = serializers.CharField(required=False)
     modified_by_details = LocalUnitMiniUserSerializer(source="modified_by", read_only=True)
     created_by_details = LocalUnitMiniUserSerializer(source="created_by", read_only=True)
@@ -272,7 +278,7 @@ class Meta:
             "level",
             "health",
             "visibility_display",
-            "location_details",
+            "location_geojson",
             "type_details",
             "level_details",
             "country_details",
@@ -288,7 +294,7 @@ class Meta:
             "is_locked",
         )
 
-    def get_location_details(self, unit) -> dict:
+    def get_location_geojson(self, unit) -> dict:
         return json.loads(unit.location.geojson)
 
     def get_version_id(self, resource):
@@ -319,8 +325,6 @@ def create(self, validated_data):
         location_json = validated_data.pop("location_json")
         lat = location_json.get("lat")
         lng = location_json.get("lng")
-        if not lat and not lng:
-            raise serializers.ValidationError(gettext("Combination of lat/lon is required"))
         input_point = Point(lng, lat)
         if country.bbox:
             country_json = json.loads(country.countrygeoms.geom.geojson)
@@ -349,8 +353,6 @@ def update(self, instance, validated_data):
         location_json = validated_data.pop("location_json")
         lat = location_json.get("lat")
         lng = location_json.get("lng")
-        if not lat and not lng:
-            raise serializers.ValidationError(gettext("Combination of lat/lon is required"))
         input_point = Point(lng, lat)
         if country.bbox:
             country_json = json.loads(country.countrygeoms.geom.geojson)
@@ -377,7 +379,8 @@ def update(self, instance, validated_data):
 
 
 class LocalUnitSerializer(serializers.ModelSerializer):
-    location_details = serializers.SerializerMethodField()
+    # NOTE: location_geojson contains the geojson of the location
+    location_geojson = serializers.SerializerMethodField()
     country_details = LocalUnitCountrySerializer(source="country", read_only=True)
     type_details = LocalUnitTypeSerializer(source="type", read_only=True)
     health_details = MiniHealthDataSerializer(read_only=True, source="health")
@@ -390,7 +393,7 @@ class Meta:
             "country",
             "local_branch_name",
             "english_branch_name",
-            "location_details",
+            "location_geojson",
             "type",
             "validated",
             "address_loc",
@@ -401,12 +404,13 @@ class Meta:
             "health_details",
         )
 
-    def get_location_details(self, unit) -> dict:
+    def get_location_geojson(self, unit) -> dict:
         return json.loads(unit.location.geojson)
 
 
 class PrivateLocalUnitSerializer(serializers.ModelSerializer):
-    location_details = serializers.SerializerMethodField()
+    # NOTE: location_geojson contains the geojson of the location
+    location_geojson = serializers.SerializerMethodField()
     country_details = LocalUnitCountrySerializer(source="country", read_only=True)
     type_details = LocalUnitTypeSerializer(source="type", read_only=True)
     health_details = MiniHealthDataSerializer(read_only=True, source="health")
@@ -421,7 +425,7 @@ class Meta:
             "country",
             "local_branch_name",
             "english_branch_name",
-            "location_details",
+            "location_geojson",
             "type",
             "validated",
             "address_loc",
@@ -439,7 +443,7 @@ class Meta:
             "is_locked",
         )
 
-    def get_location_details(self, unit) -> dict:
+    def get_location_geojson(self, unit) -> dict:
         return json.loads(unit.location.geojson)
 
 

local_units/permissions.py

@@ -171,7 +171,7 @@ def test_detail(self):
         self.authenticate()
         response = self.client.get(f"/api/v2/local-units/{local_unit.id}/")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["location_details"]["coordinates"], [12, 38])
+        self.assertEqual(response.data["location_geojson"]["coordinates"], [12, 38])
         self.assertEqual(response.data["country_details"]["name"], "Nepal")
         self.assertEqual(response.data["country_details"]["iso3"], "NLP")
         self.assertEqual(response.data["type_details"]["name"], "Code 0")
@@ -190,7 +190,7 @@ def test_detail(self):
         local_unit = LocalUnitFactory.create(country=self.country, type=self.type, visibility=VisibilityChoices.PUBLIC)
         response = self.client.get(f"/api/v2/public-local-units/{local_unit.id}/")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["location_details"]["coordinates"], [12, 38])
+        self.assertEqual(response.data["location_geojson"]["coordinates"], [12, 38])
         self.assertEqual(response.data["country_details"]["name"], "Nepal")
         self.assertEqual(response.data["country_details"]["iso3"], "NLP")
         self.assertEqual(response.data["type_details"]["name"], "Code 0")

local_units/serializers.py

@@ -38,7 +38,6 @@
     PrivateLocalUnitSerializer,
     RejectedReasonSerialzier,
 )
-from local_units.utils import get_local_unit_snapshot_data
 from main.permissions import DenyGuestUserPermission
 
 
@@ -48,7 +47,7 @@ class PrivateLocalUnitViewSet(viewsets.ModelViewSet):
         "country",
         "type",
         "level",
-    )
+    ).exclude(is_deprecated=True)
     filterset_class = LocalUnitFilters
     search_fields = (
         "local_branch_name",
@@ -72,7 +71,7 @@ def create(self, request, *args, **kwargs):
         # Creating a new change request for the local unit
         LocalUnitChangeRequest.objects.create(
             local_unit=serializer.instance,
-            previous_data=get_local_unit_snapshot_data(serializer.data),
+            previous_data=serializer.data,
             status=LocalUnitChangeRequest.Status.PENDING,
             triggered_by=request.user,
         )
@@ -95,11 +94,11 @@ def update(self, request, *args, **kwargs):
         # Creating a new change request for the local unit
         LocalUnitChangeRequest.objects.create(
             local_unit=local_unit,
-            previous_data=get_local_unit_snapshot_data(serializer.data),
+            previous_data=serializer,
             status=LocalUnitChangeRequest.Status.PENDING,
             triggered_by=request.user,
         )
-        return response.Response(serializer.data)
+        return response.Response(serializer)
 
     @extend_schema(request=None, responses=PrivateLocalUnitSerializer)
     @action(
@@ -166,7 +165,7 @@ def get_revert(self, request, pk=None, version=None):
         change_request_instance.rejected_reason = reason
         change_request_instance.updated_by = request.user
         change_request_instance.updated_at = timezone.now()
-        change_request_instance.rejected_data = get_local_unit_snapshot_data(full_serializer.data)
+        change_request_instance.rejected_data = full_serializer.data
         change_request_instance.save(update_fields=["status", "rejected_reason", "updated_at", "updated_by", "rejected_data"])
 
         # Reverting the last change request related to this local unit