Add 4 new Molnix API endpoints

Author: szabozoltan69

api/management/commands/sync_molnix_appraisals.py

@@ -568,30 +568,41 @@ def handle(self, *args, **options):
                     org_lookup,
                     country_lookup,
                 )
-            appraisal_data = normalize_appraisal(appraisal_payload, sending_org_id, receiving_org_id)
-            if appraisal_data:
-                appraisal_id = appraisal_data.get("molnix_id")
-                if appraisal_id is not None:
-                    if appraisal_id in appraisal_ids:
-                        appraisal_duplicate_count += 1
-                    appraisal_ids.add(appraisal_id)
-                appraised_person_id = appraisal_data.get("appraised_person_id")
-                if appraised_person_id is None:
-                    appraised_person_null_count += 1
+                appraisal_data = normalize_appraisal(appraisal_payload, sending_org_id, receiving_org_id)
+                if appraisal_data:
+                    appraisal_id = appraisal_data.get("molnix_id")
+                    if appraisal_id is not None:
+                        if appraisal_id in appraisal_ids:
+                            appraisal_duplicate_count += 1
+                        appraisal_ids.add(appraisal_id)
+                    appraised_person_id = appraisal_data.get("appraised_person_id")
+                    if appraised_person_id is None:
+                        appraised_person_null_count += 1
+                    else:
+                        appraised_person_ids.add(appraised_person_id)
+                    output_record(self.stdout, {"record_type": "molnix_appraisal", "data": appraisal_data})
+                    if write_record("molnix_appraisal", appraisal_data):
+                        db_write_counts["molnix_appraisal"] += 1
+                    appraisals_stream_count += 1
+                    if appraisal_data.get("appraised_person_id") is not None:
+                        person_ids.append(appraisal_data.get("appraised_person_id"))
+                appraiser_payloads = []
+                if isinstance(appraisal_payload, dict) and isinstance(appraisal_payload.get("appraisers"), list):
+                    appraiser_payloads = appraisal_payload.get("appraisers")
+                if appraiser_payloads:
+                    for appraiser_payload in appraiser_payloads:
+                        appraiser_data = normalize_appraiser(appraiser_payload, appraisal_data.get("molnix_id"))
+                        if appraiser_data:
+                            appraiser_parent_id = appraiser_data.get("appraisal_molnix_id")
+                            if appraiser_parent_id is not None:
+                                appraiser_parent_ids.add(appraiser_parent_id)
+                            output_record(self.stdout, {"record_type": "molnix_appraiser", "data": appraiser_data})
+                            if write_record("molnix_appraiser", appraiser_data):
+                                db_write_counts["molnix_appraiser"] += 1
+                            appraisers_stream_count += 1
+                            collect_person_ids([appraiser_data], person_ids)
                 else:
-                    appraised_person_ids.add(appraised_person_id)
-                output_record(self.stdout, {"record_type": "molnix_appraisal", "data": appraisal_data})
-                if write_record("molnix_appraisal", appraisal_data):
-                    db_write_counts["molnix_appraisal"] += 1
-                appraisals_stream_count += 1
-                if appraisal_data.get("appraised_person_id") is not None:
-                    person_ids.append(appraisal_data.get("appraised_person_id"))
-            appraiser_payloads = []
-            if isinstance(appraisal_payload, dict) and isinstance(appraisal_payload.get("appraisers"), list):
-                appraiser_payloads = appraisal_payload.get("appraisers")
-            if appraiser_payloads:
-                for appraiser_payload in appraiser_payloads:
-                    appraiser_data = normalize_appraiser(appraiser_payload, appraisal_data.get("molnix_id"))
+                    appraiser_data = normalize_appraiser(appraisal, appraisal_data.get("molnix_id"))
                     if appraiser_data:
                         appraiser_parent_id = appraiser_data.get("appraisal_molnix_id")
                         if appraiser_parent_id is not None:
@@ -601,17 +612,6 @@ def handle(self, *args, **options):
                             db_write_counts["molnix_appraiser"] += 1
                         appraisers_stream_count += 1
                         collect_person_ids([appraiser_data], person_ids)
-            else:
-                appraiser_data = normalize_appraiser(appraisal, appraisal_data.get("molnix_id"))
-                if appraiser_data:
-                    appraiser_parent_id = appraiser_data.get("appraisal_molnix_id")
-                    if appraiser_parent_id is not None:
-                        appraiser_parent_ids.add(appraiser_parent_id)
-                    output_record(self.stdout, {"record_type": "molnix_appraiser", "data": appraiser_data})
-                    if write_record("molnix_appraiser", appraiser_data):
-                        db_write_counts["molnix_appraiser"] += 1
-                    appraisers_stream_count += 1
-                    collect_person_ids([appraiser_data], person_ids)
                 total += 1
             if not should_continue(data, appraisals):
                 log_debug(1, "Pagination indicates no more pages")

assets

@@ -15,7 +15,7 @@
 from drf_spectacular.utils import extend_schema
 from openpyxl import Workbook
 from rest_framework import viewsets
