Merge pull request #2522 from IFRCGo/project/local-unit-edit-functionality

Project: Local unit edit functionality workflow

Author: szabozoltan69

api/serializers.py

@@ -1,4 +1,5 @@
 import json
+from collections import defaultdict
 from typing import List, Union
 
 from django.conf import settings
@@ -11,6 +12,7 @@
 
 # from api.utils import pdf_exporter
 from api.tasks import generate_url
+from api.utils import CountryValidator, RegionValidator
 from deployments.models import EmergencyProject, Personnel, PersonnelDeployment
 from dref.models import Dref, DrefFinalReport, DrefOperationalUpdate
 from lang.models import String
@@ -1771,6 +1773,10 @@ class UserMeSerializer(UserSerializer):
     user_countries_regions = serializers.SerializerMethodField()
     limit_access_to_guest = serializers.BooleanField(read_only=True, source="profile.limit_access_to_guest")
 
+    local_unit_country_validators = serializers.SerializerMethodField()
+    local_unit_region_validators = serializers.SerializerMethodField()
+    local_unit_global_validators = serializers.SerializerMethodField()
+
     class Meta:
         model = User
         fields = UserSerializer.Meta.fields + (
@@ -1782,6 +1788,9 @@ class Meta:
             "is_per_admin_for_countries",
             "user_countries_regions",
             "limit_access_to_guest",
+            "local_unit_country_validators",
+            "local_unit_region_validators",
+            "local_unit_global_validators",
         )
 
     @staticmethod
@@ -1845,6 +1854,49 @@ def get_user_countries_regions(user):
         qs = UserCountry.objects.filter(user=user).distinct("country")
         return UserCountrySerializer(qs, many=True).data
 
+    @staticmethod
+    def get_local_unit_global_validators(user) -> List[int]:
+        permission_codenames = Permission.objects.filter(
+            codename__startswith="local_unit_global_validator", group__user=user
+        ).values_list("codename", flat=True)
+        global_validators = {int(code.split("_")[-1]) for code in permission_codenames}
+        return list(global_validators)
+
+    @staticmethod
+    def get_local_unit_region_validators(user) -> list[RegionValidator]:
+        permission_codenames = Permission.objects.filter(
+            codename__startswith="local_unit_region_validator",
+            group__user=user,
+        ).values_list("codename", flat=True)
+        region_validators = defaultdict(set)
+        for code in permission_codenames:
+            parts = code.split("_")[-2:]
+            if len(parts) == 2 and all(p.isdigit() for p in parts):
+                local_unit_type_id = int(parts[0])
+                region_id = int(parts[1])
+                region_validators[region_id].add(local_unit_type_id)
+        return [
+            {"region": region, "local_unit_types": list(local_unit_types)}
+            for region, local_unit_types in region_validators.items()
+        ]
+
+    @staticmethod
+    def get_local_unit_country_validators(user) -> list[CountryValidator]:
+        permission_codenames = Permission.objects.filter(
+            codename__startswith="local_unit_country_validator", group__user=user
+        ).values_list("codename", flat=True)
+        country_validator = defaultdict(set)
+        for code in permission_codenames:
+            parts = code.split("_")[-2:]
+            if len(parts) == 2 and all(p.isdigit() for p in parts):
+                local_unit_type_id = int(parts[0])
+                country_id = int(parts[1])
+                country_validator[country_id].add(local_unit_type_id)
+        return [
+            {"country": country, "local_unit_types": list(local_unit_types)}
+            for country, local_unit_types in country_validator.items()
+        ]
+
 
 class ActionSerializer(ModelSerializer):
     class Meta:

api/utils.py

@@ -1,6 +1,6 @@
 import base64
 import typing
