Merge pull request #2611 from uselagoon/feature/delete-problem-mutati…

…on-changes adding service to deleteProblem mutation
uselagoon · Dec 7, 2023 · 979b645 · 979b645
2 parents b8ff06a + bc99d18
commit 979b645
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/services/api/src/resources/problem/resolvers.ts b/services/api/src/resources/problem/resolvers.ts
@@ -215,8 +215,8 @@ export const addProblem: ResolverFn = async (
 
 export const deleteProblem: ResolverFn = async (
   root,
-  { input: { environment: environmentId, identifier } },
-  { sqlClientPool, hasPermission, userActivityLogger }
+  { input: { environment: environmentId, identifier, service } },
+  { sqlClientPool, hasPermission, userActivityLogger  }
 ) => {
   const environment = await environmentHelpers(
     sqlClientPool
@@ -226,7 +226,7 @@ export const deleteProblem: ResolverFn = async (
     project: environment.project
   });
 
-  await query(sqlClientPool, Sql.deleteProblem(environmentId, identifier));
+  await query(sqlClientPool, Sql.deleteProblem(environmentId, identifier, service));
 
   userActivityLogger(`User deleted a problem on environment '${environment.name}' for '${environment.project}'`, {
     project: '',

diff --git a/services/api/src/resources/problem/sql.ts b/services/api/src/resources/problem/sql.ts
@@ -128,14 +128,17 @@ export const Sql = {
         created
       })
       .toString(),
-  deleteProblem: (environment, identifier) =>
-    knex('environment_problem')
+  deleteProblem: (environment, identifier, service) => {
+    let q = knex('environment_problem')
       .where({
         environment: environment,
         identifier: identifier
-      })
-      .del()
-      .toString(),
+      });
+    if (service != undefined) {
+      q.where('lagoon_service', service);
+    }
+    return q.del().toString();
+  },
   deleteProblemsFromSource: (environment, source, service) =>
     knex('environment_problem')
       .where({

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -307,6 +307,7 @@ const typeDefs = gql`
   input DeleteProblemInput {
     environment: Int!
     identifier: String!
+    service: String
   }
 
   input DeleteProblemsFromSourceInput {