-from rest_framework.authentication import TokenAuthentication
+from rest_framework.authentication import SessionAuthentication, TokenAuthentication
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -31,7 +31,15 @@
 from main.serializers import CsvListMixin
 from main.utils import is_tableau
 
-from .filters import EmergencyProjectFilter, ERUOwnerFilter, ProjectFilter
+from .filters import (
+    EmergencyProjectFilter,
+    ERUOwnerFilter,
+    MolnixAppraisalFilter,
+    MolnixAppraiserFilter,
+    ProjectFilter,
+    RrmsEventParticipationFilter,
+    RrmsPersonSnapshotFilter,
+)
 from .models import (
     ERU,
     EmergencyProject,
@@ -41,13 +49,17 @@
     ERUReadiness,
     ERUReadinessType,
     ERUType,
+    MolnixAppraisal,
+    MolnixAppraiser,
     OperationTypes,
     PartnerSocietyDeployment,
     Personnel,
     PersonnelDeployment,
     ProgrammeTypes,
     Project,
     RegionalProject,
+    RrmsEventParticipation,
+    RrmsPersonSnapshot,
     Sector,
     Statuses,
 )
@@ -65,6 +77,8 @@
     GlobalProjectNSOngoingProjectsStatsSerializer,
     GlobalProjectOverviewSerializer,
     MiniERUReadinessTypeSerializer,
+    MolnixAppraisalSerializer,
+    MolnixAppraiserSerializer,
     PartnerDeploymentSerializer,
     PartnerDeploymentTableauSerializer,
     PersonnelCsvSerializer,
@@ -77,6 +91,8 @@
     ProjectRegionOverviewSerializer,
     ProjectSerializer,
     RegionalProjectSerializer,
+    RrmsEventParticipationSerializer,
+    RrmsPersonSnapshotSerializer,
 )
 from .utils import get_previous_months
 
@@ -410,6 +426,56 @@ def get_renderer_context(self):
         return context
 
 
