feat: delete incident response action

EyeSeeTea · Nov 27, 2024 · 0d67318 · 0d67318
1 parent 1af13b6
commit 0d67318
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 149 deletions.
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
@@ -71,7 +71,6 @@ import { CompleteEventTrackerUseCase } from "./domain/usecases/CompleteEventTrac
 import { UserGroupD2Repository } from "./data/repositories/UserGroupD2Repository";
 import { UserGroupRepository } from "./domain/repositories/UserGroupRepository";
 import { UserGroupTestRepository } from "./data/repositories/test/UserGroupTestRepository";
-import { DeleteIncidentResponseActionUseCase } from "./domain/usecases/DeleteIncidentResponseActionUseCase";
 
 export type CompositionRoot = ReturnType<typeof getCompositionRoot>;
 
@@ -118,7 +117,6 @@ function getCompositionRoot(repositories: Repositories) {
         incidentActionPlan: {
             get: new GetIncidentActionByIdUseCase(repositories),
             updateResponseAction: new UpdateIncidentResponseActionUseCase(repositories),
-            deleteResponseAction: new DeleteIncidentResponseActionUseCase(repositories),
         },
         incidentManagementTeam: {
             get: new GetIncidentManagementTeamByIdUseCase(repositories),

diff --git a/src/data/repositories/IncidentActionD2Repository.ts b/src/data/repositories/IncidentActionD2Repository.ts
@@ -134,7 +134,8 @@ export class IncidentActionD2Repository implements IncidentActionRepository {
 
     saveIncidentAction(
         formData: ActionPlanFormData | ResponseActionFormData | SingleResponseActionFormData,
-        diseaseOutbreakId: Id
+        diseaseOutbreakId: Id,
+        formOptionsToDelete?: Id[]
     ): FutureData<void> {
         const programStageId = this.getProgramStageByFormType(formData.type);
 
@@ -178,17 +179,25 @@ export class IncidentActionD2Repository implements IncidentActionRepository {
                     if (saveResponse.status === "ERROR" || !diseaseOutbreakId) {
                         return Future.error(new Error(`Error saving Incident Action`));
                     } else {
+                        if (formOptionsToDelete && formOptionsToDelete.length > 0) {
+                            return this.deleteIncidentResponseAction(formOptionsToDelete);
+                        }
+
                         return Future.success(undefined);
                     }
                 });
             });
         });
     }
 
