Add fix for search page

k9845 · thenav56 · commit a20d885f722d · 2024-02-26T18:28:18.000+05:45
diff --git a/api/views.py b/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")
                 )

Original file line number	Diff line number	Diff line change
`@@ -167,17 +167,19 @@ def get(self, request):`
`167`	`167`	`SearchQuerySet()`
`168`	`168`	`.models(Personnel)`
`169`	`169`	`.filter(`
`170`		`- SQ(deploying_country_name__contains=phrase)`
	`170`	`+ (SQ(deploying_country_name__contains=phrase)`
`171`	`171`	`\| SQ(deployed_to_country_name__contains=phrase)`
`172`		`- \| SQ(event_name__content=phrase)`
	`172`	`+ \| SQ(event_name__content=phrase))`
	`173`	`+ & SQ(end_date__gt=datetime.now())`
`173`	`174`	`)`
`174`	`175`	`.order_by("-_score")`
`175`	`176`	`)`
`176`	`177`	`surge_alert_response = (`
`177`	`178`	`SearchQuerySet()`
`178`	`179`	`.models(SurgeAlert)`
`179`	`180`	`.filter(`
`180`		`- SQ(event_name__content=phrase) \| SQ(country_name__contains=phrase) \| SQ(iso3__contains=phrase)`
	`181`	`+ (SQ(event_name__content=phrase) \| SQ(country_name__contains=phrase) \| SQ(iso3__contains=phrase))`
	`182`	`+ & ~SQ(status='archived')`
`181`	`183`	`)`
`182`	`184`	`.order_by("-_score")`
`183`	`185`	`)`
`@@ -223,6 +225,7 @@ def get(self, request):`
`223`	`225`	`\| SQ(event_name__content=phrase)`
`224`	`226`	`)`
`225`	`227`	`& ~SQ(visibility="IFRC Only")`
	`228`	`+ & SQ(end_date__gt=datetime.now())`
`226`	`229`	`)`
`227`	`230`	`.order_by("-_score")`
`228`	`231`	`)`
`@@ -232,6 +235,7 @@ def get(self, request):`
`232`	`235`	`.filter(`
`233`	`236`	`(SQ(event_name__content=phrase) \| SQ(country_name__contains=phrase) \| SQ(iso3__contains=phrase))`
`234`	`237`	`& ~SQ(visibility="IFRC Only")`
	`238`	`+ & ~SQ(status='archived')`
`235`	`239`	`)`
`236`	`240`	`.order_by("-_score")`
`237`	`241`	`)`
`@@ -278,6 +282,7 @@ def get(self, request):`
`278`	`282`	`\| SQ(event_name__content=phrase)`
`279`	`283`	`)`
`280`	`284`	`& SQ(visibility="Public")`
	`285`	`+ & SQ(end_date__gt=datetime.now())`
`281`	`286`	`)`
`282`	`287`	`.order_by("-_score")`
`283`	`288`	`)`
`@@ -287,6 +292,7 @@ def get(self, request):`
`287`	`292`	`.filter(`
`288`	`293`	`(SQ(event_name__content=phrase) \| SQ(country_name__contains=phrase) \| SQ(iso3__contains=phrase))`
`289`	`294`	`& SQ(visibility="Public")`
	`295`	`+ & ~SQ(status='archived')`
`290`	`296`	`)`
`291`	`297`	`.order_by("-_score")`
`292`	`298`	`)`