+@extend_schema(
+    request=None,
+    responses=MolnixAppraisalSerializer(many=True),
+)
+class MolnixAppraisalViewset(viewsets.ReadOnlyModelViewSet):
+    authentication_classes = (SessionAuthentication, TokenAuthentication)
+    permission_classes = (IsAuthenticated, DenyGuestUserPermission)
+    queryset = MolnixAppraisal.objects.all()
+    serializer_class = MolnixAppraisalSerializer
+    filterset_class = MolnixAppraisalFilter
+    ordering_fields = ("updated_at", "created_at", "molnix_id", "appraised_person_id")
+
+
+@extend_schema(
+    request=None,
+    responses=MolnixAppraiserSerializer(many=True),
+)
+class MolnixAppraiserViewset(viewsets.ReadOnlyModelViewSet):
+    authentication_classes = (SessionAuthentication, TokenAuthentication)
+    permission_classes = (IsAuthenticated, DenyGuestUserPermission)
+    queryset = MolnixAppraiser.objects.all()
+    serializer_class = MolnixAppraiserSerializer
+    filterset_class = MolnixAppraiserFilter
+    ordering_fields = ("updated_at", "created_at", "molnix_id", "appraisal_molnix_id")
+
+
+@extend_schema(
+    request=None,
+    responses=RrmsPersonSnapshotSerializer(many=True),
+)
+class RrmsPersonSnapshotViewset(viewsets.ReadOnlyModelViewSet):
+    authentication_classes = (SessionAuthentication, TokenAuthentication)
+    permission_classes = (IsAuthenticated, DenyGuestUserPermission)
+    queryset = RrmsPersonSnapshot.objects.all()
+    serializer_class = RrmsPersonSnapshotSerializer
+    filterset_class = RrmsPersonSnapshotFilter
+    ordering_fields = ("source_updated_at", "person_id")
+
+
+@extend_schema(
+    request=None,
+    responses=RrmsEventParticipationSerializer(many=True),
+)
+class RrmsEventParticipationViewset(viewsets.ReadOnlyModelViewSet):
+    queryset = RrmsEventParticipation.objects.all()
+    serializer_class = RrmsEventParticipationSerializer
+    filterset_class = RrmsEventParticipationFilter
+    ordering_fields = ("event_from", "event_to", "event_id", "person_id")
+
+
 class AggregateDeployments(APIView):
     """
     Get aggregated data for personnel deployments

deployments/drf_views.py

@@ -10,9 +10,13 @@
     EmergencyProjectActivitySector,
     ERUOwner,
     ERUType,
+    MolnixAppraisal,
+    MolnixAppraiser,
     OperationTypes,
     ProgrammeTypes,
     Project,
+    RrmsEventParticipation,
+    RrmsPersonSnapshot,
     Sector,
     SectorTag,
     Statuses,
@@ -161,3 +165,56 @@ def qs(self):
         if available is not None:
             eru_qs = eru_qs.filter(available=available)
         return qs.filter(eru__in=eru_qs).distinct()
+
+
+class MolnixAppraisalFilter(filters.FilterSet):
+    appraised_person_id = filters.NumberFilter(field_name="appraised_person_id", lookup_expr="exact")
+    molnix_id = filters.NumberFilter(field_name="molnix_id", lookup_expr="exact")
+    deployment_molnix_id = filters.NumberFilter(field_name="deployment_molnix_id", lookup_expr="exact")
+    stage = filters.CharFilter(field_name="stage", lookup_expr="exact")
+
+    class Meta:
+        model = MolnixAppraisal
+        fields = {
+            "updated_at": ("exact", "gt", "gte", "lt", "lte"),
+            "created_at": ("exact", "gt", "gte", "lt", "lte"),
+        }
+
+
+class MolnixAppraiserFilter(filters.FilterSet):
+    appraisal_molnix_id = filters.NumberFilter(field_name="appraisal_molnix_id", lookup_expr="exact")
+    person_id = filters.NumberFilter(field_name="person_id", lookup_expr="exact")
+    appraiser_type = filters.CharFilter(field_name="appraiser_type", lookup_expr="exact")
+
+    class Meta:
+        model = MolnixAppraiser
+        fields = {
+            "updated_at": ("exact", "gt", "gte", "lt", "lte"),
+            "created_at": ("exact", "gt", "gte", "lt", "lte"),
+        }
+
+
+class RrmsPersonSnapshotFilter(filters.FilterSet):
+    person_id = filters.NumberFilter(field_name="person_id", lookup_expr="exact")
+    organization_id = filters.NumberFilter(field_name="organization_id", lookup_expr="exact")
+    person_status = filters.CharFilter(field_name="person_status", lookup_expr="exact")
+
+    class Meta:
+        model = RrmsPersonSnapshot
+        fields = {
+            "source_updated_at": ("exact", "gt", "gte", "lt", "lte"),
+        }
+
+
+class RrmsEventParticipationFilter(filters.FilterSet):
+    event_id = filters.NumberFilter(field_name="event_id", lookup_expr="exact")
+    person_id = filters.NumberFilter(field_name="person_id", lookup_expr="exact")
+    event_person_role = filters.CharFilter(field_name="event_person_role", lookup_expr="exact")
+    event_type = filters.CharFilter(field_name="event_type", lookup_expr="exact")
+
+    class Meta:
+        model = RrmsEventParticipation
+        fields = {
+            "event_from": ("exact", "gt", "gte", "lt", "lte"),
+            "event_to": ("exact", "gt", "gte", "lt", "lte"),
+        }

deployments/filters.py

@@ -37,6 +37,8 @@
     ERUReadiness,
     ERUReadinessType,
     Event,
+    MolnixAppraisal,
+    MolnixAppraiser,
     MolnixTag,
     OperationTypes,
     PartnerSocietyActivities,
@@ -47,6 +49,8 @@
     Project,
     Region,
     RegionalProject,
+    RrmsEventParticipation,
+    RrmsPersonSnapshot,
 )
 
 
@@ -291,6 +295,93 @@ class Meta:
         )
 
 
+class MolnixAppraisalSerializer(ModelSerializer):
+    class Meta:
+        model = MolnixAppraisal
+        fields = (
+            "id",
+            "molnix_id",
+            "target_id",
+            "appraised_person_id",
+            "deployment_molnix_id",
+            "stage",
+            "appraisers_count",
+            "score",
+            "deployment_country_id",
+            "deployment_start",
+            "deployment_end",
+            "deployment_title",
+            "sending_organization_id",
+            "receiving_organization_id",
+            "deployment_tags_json",
+            "competencies_json",
+            "personnel",
+            "created_at",
+            "updated_at",
+        )
+
+
+class MolnixAppraiserSerializer(ModelSerializer):
+    class Meta:
+        model = MolnixAppraiser
+        fields = (
+            "id",
+            "molnix_id",
+            "appraisal_molnix_id",
+            "appraisal",
+            "appraiser_type",
+            "person_id",
+            "personnel",
+            "required",
+            "notified_at",
+            "completed_at",
+            "created_at",
+            "updated_at",
+        )
+
+
+class RrmsPersonSnapshotSerializer(ModelSerializer):
+    class Meta:
+        model = RrmsPersonSnapshot
+        fields = (
+            "person_id",
+            "person_status",
+            "sex",
+            "current_availability",
+            "outofscope",
+            "organization_id",
+            "organization_name",
+            "roles_json",
+            "languages_json",
+            "tags_json",
+            "personnel",
+            "source_updated_at",
+        )
+
+
+class RrmsEventParticipationSerializer(ModelSerializer):
+    class Meta:
+        model = RrmsEventParticipation
+        fields = (
+            "id",
+            "event_id",
+            "event_name",
+            "person_id",
+            "event_person_role",
+            "event_type",
+            "event_scale_type",
+            "event_from",
+            "event_to",
+            "participant_start",
+            "participant_end",
+            "requested",
+            "event_organization_id",
+            "event_organization_name",
+            "venue",
+            "tags_json",
+        )
+
+
 class PersonnelSerializerSuper(ModelSerializer):
     # Superusers can see molnix_status
     country_from = MiniCountrySerializer(allow_null=True)