-    deleteIncidentResponseAction(eventId: Id): FutureData<void> {
+    deleteIncidentResponseAction(events: Id[]): FutureData<void> {
         return apiToFuture(
-            // @ts-ignore
-            this.api.tracker.post({ importStrategy: "DELETE" }, { events: [{ event: eventId }] })
+            this.api.tracker.post(
+                { importStrategy: "DELETE" },
+                // an array of event ids is sufficient for TrackerPostRequest with DELETE importStrategy payload
+                // @ts-ignore
+                { events: events.map(event => ({ event: event })) }
+            )
         ).flatMap(response => {
             if (response.status === "ERROR") {
                 return Future.error(new Error(`Error deleting Response Action`));

diff --git a/src/data/repositories/test/IncidentActionTestRepository.ts b/src/data/repositories/test/IncidentActionTestRepository.ts
@@ -21,11 +21,11 @@ export class IncidentActionTestRepository implements IncidentActionRepository {
         throw new Error("Method not implemented.");
     }
 
-    saveIncidentAction(_formData: any, _diseaseOutbreakId: Id): FutureData<void> {
-        throw new Error("Method not implemented.");
-    }
-
-    deleteIncidentResponseAction(_eventId: Id): FutureData<void> {
+    saveIncidentAction(
+        _formData: any,
+        _diseaseOutbreakId: Id,
+        _formOptionsToDelete?: Id[]
+    ): FutureData<void> {
         throw new Error("Method not implemented.");
     }
 

diff --git a/src/domain/repositories/IncidentActionRepository.ts b/src/domain/repositories/IncidentActionRepository.ts
@@ -18,9 +18,9 @@ export interface IncidentActionRepository {
     ): FutureData<Maybe<IncidentResponseActionDataValues[]>>;
     saveIncidentAction(
         formData: ActionPlanFormData | ResponseActionFormData | SingleResponseActionFormData,
-        diseaseOutbreakId: Id
+        diseaseOutbreakId: Id,
+        formOptionsToDelete?: Id[]
     ): FutureData<void>;
-    deleteIncidentResponseAction(eventId: Id): FutureData<void>;
     updateIncidentResponseAction(options: UpdateIncidentResponseActionOptions): FutureData<void>;
 }
 

diff --git a/src/domain/usecases/DeleteIncidentResponseActionUseCase.ts b/src/domain/usecases/DeleteIncidentResponseActionUseCase.ts
diff --git a/src/domain/usecases/SaveEntityUseCase.ts b/src/domain/usecases/SaveEntityUseCase.ts
@@ -28,7 +28,8 @@ export class SaveEntityUseCase {
 
     public execute(
         formData: ConfigurableForm,
-        configurations: Configurations
+        configurations: Configurations,
+        formOptionsToDelete?: Id[]
     ): FutureData<void | Id> {
         if (!formData || !formData.entity) return Future.error(new Error("No form data found"));
         switch (formData.type) {
@@ -56,7 +57,8 @@ export class SaveEntityUseCase {
             case "incident-response-action":
                 return this.options.incidentActionRepository.saveIncidentAction(
                     formData,
-                    formData.eventTrackerDetails.id
+                    formData.eventTrackerDetails.id,
+                    formOptionsToDelete
                 );
             case "incident-management-team-member-assignment": {
                 const isIncidentManager = formData.entity.teamRoles?.find(

diff --git a/src/webapp/pages/form-page/mapFormStateToEntityData.ts b/src/webapp/pages/form-page/mapFormStateToEntityData.ts
@@ -557,37 +557,38 @@ function mapFormStateToIncidentResponseActions(
 
     const incidentResponseActions: ResponseAction[] = formState.sections
         .filter(section => !section.id.includes("addNewResponseActionSection"))
-        .map((_, index): ResponseAction => {
+        .map((section): ResponseAction => {
+            const sectionIndex = extractIndex(section.id);
+
             const mainTask = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.mainTask}_${index}`)
+                field.id.includes(`${responseActionConstants.mainTask}_${sectionIndex}`)
             )?.value as string;
             const subActivities = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.subActivities}_${index}`)
+                field.id.includes(`${responseActionConstants.subActivities}_${sectionIndex}`)
             )?.value as string;
             const subPillar = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.subPillar}_${index}`)
+                field.id.includes(`${responseActionConstants.subPillar}_${sectionIndex}`)
             )?.value as string;
             const dueDate = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.dueDate}_${index}`)
+                field.id.includes(`${responseActionConstants.dueDate}_${sectionIndex}`)
             )?.value as Date;
 
             const searchAssignROValue = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.searchAssignRO}_${index}`)
+                field.id.includes(`${responseActionConstants.searchAssignRO}_${sectionIndex}`)
             )?.value as string;
             const searchAssignRO = formData.options.searchAssignRO.find(
                 option => option.id === searchAssignROValue
             );
-            console.log({ allFields, formState, searchAssignRO, searchAssignROValue, formData });
             if (!searchAssignRO) throw new Error("Responsible officer not found");
 
             const statusValue = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.status}_${index}`)
+                field.id.includes(`${responseActionConstants.status}_${sectionIndex}`)
             )?.value as string;
             const status = formData.options.status.find(option => option.id === statusValue);
             if (!status) throw new Error("Status not found");
 
             const verificationValue = allFields.find(field =>
-                field.id.includes(`${responseActionConstants.verification}_${index}`)
+                field.id.includes(`${responseActionConstants.verification}_${sectionIndex}`)
             )?.value as string;
             const verification = formData.options.verification.find(
                 option => option.id === verificationValue
@@ -597,8 +598,13 @@ function mapFormStateToIncidentResponseActions(
             };
             if (!verification) throw new Error("Verification not found");
 
+            const selectedEntityData =
+                sectionIndex !== undefined ? formData.entity[sectionIndex] : undefined;
+            const isResponseActionValid = selectedEntityData !== undefined;
+            const responseActionId = isResponseActionValid ? selectedEntityData.id : "";
+
             const responseAction = new ResponseAction({
-                id: formData.entity?.[index]?.id ?? "",
+                id: responseActionId,
                 mainTask: mainTask,
                 subActivities: subActivities,
                 subPillar: subPillar,
@@ -749,3 +755,11 @@ function mapFormStateToIncidentManagementTeamMember(
         status: teamMemberAssigned?.status,
     });
 }
+
+function extractIndex(input: string): number | undefined {
+    const parts = input.split("_");
+    const lastPart = parts[parts.length - 1];
+    const index = Number(lastPart);
+
+    return isNaN(index) ? undefined : index;
+}