Merge pull request #1827 from IFRCGo/fix/list-final-report

Remove dref filter in active operations

Author: szabozoltan69

dref/migrations/0061_dref_is_active.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.19 on 2023-06-19 09:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0060_dreffinalreport_date_of_approval'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dref',
+            name='is_active',
+            field=models.BooleanField(blank=True, null=True, verbose_name='Is Active'),
+        ),
+    ]

dref/migrations/0062_auto_20230619_0931.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.2.19 on 2023-06-19 09:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    def update_dref(apps, schema_editor):
+        Dref = apps.get_model('dref', 'Dref')
+        drefs = Dref.objects.all()
+        for dref in drefs:
+            if hasattr(dref, 'dreffinalreport'):
+                if dref.dreffinalreport.is_published == True:
+                    dref.is_active = False
+                else:
+                    dref.is_active = True
+            else:
+                dref.is_active = True
+            dref.save(update_fields=['is_active'])
+
+    dependencies = [
+        ('dref', '0061_dref_is_active'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            update_dref,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

dref/models.py

@@ -575,6 +575,7 @@ class Status(models.IntegerChoices):
     risk_security_concern = models.TextField(blank=True, null=True, verbose_name=_("Risk Security Concern"))
     is_man_made_event = models.BooleanField(verbose_name=_("Is Man-made Event"), null=True, blank=True)
     __budget_file_id = None
+    is_active = models.BooleanField(verbose_name=_("Is Active"), null=True, blank=True)
 
     class Meta:
         verbose_name = _("dref")

dref/serializers.py

@@ -424,6 +424,7 @@ def validate_operation_timeframe(self, operation_timeframe):
 
     def create(self, validated_data):
         validated_data["created_by"] = self.context["request"].user
+        validated_data["is_active"] = True
         type_of_dref = validated_data.get("type_of_dref")
         if type_of_dref and type_of_dref == Dref.DrefType.ASSESSMENT:
             # Previous Operations

dref/test_views.py

@@ -1236,13 +1236,13 @@ def test_filter_active_dref(self):
 
         # create some dref
         dref_1 = DrefFactory.create(
-            is_published=False,
+            is_active=True,
             type_of_dref=Dref.DrefType.ASSESSMENT,
             country=country_1,
             created_by=self.root_user
         )
         dref_2 = DrefFactory.create(
-            is_published=False,
+            is_active=True,
             type_of_dref=Dref.DrefType.LOAN,
             country=country_2,
             created_by=self.root_user

dref/views.py

@@ -161,10 +161,9 @@ def get_published(self, request, pk=None, version=None):
         field_report.is_published = True
         field_report.status = Dref.Status.COMPLETED
         field_report.save(update_fields=["is_published", "status"])
-        if not field_report.dref.is_final_report_created:
-            field_report.dref.is_final_report_created = True
-            field_report.date_of_approval = timezone.now().date()
-            field_report.dref.save(update_fields=["is_final_report_created", "date_of_approval"])
+        field_report.dref.is_active = False
+        field_report.date_of_approval = timezone.now().date()
+        field_report.dref.save(update_fields=["is_active", "date_of_approval"])
         serializer = DrefFinalReportSerializer(field_report, context={"request": request})
         return response.Response(serializer.data)
 
@@ -251,9 +250,9 @@ def get_queryset(self):
                 new_dref = DrefFinalReport.objects.filter(id__in=id).first()
                 final.append(new_dref.id)
             if len(final):
-                return DrefFinalReport.objects.filter(id__in=final).order_by('-created_at')
+                return DrefFinalReport.objects.filter(id__in=final, is_published=True).order_by('-created_at')
             else:
-                return DrefFinalReport.get_for(user)
+                return DrefFinalReport.get_for(user).filter(is_published=True)
 
 
 class ActiveDrefOperationsViewSet(viewsets.ReadOnlyModelViewSet):
@@ -267,9 +266,7 @@ def get_queryset(self):
             dref = (
                 Dref.objects.prefetch_related(
                     "planned_interventions", "needs_identified", "national_society_actions", "users"
-                )
-                .filter(is_final_report_created=False)
-                .distinct()
+                ).distinct()
             )
             dref_op_update = (
                 DrefOperationalUpdate.objects.select_related(
@@ -289,17 +286,13 @@ def get_queryset(self):
                     "users",
                     "images",
                     "photos",
-                )
-                .filter(dref__is_final_report_created=False)
-                .order_by('-operational_update_number').distinct()
+                ).order_by('-operational_update_number').distinct()
             )
             dref_final_report = (
                 DrefFinalReport.objects.prefetch_related(
                     "dref__planned_interventions",
                     "dref__needs_identified",
-                )
-                .filter(dref__is_final_report_created=False)
-                .distinct()
+                ).distinct()
             )
             result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
             dref_list = []
@@ -337,7 +330,7 @@ def get_queryset(self):
             for dref in annoatated_drefs:
                 new_dref = Dref.objects.get(id=dref.id)
                 dref_list.append(new_dref.id)
-            return Dref.objects.filter(id__in=dref_list).order_by("-created_at")
+            return Dref.objects.filter(id__in=dref_list, is_active=True).order_by("-created_at")
         elif not user.is_superuser:
             # get current user dref regions
             regions = [0, 1, 2, 3, 4]
@@ -349,7 +342,7 @@ def get_queryset(self):
                         Dref.objects.prefetch_related(
                             "planned_interventions", "needs_identified", "national_society_actions", "users"
                         )
-                        .filter(country__region=region, is_final_report_created=False)
+                        .filter(country__region=region)
                         .distinct()
                     )
                     dref_op_update = (
@@ -371,15 +364,15 @@ def get_queryset(self):
                             "images",
                             "photos",
                         )
-                        .filter(country__region=region, dref__is_final_report_created=False)
+                        .filter(country__region=region)
                         .order_by('-operational_update_number').distinct()
                     )
                     dref_final_report = (
                         DrefFinalReport.objects.prefetch_related(
                             "dref__planned_interventions",
                             "dref__needs_identified",
                         )
-                        .filter(country__region=region, dref__is_final_report_created=False)
+                        .filter(country__region=region)
                         .distinct()
                     )
                     result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
@@ -421,11 +414,11 @@ def get_queryset(self):
                 new_dref = Dref.objects.get(id=dref.id)
                 dref_list.append(new_dref.id)
             if len(dref_list):
-                return Dref.objects.filter(id__in=dref_list).order_by("-created_at")
+                return Dref.objects.filter(id__in=dref_list, is_active=True).order_by("-created_at")
             else:
-                dref = Dref.get_for(user).filter(is_final_report_created=False)
-                dref_op_update = DrefOperationalUpdate.get_for(user).filter(dref__is_final_report_created=False)
-                dref_final_report = DrefFinalReport.get_for(user).filter(dref__is_final_report_created=False)
+                dref = Dref.get_for(user)
+                dref_op_update = DrefOperationalUpdate.get_for(user)
+                dref_final_report = DrefFinalReport.get_for(user)
                 result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
                 dref_list = []
                 for data in result_list:
@@ -462,7 +455,7 @@ def get_queryset(self):
                 for dref in annoatated_drefs:
                     new_dref = Dref.objects.get(id=dref.id)
                     dref_list.append(new_dref.id)
-                return Dref.objects.filter(id__in=dref_list).order_by("-created_at")
+                return Dref.objects.filter(id__in=dref_list, is_active=True).order_by("-created_at")
 
 
 class DrefShareView(views.APIView):