-from typing import Optional
+from typing import Optional, TypedDict
 
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -146,3 +146,13 @@ def generate_field_report_title(
     else:
         summary = f"{country.iso3}: {dtype.name} - {start_date} - {title} {suffix}"
     return summary
+
+
+class RegionValidator(TypedDict):
+    region: int
+    local_unit_types: list[int]
+
+
+class CountryValidator(TypedDict):
+    country: int
+    local_unit_types: list[int]

deploy/helm/ifrcgo-helm/values.yaml

@@ -271,8 +271,9 @@ cronjobs:
     schedule: '0 0 * * 0'
   - command: 'ingest_icrc'
     schedule: '0 3 * * 0'
-  - command: 'notify_validators'
-    schedule: '0 0 * * *'
+  # NOTE: Disabling local unit email notification for now 
+  # - command: 'notify_validators'
+  #   schedule: '0 0 * * *'
   # https://github.com/jazzband/django-oauth-toolkit/blob/master/docs/management_commands.rst#cleartokens
   - command: 'oauth_cleartokens'
     schedule: '0 1 * * *'

go-static/files/local_units/local-unit-bulk-upload-template.csv

@@ -0,0 +1 @@
+local_branch_name,english_branch_name,subtype,level,postcode,address_loc,address_en,city_loc,city_en,focal_person_loc,focal_person_en,phone,email,link,source_en,source_loc,date_of_data,visibility,longitude,latitude

go-static/files/local_units/local-unit-health-bulk-upload-template.csv

@@ -0,0 +1 @@
+focal_point_email,focal_point_phone_number,focal_point_position,health_facility_type,other_facility_type,affiliation,functionality,primary_health_care_centre,speciality,hospital_type,is_teaching_hospital,is_in_patient_capacity,maximum_capacity,is_isolation_rooms_wards,number_of_isolation_rooms,is_warehousing,is_cold_chain,general_medical_services,specialized_medical_beyond_primary_level,other_services,blood_services,total_number_of_human_resource,general_practitioner,specialist,residents_doctor,nurse,dentist,nursing_aid,midwife,other_medical_heal,other_profiles,feedback,professional_training_facilities,ambulance_type_a,ambulance_type_b,ambulance_type_c,residential_long_term_care_facilities,primary_health_care_center,other_affiliation,local_branch_name,english_branch_name,subtype,level,postcode,address_loc,address_en,city_loc,city_en,focal_person_loc,focal_person_en,phone,email,link,source_en,source_loc,date_of_data,visibility,longitude,latitude

local_units/admin.py

@@ -10,12 +10,14 @@
     BloodService,
     DelegationOffice,
     DelegationOfficeType,
+    ExternallyManagedLocalUnit,
     FacilityType,
     Functionality,
     GeneralMedicalService,
     HealthData,
     HospitalType,
     LocalUnit,
+    LocalUnitBulkUpload,
     LocalUnitChangeRequest,
     LocalUnitLevel,
     LocalUnitType,
@@ -51,10 +53,13 @@ class LocalUnitAdmin(CompareVersionAdmin, admin.OSMGeoAdmin):
         "type",
         "level",
         "health",
+        "bulk_upload",
     )
     readonly_fields = (
         "validated",
+        "status",
         "is_locked",
+        "is_new_local_unit",
     )
     list_filter = (
         AutocompleteFilterFactory("Country", "country"),
@@ -71,6 +76,42 @@ def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
 
 
+@admin.register(ExternallyManagedLocalUnit)
+class ExternallyManagedLocalUnitAdmin(admin.ModelAdmin):
+    list_display = ("local_unit_type", "created_at", "updated_at")
+    search_fields = ("country__name",)
+    list_select_related = True
+    autocomplete_fields = (
+        "country",
+        "local_unit_type",
+    )
+    list_filter = (
+        AutocompleteFilterFactory("Country", "country"),
+        AutocompleteFilterFactory("Type", "local_unit_type"),
+    )
+
+
+@admin.register(LocalUnitBulkUpload)
+class LocalUnitBulkUploadAdmin(ReadOnlyMixin, admin.ModelAdmin):
+    search_fields = ("country__name", "local_unit_type__id")
+    list_select_related = True
+    autocomplete_fields = (
+        "country",
+        "local_unit_type",
+        "triggered_by",
+    )
+    list_filter = ("status",)
+
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .select_related(
+                "triggered_by",
+            )
+        )
+
+
 @admin.register(LocalUnitChangeRequest)
 class LocalUnitChangeRequestAdmin(ReadOnlyMixin, admin.ModelAdmin):
     autocomplete_fields = (