refactor: remove unused areas affected api calls

EyeSeeTea · Oct 27, 2024 · 1774738 · 1774738
1 parent 9b884af
commit 1774738
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 56 deletions.
diff --git a/src/data/repositories/OrgUnitD2Repository.ts b/src/data/repositories/OrgUnitD2Repository.ts
@@ -16,9 +16,6 @@ export class OrgUnitD2Repository implements OrgUnitRepository {
                 },
             })
         ).map(response => {
-            // const d2OrgUnitsProvinceOrDistrict = response.organisationUnits.filter(
-            //     ou => ou.level === 2 || ou.level === 3
-            // );
             return this.mapD2OrgUnitsToOrgUnits(response.organisationUnits);
         });
     }

diff --git a/src/data/repositories/consts/DiseaseOutbreakConstants.ts b/src/data/repositories/consts/DiseaseOutbreakConstants.ts
@@ -117,12 +117,8 @@ export function getValueFromDiseaseOutbreak(
         RTSL_ZEB_TEA_MAIN_SYNDROME: diseaseOutbreak.mainSyndromeCode ?? "",
         RTSL_ZEB_TEA_SUSPECTED_DISEASE: diseaseOutbreak.suspectedDiseaseCode ?? "",
         RTSL_ZEB_TEA_NOTIFICATION_SOURCE: diseaseOutbreak.notificationSourceCode,
-        RTSL_ZEB_TEA_AREAS_AFFECTED_PROVINCES: getOUTextFromList(
-            diseaseOutbreak.areasAffectedProvinceIds
-        ),
-        RTSL_ZEB_TEA_AREAS_AFFECTED_DISTRICTS: getOUTextFromList(
-            diseaseOutbreak.areasAffectedDistrictIds
-        ),
+        RTSL_ZEB_TEA_AREAS_AFFECTED_PROVINCES: "",
+        RTSL_ZEB_TEA_AREAS_AFFECTED_DISTRICTS: "",
         RTSL_ZEB_TEA_INCIDENT_STATUS: diseaseOutbreak.incidentStatus,
         RTSL_ZEB_TEA_DATE_EMERGED: getDateAsIsoString(diseaseOutbreak.emerged.date),
         RTSL_ZEB_TEA_DATE_EMERGED_NARRATIVE: diseaseOutbreak.emerged.narrative,

diff --git a/src/data/repositories/utils/DiseaseOutbreakMapper.ts b/src/data/repositories/utils/DiseaseOutbreakMapper.ts
@@ -54,8 +54,6 @@ export function mapTrackedEntityAttributesToDiseaseOutbreak(
         mainSyndromeCode: fromMap("mainSyndrome"),
         suspectedDiseaseCode: fromMap("suspectedDisease"),
         notificationSourceCode: fromMap("notificationSource"),
-        areasAffectedProvinceIds: getMultipleOUFromText(fromMap("areasAffectedProvinces")),
-        areasAffectedDistrictIds: getMultipleOUFromText(fromMap("areasAffectedDistricts")),
         incidentStatus: incidentStatus,
         emerged: {
             date: new Date(fromMap("emergedDate")),

diff --git a/src/domain/entities/disease-outbreak-event/DiseaseOutbreakEvent.ts b/src/domain/entities/disease-outbreak-event/DiseaseOutbreakEvent.ts
@@ -63,8 +63,6 @@ export type DiseaseOutbreakEventBaseAttrs = NamedRef & {
     mainSyndromeCode: Maybe<Code>;
     suspectedDiseaseCode: Maybe<Code>;
     notificationSourceCode: Code;
-    areasAffectedProvinceIds: Id[];
-    areasAffectedDistrictIds: Id[];
     incidentStatus: NationalIncidentStatus;
     emerged: DateWithNarrative;
     detected: DateWithNarrative;
@@ -79,8 +77,6 @@ export type DiseaseOutbreakEventAttrs = DiseaseOutbreakEventBaseAttrs & {
     mainSyndrome: Maybe<NamedRef>;
     suspectedDisease: Maybe<NamedRef>;
     notificationSource: NamedRef;
-    areasAffectedProvinces: OrgUnit[];
-    areasAffectedDistricts: OrgUnit[];
     incidentManager: Maybe<TeamMember>; //TO DO : make mandatory once form rules applied.
     riskAssessment: Maybe<RiskAssessment>;
     incidentActionPlan: Maybe<IncidentActionPlan>;

diff --git a/src/domain/usecases/GetDiseaseOutbreakByIdUseCase.ts b/src/domain/usecases/GetDiseaseOutbreakByIdUseCase.ts
@@ -36,8 +36,6 @@ export class GetDiseaseOutbreakByIdUseCase {
                     suspectedDiseaseCode,
                     notificationSourceCode,
                     incidentManagerName,
-                    areasAffectedDistrictIds,
-                    areasAffectedProvinceIds,
                 } = diseaseOutbreakEventBase;
 
                 const { selectableOptions } = configurations;
@@ -59,10 +57,6 @@ export class GetDiseaseOutbreakByIdUseCase {
                     return Future.error(new Error("Notification source not found"));
 
                 return Future.joinObj({
-                    areasAffectedProvinces:
-                        this.options.orgUnitRepository.get(areasAffectedProvinceIds),
-                    areasAffectedDistricts:
-                        this.options.orgUnitRepository.get(areasAffectedDistrictIds),
                     riskAssessment: getAll(
                         id,
                         this.options.riskAssessmentRepository,
@@ -79,36 +73,25 @@ export class GetDiseaseOutbreakByIdUseCase {
                         configurations
                     ),
                     roles: this.options.roleRepository.getAll(),
-                }).flatMap(
-                    ({
-                        areasAffectedProvinces,
-                        areasAffectedDistricts,
-                        riskAssessment,
-                        incidentAction,
-                        incidentManagementTeam,
-                        roles,
-                    }) => {
-                        return this.options.incidentManagementTeamRepository
-                            .getIncidentManagementTeamMember(incidentManagerName, id, roles)
-                            .flatMap(incidentManager => {
-                                const diseaseOutbreakEvent: DiseaseOutbreakEvent =
-                                    new DiseaseOutbreakEvent({
-                                        ...diseaseOutbreakEventBase,
-                                        createdBy: undefined, //TO DO : FIXME populate once metadata change is done.
-                                        mainSyndrome: mainSyndrome,
-                                        suspectedDisease: suspectedDisease,
-                                        notificationSource: notificationSource,
-                                        areasAffectedProvinces: areasAffectedProvinces,
-                                        areasAffectedDistricts: areasAffectedDistricts,
-                                        incidentManager: incidentManager,
-                                        riskAssessment: riskAssessment,
-                                        incidentActionPlan: incidentAction,
-                                        incidentManagementTeam: incidentManagementTeam,
-                                    });
-                                return Future.success(diseaseOutbreakEvent);
-                            });
-                    }
-                );
+                }).flatMap(({ riskAssessment, incidentAction, incidentManagementTeam, roles }) => {
+                    return this.options.incidentManagementTeamRepository
+                        .getIncidentManagementTeamMember(incidentManagerName, id, roles)
+                        .flatMap(incidentManager => {
+                            const diseaseOutbreakEvent: DiseaseOutbreakEvent =
+                                new DiseaseOutbreakEvent({
+                                    ...diseaseOutbreakEventBase,
+                                    createdBy: undefined, //TO DO : FIXME populate once metadata change is done.
+                                    mainSyndrome: mainSyndrome,
+                                    suspectedDisease: suspectedDisease,
+                                    notificationSource: notificationSource,
+                                    incidentManager: incidentManager,
+                                    riskAssessment: riskAssessment,
+                                    incidentActionPlan: incidentAction,
+                                    incidentManagementTeam: incidentManagementTeam,
+                                });
+                            return Future.success(diseaseOutbreakEvent);
+                        });
+                });
             });
     }
 }
diff --git a/src/webapp/pages/event-tracker/useDiseaseOutbreakEvent.ts b/src/webapp/pages/event-tracker/useDiseaseOutbreakEvent.ts
@@ -31,14 +31,14 @@ export type FormSummaryData = {
     notes: string;
 };
 export function useDiseaseOutbreakEvent(id: Id) {
-    const { compositionRoot, configurations: appConfiguration } = useAppContext();
+    const { compositionRoot, configurations } = useAppContext();
     const [formSummary, setFormSummary] = useState<FormSummaryData>();
     const [summaryError, setSummaryError] = useState<string>();
     const [riskAssessmentRows, setRiskAssessmentRows] = useState<TableRowType[]>([]);
     const [eventTrackerDetails, setEventTrackerDetails] = useState<DiseaseOutbreakEvent>();
 
     useEffect(() => {
-        compositionRoot.diseaseOutbreakEvent.get.execute(id, appConfiguration).run(
+        compositionRoot.diseaseOutbreakEvent.get.execute(id, configurations).run(
             diseaseOutbreakEvent => {
                 setFormSummary(mapDiseaseOutbreakEventToFormSummary(diseaseOutbreakEvent));
                 setRiskAssessmentRows(
@@ -51,7 +51,7 @@ export function useDiseaseOutbreakEvent(id: Id) {
                 setSummaryError(`Event tracker with id: ${id} does not exist`);
             }
         );
-    }, [compositionRoot.diseaseOutbreakEvent.get, appConfiguration, id]);
+    }, [compositionRoot.diseaseOutbreakEvent.get, configurations, id]);
 
     const mapDiseaseOutbreakEventToFormSummary = (
         diseaseOutbreakEvent: DiseaseOutbreakEvent

diff --git a/src/webapp/pages/form-page/useForm.ts b/src/webapp/pages/form-page/useForm.ts
@@ -318,8 +318,7 @@ export function useForm(formType: FormType, id?: Id): State {
         formState,
         configurableForm,
         currentUser.username,
-        compositionRoot.save,
-        compositionRoot.diseaseOutbreakEvent.mapDiseaseOutbreakEventToAlerts,
+        compositionRoot,
         currentEventTracker?.id,
         goTo,
     ]);