Merge pull request #3627 from uselagoon/feature/add_service_to_delete…

…FactsFromSource Adds service to deleteFactsFromSource
uselagoon · Feb 6, 2024 · 7dfbaa4 · 7dfbaa4
2 parents ad08dbe + d368cd8
commit 7dfbaa4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/services/api/src/resources/fact/resolvers.ts b/services/api/src/resources/fact/resolvers.ts
@@ -382,26 +382,31 @@ export const deleteFact: ResolverFn = async (
 
 export const deleteFactsFromSource: ResolverFn = async (
   root,
-  { input: { environment: environmentId, source } },
+  { input: { environment: environmentId, source, service } },
   { sqlClientPool, hasPermission, userActivityLogger }
 ) => {
   const environment = await environmentHelpers(
     sqlClientPool
   ).getEnvironmentById(environmentId);
 
+  if(environment == null) {
+    throw new Error(`Unable to find environment with id: ${environmentId}`);
+  }
+
   await hasPermission('fact', 'delete', {
     project: environment.project
   });
 
-  await query(sqlClientPool, Sql.deleteFactsFromSource(environmentId, source));
+  await query(sqlClientPool, Sql.deleteFactsFromSource(environmentId, source, service));
 
   userActivityLogger(`User deleted facts`, {
     project: '',
     event: 'api:deleteFactsFromSource',
     payload: {
       data: {
         environment: environmentId,
-        source
+        source,
+        service
       }
     }
   });

diff --git a/services/api/src/resources/fact/sql.ts b/services/api/src/resources/fact/sql.ts
@@ -55,11 +55,18 @@ export const Sql = {
         })
         .del()
         .toString(),
-  deleteFactsFromSource: (environment, source) =>
-    knex('environment_fact')
-      .where({ environment, source })
-      .del()
-      .toString(),
+  deleteFactsFromSource: (environment, source, service) => {
+    let query =  knex('environment_fact')
+      .where({ environment, source });
+
+      if(service != null) {
+        query = query.andWhere("service", "=", service)
+      }
+
+    query = query.del();
+
+    return query.toString();
+  },
   selectFactReferenceByDatabaseId: (id: number) =>
     knex('environment_fact_reference')
       .where({ id })

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -380,6 +380,7 @@ const typeDefs = gql`
   input DeleteFactsFromSourceInput {
     environment: Int!
     source: String!
+    service: String
   }
 
   type FactReference {