Merge pull request #3706 from uselagoon/update-notification-fix

Fix: Updates updateNotification resolvers & removes channel from UpdateNotificationMicrosoftTeamsPatchInput
uselagoon · Sep 9, 2024 · 268e5f5 · 268e5f5
2 parents 0c3d72c + ec433f9
commit 268e5f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/services/api/src/resources/notification/resolvers.ts b/services/api/src/resources/notification/resolvers.ts
@@ -511,7 +511,7 @@ export const updateNotificationMicrosoftTeams: ResolverFn = async (
   if (isPatchEmpty(input)) {
     throw new Error('input.patch requires at least 1 attribute');
   }
-  const { name } = input;
+  const { name, patch: {name: newName = ''} } = input;
   const check = await query(
     sqlClientPool,
     Sql.selectNotificationMicrosoftTeamsByName(name)
@@ -535,7 +535,7 @@ export const updateNotificationMicrosoftTeams: ResolverFn = async (
 
   const rows = await query(
     sqlClientPool,
-    Sql.selectNotificationMicrosoftTeamsByName(name)
+    Sql.selectNotificationMicrosoftTeamsByName(newName ? newName : name)
   );
 
   return R.prop(0, rows);
@@ -552,7 +552,7 @@ export const updateNotificationWebhook: ResolverFn = async (
   if (isPatchEmpty(input)) {
     throw new Error('input.patch requires at least 1 attribute');
   }
-  const { name } = input;
+  const { name, patch: {name: newName = ''} } = input;
   const check = await query(
     sqlClientPool,
     Sql.selectNotificationWebhookByName(name)
@@ -576,7 +576,7 @@ export const updateNotificationWebhook: ResolverFn = async (
 
   const rows = await query(
     sqlClientPool,
-    Sql.selectNotificationWebhookByName(name),
+    Sql.selectNotificationWebhookByName(newName ? newName : name),
   );
 
   return R.prop(0, rows);
@@ -590,7 +590,7 @@ export const updateNotificationEmail: ResolverFn = async (
   if (isPatchEmpty(input)) {
     throw new Error('input.patch requires at least 1 attribute');
   }
-  const { name } = input;
+  const { name, patch: {name: newName = ''} } = input;
   const check = await query(
     sqlClientPool,
     Sql.selectNotificationEmailByName(name)
@@ -614,7 +614,7 @@ export const updateNotificationEmail: ResolverFn = async (
 
   const rows = await query(
     sqlClientPool,
-    Sql.selectNotificationEmailByName(name)
+    Sql.selectNotificationEmailByName(newName ? newName : name)
   );
 
   return R.prop(0, rows);
@@ -628,7 +628,7 @@ export const updateNotificationRocketChat: ResolverFn = async (
   if (isPatchEmpty(input)) {
     throw new Error('input.patch requires at least 1 attribute');
   }
-  const { name } = input;
+  const { name, patch: {name: newName = ''} } = input;
   const check = await query(
     sqlClientPool,
     Sql.selectNotificationRocketChatByName(name)
@@ -652,7 +652,7 @@ export const updateNotificationRocketChat: ResolverFn = async (
 
   const rows = await query(
     sqlClientPool,
-    Sql.selectNotificationRocketChatByName(name)
+    Sql.selectNotificationRocketChatByName(newName ? newName : name)
   );
 
   return R.prop(0, rows);
@@ -666,7 +666,7 @@ export const updateNotificationSlack: ResolverFn = async (
   if (isPatchEmpty(input)) {
     throw new Error('input.patch requires at least 1 attribute');
   }
-  const { name } = input;
+  const { name, patch: {name: newName = ''} } = input;
   const check = await query(
     sqlClientPool,
     Sql.selectNotificationSlackByName(name)
@@ -690,7 +690,7 @@ export const updateNotificationSlack: ResolverFn = async (
 
   const rows = await query(
     sqlClientPool,
-    Sql.selectNotificationSlackByName(name)
+    Sql.selectNotificationSlackByName(newName ? newName : name)
   );
 
   return R.prop(0, rows);

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -2076,7 +2076,6 @@ const typeDefs = gql`
   input UpdateNotificationMicrosoftTeamsPatchInput {
     name: String
     webhook: String
-    channel: String
   }
   input UpdateNotificationEmailPatchInput {
     name: String

diff --git a/services/workflows/internal/lagoonclient/schema.graphql b/services/workflows/internal/lagoonclient/schema.graphql
@@ -1976,7 +1976,6 @@ input UpdateNotificationMicrosoftTeamsInput {
 input UpdateNotificationMicrosoftTeamsPatchInput {
   name: String
   webhook: String
-  channel: String
 }
 
 input UpdateNotificationRocketChatInput {