update logic of how to handle update of event handler

FRINXio · Aug 3, 2023 · 2a7f5c2 · 2a7f5c2
1 parent 727da25
commit 2a7f5c2
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/src/helpers/event-handler.helpers.ts b/src/helpers/event-handler.helpers.ts
@@ -163,14 +163,34 @@ function makeFromGraphQLToApiEventHandlerAction(eventHandlerAction: EventHandler
   };
 }
 
-export function makeFromGraphQLToApiEventHandler(eventHandler: EventHandlerGraphQL): ApiEventHandler {
+export function makeFromGraphQLToApiEventHandler(
+  eventHandler: EventHandlerGraphQL,
+  oldEventHandler: ApiEventHandler | null = null,
+): ApiEventHandler {
+  if (oldEventHandler == null) {
+    return {
+      name: eventHandler.name,
+      event: eventHandler.event,
+      actions: eventHandler.actions.map(makeFromGraphQLToApiEventHandlerAction),
+      condition: eventHandler.condition || undefined,
+      active: eventHandler.isActive || undefined,
+      evaluatorType: eventHandler.evaluatorType || undefined,
+    };
+  }
+
   return {
     name: eventHandler.name,
     event: eventHandler.event,
-    active: eventHandler.isActive || undefined,
-    condition: eventHandler.condition || undefined,
     actions: eventHandler.actions.map(makeFromGraphQLToApiEventHandlerAction),
-    evaluatorType: eventHandler.evaluatorType || undefined,
+    ...(eventHandler.condition == null
+      ? { condition: oldEventHandler.condition || undefined }
+      : { condition: eventHandler.condition }),
+    ...(eventHandler.isActive == null
+      ? { active: oldEventHandler.active || undefined }
+      : { active: eventHandler.isActive }),
+    ...(eventHandler.evaluatorType == null
+      ? { evaluatorType: oldEventHandler.evaluatorType || undefined }
+      : { evaluatorType: eventHandler.evaluatorType }),
   };
 }
 

diff --git a/src/schema/event-handler.ts b/src/schema/event-handler.ts
@@ -226,23 +226,29 @@ export const UpdateEventHandlerMutation = mutationField('updateEventHandler', {
     if (input.actions == null || input.actions.length === 0) {
       await conductorAPI.updateEventHandler(config.conductorApiURL, {
         ...oldEventHandler,
-        ...makeFromGraphQLToApiEventHandler({
-          ...input,
-          actions: [],
-          name,
-          event,
-        }),
+        ...makeFromGraphQLToApiEventHandler(
+          {
+            ...input,
+            actions: [],
+            name,
+            event,
+          },
+          oldEventHandler,
+        ),
         actions: oldEventHandler.actions,
       });
     } else {
       await conductorAPI.updateEventHandler(config.conductorApiURL, {
         ...oldEventHandler,
-        ...makeFromGraphQLToApiEventHandler({
-          ...input,
-          actions: input.actions,
-          name,
-          event,
-        }),
+        ...makeFromGraphQLToApiEventHandler(
+          {
+            ...input,
+            actions: input.actions,
+            name,
+            event,
+          },
+          oldEventHandler,
+        ),
       });
     }