Merge pull request #3866 from uselagoon/deployment-by-filter-dates

feat: more filters for deploymentsByFilter
uselagoon · Feb 14, 2025 · 22bd950 · 22bd950
2 parents d593e38 + 4c153f2
commit 22bd950
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/services/api/src/resources/deployment/resolvers.ts b/services/api/src/resources/deployment/resolvers.ts
@@ -151,7 +151,7 @@ export const getDeploymentsByFilter: ResolverFn = async (
   { sqlClientPool, hasPermission, models, keycloakGrant, keycloakUsersGroups, adminScopes }
 ) => {
 
-  const { openshifts, deploymentStatus = ["NEW", "PENDING", "RUNNING", "QUEUED"] } = input;
+  const { openshifts, deploymentStatus = ["NEW", "PENDING", "RUNNING", "QUEUED"], startDate, endDate, includeDeleted } = input;
 
   /*
     use the same mechanism for viewing all projects
@@ -181,13 +181,28 @@ export const getDeploymentsByFilter: ResolverFn = async (
       queryBuilder = queryBuilder.whereIn('environment.project', userProjectIds);
   }
 
+  // collect builds for a specific date range
+  if (startDate) {
+    queryBuilder = queryBuilder.where('deployment.created', '>=', input.startDate);
+  }
+
+  if (endDate) {
+    queryBuilder = queryBuilder.where('deployment.created', '<=', input.endDate);
+  }
+
   if(openshifts) {
     queryBuilder = queryBuilder.whereIn('environment.openshift', openshifts);
   }
 
   queryBuilder = queryBuilder.whereIn('deployment.status', deploymentStatus);
 
-  queryBuilder = queryBuilder.where('environment.deleted', '=', '0000-00-00 00:00:00');
+  // if includeDeleted is false, exclude deleted environments in the results (default)
+  if (!includeDeleted) {
+    queryBuilder = queryBuilder.where('environment.deleted', '=', '0000-00-00 00:00:00');
+  }
+
+  // exclude results where a project doesn't exist
+  queryBuilder = queryBuilder.whereRaw('environment.project IN (SELECT id FROM project)')
 
   const queryBuilderString = queryBuilder.toString();
 

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -1350,7 +1350,7 @@ const typeDefs = gql`
     deploymentByRemoteId(id: String): Deployment
     deploymentByName(input: DeploymentByNameInput): Deployment
     deploymentsByBulkId(bulkId: String): [Deployment]
-    deploymentsByFilter(openshifts: [Int], deploymentStatus: [DeploymentStatusType]): [Deployment]
+    deploymentsByFilter(openshifts: [Int], deploymentStatus: [DeploymentStatusType], startDate: Date, endDate: Date, includeDeleted: Boolean): [Deployment]
     taskByTaskName(taskName: String): Task
     taskByRemoteId(id: String): Task
     taskById(id: Int): Task