Skip to content

Commit 6382764

Browse files
Merge pull request #2298 from IFRCGo/fix/validate-extracts
Validation Check for the validated extracts for secondary summary
2 parents 965d40f + f496654 commit 6382764

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

per/ops_learning_summary.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def add_used_ops_learnings_sector(
169169
if not sector_instance:
170170
logger.info(f"Sector '{sector}' not found.")
171171
return
172-
ops_learning_instances = OpsLearning.objects.filter(id__in=used_ops_learnings)
172+
ops_learning_instances = OpsLearning.objects.filter(is_validated=True, id__in=used_ops_learnings)
173173
if len(ops_learning_instances):
174174
ops_learning_sector, created = (
175175
OpsLearningSectorCacheResponse.objects.select_related("filter_response", "sector")
@@ -205,7 +205,7 @@ def add_used_ops_learnings_component(
205205
if not component_instance:
206206
logger.info(f"Component '{component}' not found.")
207207
return
208-
ops_learning_instances = OpsLearning.objects.filter(id__in=used_ops_learnings)
208+
ops_learning_instances = OpsLearning.objects.filter(is_validated=True, id__in=used_ops_learnings)
209209
if len(ops_learning_instances):
210210
ops_learning_component, created = (
211211
OpsLearningComponentCacheResponse.objects.select_related("filter_response", "component")
@@ -276,7 +276,7 @@ def fetch_ops_learnings(cls, filter_data):
276276
"excerpts_id",
277277
"component_title",
278278
"sector_title",
279-
"learning",
279+
"learning_validated",
280280
"country_id",
281281
"country_name",
282282
"region_id",
@@ -287,10 +287,7 @@ def fetch_ops_learnings(cls, filter_data):
287287
)
288288
)
289289
ops_learning_df = ops_learning_df.rename(
290-
columns={
291-
"component_title": "component",
292-
"sector_title": "sector",
293-
}
290+
columns={"component_title": "component", "sector_title": "sector", "learning_validated": "learning"}
294291
)
295292
ops_learning_df.set_index("id", inplace=True)
296293
return ops_learning_df
@@ -795,14 +792,14 @@ def _modify_format(summary) -> str:
795792

796793
# Attempt to parse the summary as a dictionary
797794
if _validate_text_is_dictionary(summary):
798-
formated_summary = ast.literal_eval(summary)
795+
formatted_summary = ast.literal_eval(summary)
799796
else:
800797
formatted_summary = _modify_format(summary)
801798
formatted_summary = ast.literal_eval(formatted_summary)
802799

803800
# Checking if the generated summary is empty
804-
if bool(formated_summary):
805-
return formated_summary
801+
if bool(formatted_summary):
802+
return formatted_summary
806803

807804
# NOTE: Generating the summary if summary is empty
808805
while retires < MAX_RETRIES:

0 commit comments

Comments
 (0)