Merge pull request #1810 from IFRCGo/fix/dref-account-page

Refactor filter issue in dref account page

Author: szabozoltan69

dref/views.py

@@ -293,12 +293,49 @@ def get_queryset(self):
                 .filter(dref__is_final_report_created=False)
                 .distinct()
             )
+            result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
+            dref_list = []
+            for data in result_list:
+                if data.__class__.__name__ == "DrefFinalReport":
+                    final_report = DrefFinalReport.objects.get(id=data.id)
+                    dref_list.append(final_report)
+                elif data.__class__.__name__ == "DrefOperationalUpdate":
+                    operational_update = DrefOperationalUpdate.objects.get(id=data.id)
+                    dref_list.append(operational_update)
+                elif data.__class__.__name__ == "Dref":
+                    dref = Dref.objects.get(id=data.id)
+                    dref_list.append(dref)
+            # iterate over the list and get the dref from that
+            # check the dref in the new list if exists
+            # annotated dref here
+            annoatated_drefs = []
+            for dref in dref_list:
+                if dref.__class__.__name__ == "DrefOperationalUpdate":
+                    # annotate the dref and other operational update for that dref
+                    operational_update = DrefOperationalUpdate.objects.get(id=dref.id)
+                    dref_object = Dref.objects.get(drefoperationalupdate=operational_update.id)
+                    if dref_object not in annoatated_drefs:
+                        annoatated_drefs.append(dref_object)
+                elif dref.__class__.__name__ == "Dref":
+                    dref_object = Dref.objects.get(id=dref.id)
+                    if dref_object not in annoatated_drefs:
+                        annoatated_drefs.append(dref_object)
+                elif dref.__class__.__name__ == "DrefFinalReport":
+                    final_report = DrefFinalReport.objects.get(id=dref.id)
+                    dref_object = Dref.objects.get(dreffinalreport=final_report.id)
+                    if dref_object not in annoatated_drefs:
+                        annoatated_drefs.append(dref_object)
+            dref_list = []
+            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")
         else:
             # get current user dref regions
             regions = [0, 1, 2, 3, 4]
             for region in regions:
                 codename = f"dref_region_admin_{region}"
