@@ -174,9 +174,9 @@ def get(self, request):
174174 ).order_by ('-_score' )
175175 emergency_response = SearchQuerySet ().models (Event ).filter (
176176 SQ (name__content = phrase ) | SQ (iso3__content = phrase )).order_by ('-_score' )
177- appeal_response = SearchQuerySet ().models (Appeal ).filter (
178- SQ (name__content = phrase ) | SQ (code__content = phrase ) | SQ (iso3__content = phrase )
179- ).order_by ('-_score' )
177+ # appeal_response = SearchQuerySet().models(Appeal).filter(
178+ # SQ(name__content=phrase) | SQ(code__content=phrase) | SQ(iso3__content=phrase)
179+ # ).order_by('-_score')
180180 fieldreport_response = SearchQuerySet ().models (FieldReport ).filter (
181181 SQ (name__content = phrase ) | SQ (iso3__content = phrase )
182182 ).order_by ('-_score' )
@@ -195,57 +195,57 @@ def get(self, request):
195195 flash_update_response = SearchQuerySet ().models (FlashUpdate ).filter (
196196 SQ (name__contains = phrase ) | SQ (iso3__contains = phrase )
197197 ).order_by ('-_score' )
198- dref_response = SearchQuerySet ().models (Dref ).filter (
199- SQ (name__contains = phrase ) | SQ (code__contains = phrase ) | SQ (iso3__contains = phrase )
200- ).order_by ('-_score' )
201- dref_operational_update_response = SearchQuerySet ().models (DrefOperationalUpdate ).filter (
202- SQ (name__contains = phrase ) | SQ (code__contains = phrase ) | SQ (iso3__contains = phrase )
203- ).order_by ('-_score' )
198+ # dref_response = SearchQuerySet().models(Dref).filter(
199+ # SQ(name__contains=phrase) | SQ(code__contains=phrase) | SQ(iso3__contains=phrase)
200+ # ).order_by('-_score')
201+ # dref_operational_update_response = SearchQuerySet().models(DrefOperationalUpdate).filter(
202+ # SQ(name__contains=phrase) | SQ(code__contains=phrase) | SQ(iso3__contains=phrase)
203+ # ).order_by('-_score')
204204 rapid_response_deployments = SearchQuerySet ().models (Personnel ).filter (
205205 SQ (deploying_country_name__contains = phrase ) |
206206 SQ (deployed_to_country_name__contains = phrase ) |
207207 SQ (event_name__content = phrase )
208208 ).order_by ('-_score' )
209- appeals_list = []
210- dref = [
211- {
212- "id" : int (data .id .split ("." )[- 1 ]),
213- "name" : data .name ,
214- "created_at" : data .created_at ,
215- "type" : "Dref" ,
216- "score" : data .score ,
217- "country_name" : data .country_name ,
218- "country_id" : data .country_id ,
219- "code" : data .code
220- } for data in dref_response
221- ]
222- appeals_list .extend (dref )
223- dref_op = [
224- {
225- "id" : int (data .id .split ("." )[- 1 ]),
226- "name" : data .name ,
227- "created_at" : data .created_at ,
228- "type" : "Operational Update" ,
229- "score" : data .score ,
230- "country_name" : data .country_name ,
231- "country_id" : data .country_id ,
232- "code" : data .code
233- } for data in dref_operational_update_response
234- ]
235- appeals_list .extend (dref_op )
236- appeal_data = [
237- {
238- "id" : int (data .id .split ("." )[- 1 ]),
239- "name" : data .name ,
240- "code" : data .code ,
241- "country" : data .country_name ,
242- "country_id" : data .country_id ,
243- "start_date" : data .start_date ,
244- "score" : data .score ,
245- "type" : "Appeal" ,
246- } for data in appeal_response
247- ]
248- appeals_list .extend (appeal_data )
209+ # appeals_list = []
210+ # dref = [
211+ # {
212+ # "id": int(data.id.split(".")[-1]),
213+ # "name": data.name,
214+ # "created_at": data.created_at,
215+ # "type": "Dref",
216+ # "score": data.score,
217+ # "country_name": data.country_name,
218+ # "country_id": data.country_id,
219+ # "code": data.code
220+ # } for data in dref_response
221+ # ]
222+ # appeals_list.extend(dref)
223+ # dref_op = [
224+ # {
225+ # "id": int(data.id.split(".")[-1]),
226+ # "name": data.name,
227+ # "created_at": data.created_at,
228+ # "type": "Operational Update",
229+ # "score": data.score,
230+ # "country_name": data.country_name,
231+ # "country_id": data.country_id,
232+ # "code": data.code
233+ # } for data in dref_operational_update_response
234+ # ]
235+ # appeals_list.extend(dref_op)
236+ # appeal_data = [
237+ # {
238+ # "id": int(data.id.split(".")[-1]),
239+ # "name": data.name,
240+ # "code": data.code,
241+ # "country": data.country_name,
242+ # "country_id": data.country_id,
243+ # "start_date": data.start_date,
244+ # "score": data.score,
245+ # "type": "Appeal",
246+ # } for data in appeal_response
247+ # ]
248+ # appeals_list.extend(appeal_data)
249249 field_report = []
250250 flash_update = [
251251 {
@@ -359,7 +359,7 @@ def get(self, request):
359359 } for data in surge_deployments [:50 ]
360360 ],
361361 "reports" : sorted (field_report , key = lambda d : d ["score" ], reverse = True )[:50 ],
362- "emergency_planning" : sorted (appeals_list , key = lambda d : d ["score" ], reverse = True )[:50 ],
362+ # "emergency_planning": sorted(appeals_list, key=lambda d: d["score"], reverse=True)[:50],
363363 "rapid_response_deployments" : [
364364 {
365365 "id" : int (data .id .split ("." )[- 1 ]),
0 commit comments