Merge pull request #2054 from IFRCGo/feature/search-page-fix

Add fix for search page

api/views.py

@@ -167,17 +167,19 @@ def get(self, request):
                         SearchQuerySet()
                         .models(Personnel)
                         .filter(
-                            SQ(deploying_country_name__contains=phrase)
+                            (SQ(deploying_country_name__contains=phrase)
                             | SQ(deployed_to_country_name__contains=phrase)
-                            | SQ(event_name__content=phrase)
+                            | SQ(event_name__content=phrase))
+                            & SQ(end_date__gt=datetime.now())
                         )
                         .order_by("-_score")
                     )
                     surge_alert_response = (
                         SearchQuerySet()
                         .models(SurgeAlert)
                         .filter(
-                            SQ(event_name__content=phrase) | SQ(country_name__contains=phrase) | SQ(iso3__contains=phrase)
+                            (SQ(event_name__content=phrase) | SQ(country_name__contains=phrase) | SQ(iso3__contains=phrase))
+                            & ~SQ(status='archived')
                         )
                         .order_by("-_score")
                     )
@@ -223,6 +225,7 @@ def get(self, request):
                                 | SQ(event_name__content=phrase)
                             )
                             & ~SQ(visibility="IFRC Only")
+                            & SQ(end_date__gt=datetime.now())
                         )
                         .order_by("-_score")
                     )
@@ -232,6 +235,7 @@ def get(self, request):
                         .filter(
                             (SQ(event_name__content=phrase) | SQ(country_name__contains=phrase) | SQ(iso3__contains=phrase))
                             & ~SQ(visibility="IFRC Only")
+                            & ~SQ(status='archived')
                         )
                         .order_by("-_score")
                     )
@@ -278,6 +282,7 @@ def get(self, request):
                             | SQ(event_name__content=phrase)
                         )
                         & SQ(visibility="Public")
+                        & SQ(end_date__gt=datetime.now())
                     )
                     .order_by("-_score")
                 )
@@ -287,6 +292,7 @@ def get(self, request):
                     .filter(
                         (SQ(event_name__content=phrase) | SQ(country_name__contains=phrase) | SQ(iso3__contains=phrase))
                         & SQ(visibility="Public")
+                        & ~SQ(status='archived')
                     )
                     .order_by("-_score")
                 )

per/migrations/0099_migrate_notes.py

@@ -0,0 +1,47 @@
+# Generated by Django 3.2.23 on 2024-02-22 05:45
+from django.db import migrations
+from django.db import models
+
+
+def migrate_formdata_notes(apps, schema_editor):
+    FormComponentResponse = apps.get_model("per", "FormComponentResponse")
+    FormData = apps.get_model("per", "FormData")
+
+    qs = FormComponentResponse.objects.annotate(
+        new_notes=models.Subquery(
+            # Copy notes from FormData using overview
+            FormData.objects.filter(
+                form__overview=models.OuterRef('arearesponse__perassessment__overview'),
+                question__component=models.OuterRef('component'),
+                question=74,
+            ).values('notes_en'),
+            output_field=models.CharField(),
+        ),
+    ).filter(new_notes__isnull=False)
+
+    form_component_responses = []
+    for form_component_response_id, assessment_id, new_notes in qs.values_list(
+        'id',
+        models.F('arearesponse__perassessment'),
+        'new_notes',
+    ):
+        print(f'- Copying data for {assessment_id=} {form_component_response_id=}')
+        form_component_responses.append(
+            FormComponentResponse(
+                id=form_component_response_id,
+                notes=new_notes,
+            )
+        )
+
+    print(f'Total form_component_responses notes copied: {len(form_component_responses)}')
+    FormComponentResponse.objects.bulk_update(form_component_responses, fields=('notes',))
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("per", "0098_fix_reversion_data_20240208_0502"),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_formdata_notes, reverse_code=migrations.RunPython.noop),
+    ]