Add country and regional permission in per document uploa

Author: k9845

api/management/commands/ingest_ns_capacity.py

@@ -22,7 +22,7 @@ def handle(self, *args, **kwargs):
         logger.info('Starting NS Contacts')
 
         # OCAC Assessment
-        OCAC_DATA_API = f"https://data-api.ifrc.org/api/ocacpublic?apiKey={settings.FDRS_API_KEY}"
+        OCAC_DATA_API = f"https://data-api.ifrc.org/api/ocacpublic?apiKey={settings.FDRS_APIKEY}"
         resp_ocac = requests.get(OCAC_DATA_API)
         if resp_ocac.status_code != 200:
             text_to_log = "Error querying OCAC at " + url
@@ -62,7 +62,7 @@ def handle(self, *args, **kwargs):
         CronJob.sync_cron(body)
 
         # BOCA Assessment
-        BOCA_DATA_API = f"https://data-api.ifrc.org/api/bocapublic?apiKey={settings.FDRS_API_KEY}"
+        BOCA_DATA_API = f"https://data-api.ifrc.org/api/bocapublic?apiKey={settings.FDRS_APIKEY}"
         resp_boca = requests.get(BOCA_DATA_API)
         resp_boca_data = resp_boca.json()
         for item in resp_boca_data:

per/drf_views.py

@@ -19,6 +19,8 @@
 from django.shortcuts import get_object_or_404
 from django.db import transaction
 from drf_spectacular.utils import extend_schema, extend_schema_view
+from django.contrib.auth.models import Permission
+
 
 from main.utils import SpreadSheetContentNegotiation
 from .admin_classes import RegionRestrictedAdmin
@@ -723,8 +725,35 @@ class PerDocumentUploadViewSet(viewsets.ModelViewSet):
     serializer_class = PerDocumentUploadSerializer
     filterset_class = PerDocumentFilter
     permission_classes = [permissions.IsAuthenticated, PerDocumentUploadPermission]
-    get_request_user_regions = RegionRestrictedAdmin.get_request_user_regions
-    get_filtered_queryset = RegionRestrictedAdmin.get_filtered_queryset
+
+    def filter_per_queryset_by_user_access(self, user, queryset):
+        if user.is_superuser or user.has_perm("api.per_core_admin"):
+            return queryset
+        # Check if country admin
+        per_admin_country_id = [
+            codename.replace('per_country_admin_', '')
+            for codename in Permission.objects.filter(
+                group__user=user,
+                codename__startswith='per_country_admin_',
+            ).values_list('codename', flat=True)
+        ]
+        per_admin_region_id = [
+            codename.replace('per_region_admin_', '')
+            for codename in Permission.objects.filter(
+                group__user=user,
+                codename__startswith='per_region_admin_',
+            ).values_list('codename', flat=True)
+        ]
+        if len(per_admin_country_id) or len(per_admin_region_id):
+            return queryset.filter(
+                Q(created_by=user)|
+                Q(country__in=per_admin_country_id) |
+                Q(country__region__in=per_admin_region_id)
+            ).distinct()
+        # Normal access
+        return queryset.filter(created_by=user)
 
     def get_queryset(self):
-        return super().get_queryset().filter(created_by=self.request.user)
+        queryset = super().get_queryset()
+        user = self.request.user
+        return self.filter_per_queryset_by_user_access(user, queryset)

per/migrations/0090_auto_20231030_1505.py

@@ -3,20 +3,21 @@
 from django.db import migrations
 from django.core.management import call_command
 
+def update_question_answer(apps, schema_editor):
+    FormQuestion = apps.get_model("per", "FormQuestion")
+    FormAnswer = apps.get_model("per", "FormAnswer")
+    form_questions = FormQuestion.objects.all()
+    for form_question in form_questions:
+        form_question.answers.add(FormAnswer.objects.get(id=5))  # Hardcoded for now
 
 class Migration(migrations.Migration):
 
-    def forwards_func(apps, schema_editor):
-        print('forwards')
-        call_command('add_partially_answers')
-
-    def reverse_func(apps, schema_editor):
-        print('reverse')
-
     dependencies = [
         ('per', '0089_alter_overview_type_of_previous_assessment'),
     ]
 
     operations = [
-        migrations.RunPython(forwards_func, reverse_func, elidable=False)
+        migrations.RunPython(
+            update_question_answer, reverse_code=migrations.RunPython.noop
+        )
     ]