-                if Permission.objects.filter(user=user, codename=codename).exists():
+                if Permission.objects.filter(group__user=user, codename=codename).exists():
                     dref = (
                         Dref.objects.prefetch_related(
                             "planned_interventions", "needs_identified", "national_society_actions", "users"
@@ -336,47 +373,85 @@ def get_queryset(self):
                         .filter(country__region=region, dref__is_final_report_created=False)
                         .distinct()
                     )
+                    result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
+                    dref_list = []
+                    for data in result_list:
+                        if data.__class__.__name__ == "DrefFinalReport":
+                            final_report = DrefFinalReport.objects.get(id=data.id)
+                            dref_list.append(final_report)
+                        elif data.__class__.__name__ == "DrefOperationalUpdate":
+                            operational_update = DrefOperationalUpdate.objects.get(id=data.id)
+                            dref_list.append(operational_update)
+                        elif data.__class__.__name__ == "Dref":
+                            dref = Dref.objects.get(id=data.id)
+                            dref_list.append(dref)
+                    # iterate over the list and get the dref from that
+                    # check the dref in the new list if exists
+                    # annotated dref here
+                    annoatated_drefs = []
+                    for dref in dref_list:
+                        if dref.__class__.__name__ == "DrefOperationalUpdate":
+                            # annotate the dref and other operational update for that dref
+                            operational_update = DrefOperationalUpdate.objects.get(id=dref.id)
+                            dref_object = Dref.objects.get(drefoperationalupdate=operational_update.id)
+                            if dref_object not in annoatated_drefs:
+                                annoatated_drefs.append(dref_object)
+                        elif dref.__class__.__name__ == "Dref":
+                            dref_object = Dref.objects.get(id=dref.id)
+                            if dref_object not in annoatated_drefs:
+                                annoatated_drefs.append(dref_object)
+                        elif dref.__class__.__name__ == "DrefFinalReport":
+                            final_report = DrefFinalReport.objects.get(id=dref.id)
+                            dref_object = Dref.objects.get(dreffinalreport=final_report.id)
+                            if dref_object not in annoatated_drefs:
+                                annoatated_drefs.append(dref_object)
+                    dref_list = []
+                    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")
                 else:
                     dref = Dref.get_for(user).filter(dref__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)
-        result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
-        dref_list = []
-        for data in result_list:
-            if data.__class__.__name__ == "DrefFinalReport":
-                final_report = DrefFinalReport.objects.get(id=data.id)
-                dref_list.append(final_report)
-            elif data.__class__.__name__ == "DrefOperationalUpdate":
-                operational_update = DrefOperationalUpdate.objects.get(id=data.id)
-                dref_list.append(operational_update)
-            elif data.__class__.__name__ == "Dref":
-                dref = Dref.objects.get(id=data.id)
-                dref_list.append(dref)
-        # iterate over the list and get the dref from that
-        # check the dref in the new list if exists
-        # annotated dref here
-        annoatated_drefs = []
-        for dref in dref_list:
-            if dref.__class__.__name__ == "DrefOperationalUpdate":
-                # annotate the dref and other operational update for that dref
-                operational_update = DrefOperationalUpdate.objects.get(id=dref.id)
-                dref_object = Dref.objects.get(drefoperationalupdate=operational_update.id)
-                if dref_object not in annoatated_drefs:
-                    annoatated_drefs.append(dref_object)
-            elif dref.__class__.__name__ == "Dref":
-                dref_object = Dref.objects.get(id=dref.id)
-                if dref_object not in annoatated_drefs:
-                    annoatated_drefs.append(dref_object)
-            elif dref.__class__.__name__ == "DrefFinalReport":
-                final_report = DrefFinalReport.objects.get(id=dref.id)
-                dref_object = Dref.objects.get(dreffinalreport=final_report.id)
-                if dref_object not in annoatated_drefs:
-                    annoatated_drefs.append(dref_object)
-        dref_list = []
-        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")
+                    result_list = sorted(chain(dref, dref_op_update, dref_final_report), key=attrgetter("created_at"), reverse=True)
+                    dref_list = []
+                    for data in result_list:
+                        if data.__class__.__name__ == "DrefFinalReport":
+                            final_report = DrefFinalReport.objects.get(id=data.id)
+                            dref_list.append(final_report)
+                        elif data.__class__.__name__ == "DrefOperationalUpdate":
+                            operational_update = DrefOperationalUpdate.objects.get(id=data.id)
+                            dref_list.append(operational_update)
+                        elif data.__class__.__name__ == "Dref":
+                            dref = Dref.objects.get(id=data.id)
+                            dref_list.append(dref)
+                    # iterate over the list and get the dref from that
+                    # check the dref in the new list if exists
+                    # annotated dref here
+                    annoatated_drefs = []
+                    for dref in dref_list:
+                        if dref.__class__.__name__ == "DrefOperationalUpdate":
+                            # annotate the dref and other operational update for that dref
+                            operational_update = DrefOperationalUpdate.objects.get(id=dref.id)
+                            dref_object = Dref.objects.get(drefoperationalupdate=operational_update.id)
+                            if dref_object not in annoatated_drefs:
+                                annoatated_drefs.append(dref_object)
+                        elif dref.__class__.__name__ == "Dref":
+                            dref_object = Dref.objects.get(id=dref.id)
+                            if dref_object not in annoatated_drefs:
+                                annoatated_drefs.append(dref_object)
+                        elif dref.__class__.__name__ == "DrefFinalReport":
+                            final_report = DrefFinalReport.objects.get(id=dref.id)
+                            dref_object = Dref.objects.get(dreffinalreport=final_report.id)
+                            if dref_object not in annoatated_drefs:
+                                annoatated_drefs.append(dref_object)
+                    dref_list = []
+                    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")
+        
 
 
 class DrefShareView(views.APIView):