DREF3 enhancement – field renaming

dref/serializers.py

@@ -1711,7 +1711,7 @@ class BaseDref3Serializer(serializers.ModelSerializer):
     sector_national_society_strengthening = serializers.SerializerMethodField()
     sector_national_society_strengthening_budget = serializers.SerializerMethodField()
     sector_national_society_strengthening_people_targeted = serializers.SerializerMethodField()
-    silent_operation = serializers.SerializerMethodField(read_only=True)
+    public = serializers.SerializerMethodField(read_only=True)
     status = serializers.IntegerField(read_only=True)
     status_display = serializers.CharField(source="get_status_display", read_only=True)
     approved = serializers.SerializerMethodField()
@@ -1720,8 +1720,8 @@ class BaseDref3Serializer(serializers.ModelSerializer):
 
     # get_id removed: numeric ids are injected post-serialization
 
-    def get_silent_operation(self, obj):
-        return self.context.get("silent_operation")
+    def get_public(self, obj):
+        return self.context.get("public")
 
     def get_stage(self, obj):
         return self.context.get("stage")
@@ -2104,7 +2104,7 @@ class Meta:
             "sector_national_society_strengthening",
             "sector_national_society_strengthening_budget",
             "sector_national_society_strengthening_people_targeted",
-            "silent_operation",
+            "public",
             "status",
             "status_display",
             "approved",

dref/views.py

@@ -608,7 +608,7 @@ def list(self, request):
         silents = self.get_nonsuperusers_excluded_codes()
         for idx, row in enumerate(data, start=1):
             row["id"] = idx
-            row["silent_operation"] = row["appeal_id"] in silents
+            row["public"] = row["appeal_id"] not in silents
 
         # numeric id filter (?id=3 or ?id=3,7)
         id_param = request.query_params.get("id")
@@ -738,13 +738,11 @@ def retrieve(self, request, *args, **kwargs):
         serialized_data = []
         ops_update_count = 0
         allocation_count = 1  # Dref Application is always the first allocation
-        silent = code in self.get_nonsuperusers_excluded_codes()
+        public = code not in self.get_nonsuperusers_excluded_codes()
         a = ["First", "Second", "Third", "Fourth", "Fifth", "Sixth", "Seventh", "Eighth", "Ninth", "Tenth"]
         for instance in instances:
             if isinstance(instance, Dref):
-                serializer = Dref3Serializer(
-                    instance, context={"stage": "Application", "allocation": a[0], "silent_operation": silent}
-                )
+                serializer = Dref3Serializer(instance, context={"stage": "Application", "allocation": a[0], "public": public})
             elif isinstance(instance, DrefOperationalUpdate):
                 ops_update_count += 1
                 if instance.additional_allocation and len(a) > allocation_count:
@@ -757,13 +755,13 @@ def retrieve(self, request, *args, **kwargs):
                     context={
                         "stage": "Operational Update " + str(ops_update_count),
                         "allocation": allocation,
-                        "silent_operation": silent,
+                        "public": public,
                     },
                 )
             elif isinstance(instance, DrefFinalReport):
                 serializer = DrefFinalReport3Serializer(
                     instance,
-                    context={"stage": "Final Report", "allocation": "No allocation", "silent_operation": silent},
+                    context={"stage": "Final Report", "allocation": "No allocation", "public": public},
                 )
             else:
                 continue