Merge pull request #1727 from IFRCGo/feature/search-page-fixes

Feature/search page fixes

Author: szabozoltan69

api/views.py

@@ -31,7 +31,7 @@
 from notifications.models import Subscription, SurgeAlert
 from notifications.notification import send_notification
 from registrations.models import Recovery, Pending
-from deployments.models import Project, ERU
+from deployments.models import Project, ERU, Personnel
 from flash_update.models import FlashUpdate
 from dref.models import Dref, DrefOperationalUpdate
 
@@ -201,7 +201,11 @@ def get(self, request):
             dref_operational_update_response = SearchQuerySet().models(DrefOperationalUpdate).filter(
                 SQ(name__contains=phrase) | SQ(code__contains=phrase) | SQ(iso3__contains=phrase)
             ).order_by('-_score')
-
+            rapid_response_deployments = SearchQuerySet().models(Personnel).filter(
+                SQ(deploying_country_name__contains=phrase) |
+                SQ(deployed_to_country_name__contains=phrase) |
+                SQ(event_name__content=phrase)
+            ).order_by('-_score')
             appeals_list = []
             dref = [
                 {
@@ -355,7 +359,24 @@ def get(self, request):
                 } for data in surge_deployments[:50]
             ],
             "reports": sorted(field_report, key=lambda d: d["score"], reverse=True)[:50],
-            "emergency_planning": sorted(appeals_list, key=lambda d: d["score"], reverse=True)[:50]
+            "emergency_planning": sorted(appeals_list, key=lambda d: d["score"], reverse=True)[:50],
+            "rapid_response_deployments": [
+                {
+                    "id": int(data.id.split(".")[-1]),
+                    "name": data.name,
+                    "start_date": data.start_date,
+                    "end_date": data.end_date,
+                    "postion": data.postion,
+                    "type": data.type,
+                    "deploying_country_name": data.deploying_country_name,
+                    "deploying_country_id": data.deploying_country_id,
+                    "deployed_to_country_name": data.deployed_to_country_name,
+                    "deployed_to_country_id": data.deployed_to_country_id,
+                    "event_name": data.event_name,
+                    "event_id": data.event_id,
+                    "score": data.score,
+                } for data in rapid_response_deployments[:50]
+            ],
         }
         return Response(result)
 

deployments/models.py

@@ -204,7 +204,6 @@ class StatusChoices(models.TextChoices):
     molnix_status = models.CharField(verbose_name=_('molnix status'), max_length=8, choices=StatusChoices.choices, default=StatusChoices.ACTIVE)
     is_active = models.BooleanField(default=True)  # Active in Molnix API
 
-
     def __str__(self):
         return '%s: %s - %s' % (self.type.upper(), self.name, self.role)
 

deployments/search_indexes.py

@@ -1,6 +1,6 @@
 from haystack import indexes
 
-from deployments.models import Project, ERU
+from deployments.models import Project, ERU, Personnel
 
 
 class ProjectIndex(indexes.SearchIndex, indexes.Indexable):
@@ -45,3 +45,24 @@ def get_model(self):
 
     def index_queryset(self, using=None):
         return self.get_model().objects.all()
+
+
+class PersonnelIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.EdgeNgramField(document=True, use_template=True)
+    name = indexes.CharField(model_attr='name', null=True)
+    start_date = indexes.DateTimeField(model_attr='start_date', null=True)
+    end_date = indexes.DateTimeField(model_attr='end_date', null=True)
+    position = indexes.CharField(model_attr='role', null=True)
+    type = indexes.CharField(model_attr='get_type_display', null=True)
+    deploying_country_name = indexes.CharField(model_attr='country_from__society_name', null=True)
+    deploying_country_id = indexes.IntegerField(model_attr='country_from__id', null=True)
+    deployed_to_country_name = indexes.CharField(model_attr='country_to__name', null=True)
+    deployed_to_country_id = indexes.IntegerField(model_attr='country_to__id', null=True)
+    event_name = indexes.EdgeNgramField(model_attr='deployment__event_deployed_to__name')
+    event_id = indexes.IntegerField(model_attr='deployment__event_deployed_to__id', null=True)
+
+    def get_model(self):
+        return Personnel
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects.all()

deployments/templates/search/indexes/deployments/personnel_text.txt

@@ -0,0 +1,3 @@
+{{object.event_name}}
+{{object.deploying_country_name}}
+{{object.deployed_to_country_name}}