Merge pull request #4001 from uselagoon/storage-resolver

feat: environment storage filtering support

Author: rocketeerbkw

services/api/src/resources/environment/resolvers.ts

@@ -166,8 +166,28 @@ export const getEnvironmentByBackupId: ResolverFn = async (
 export const getEnvironmentStorageByEnvironmentId: ResolverFn = async (
   { id: eid },
   args,
-  { sqlClientPool, hasPermission }
+  { sqlClientPool, hasPermission, adminScopes }
 ) => {
+  if (args) {
+    // set lastDays to args.lastDays, or 60 if undefined
+    let lastDays = args.lastDays || 60;
+    if (!adminScopes.platformOwner && !adminScopes.platformViewer) {
+      // lastDays to 60 results for non-platform users
+      lastDays = Math.min(args.lastDays || 60, 60);
+
+      // check permissions for non-platform users
+      const project = await projectHelpers(
+        sqlClientPool
+      ).getProjectByEnvironmentId(eid);
+      await hasPermission('environment', 'view', {
+        project: project.id
+      });
+    }
+    const rows = await query(sqlClientPool, Sql.selectEnvironmentStorageByEnvironmentIdByDaysClaim({eid, lastDays, claim: args.claim, startDate: args.startDate, endDate: args.endDate}))
+    // @DEPRECATE when `bytesUsed` is completely removed, this can be reverted
+    return rows.map(row => ({ ...row, bytesUsed: row.kibUsed}));
+  }
+
   await hasPermission('environment', 'storage');
 
   const rows = await query(sqlClientPool, Sql.selectEnvironmentStorageByEnvironmentId(eid))

services/api/src/resources/environment/sql.ts

@@ -134,6 +134,47 @@ export const Sql = {
     knex('environment_storage')
       .where(knex.raw('environment_storage.environment = ?', id))
       .toString(),
+  selectEnvironmentStorageByEnvironmentIdByDaysClaim: ({
+    eid,
+    lastDays,
+    startDate,
+    endDate,
+    claim,
+  }: {
+    eid: number;
+    lastDays?: number;
+    startDate?: Date;
+    endDate?: Date;
+    claim?: string;
+  }) =>
+    knex
+      .select('id', 'environment', 'persistent_storage_claim', 'kib_used', 'updated')
+      .from(function () {
+        this.select(
+          '*',
+          knex.raw('ROW_NUMBER() OVER (PARTITION BY persistent_storage_claim ORDER BY updated ASC) as rn')
+        )
+        .from('environment_storage')
+        .where('environment', eid)
+        .modify(function (queryBuilder) {
+          if (claim) {
+            queryBuilder.where('persistent_storage_claim', claim);
+          }
+          if (startDate) {
+            queryBuilder = queryBuilder.where('updated', '>=', startDate);
+          }
+
+          if (endDate) {
+            queryBuilder = queryBuilder.where('updated', '<=', endDate);
+          }
+          if (lastDays) {
+            // last `lastDays` days including latest/today if found
+            queryBuilder = queryBuilder.where(knex.raw('DATEDIFF(CURRENT_DATE, updated) < ?', [lastDays]));
+          }
+        })
+        .as('subquery');
+      })
+      .toString(),
   selectEnvironmentByOpenshiftProjectName: (openshiftProjectName: string) =>
     knex('environment AS e')
       .select('e.*')

services/api/src/typeDefs.js

@@ -869,7 +869,7 @@ const typeDefs = gql`
     """
     Reference to EnvironmentStorage API Object, which shows the Storage consumption of this environment per day
     """
-    storages: [EnvironmentStorage]
+    storages(startDate: Date, endDate: Date, lastDays: Int, claim: String): [EnvironmentStorage]
     """
     Reference to EnvironmentStorageMonth API Object, which returns how many storage per day this environment used in a specific month
     """