Optimize getBackupsByEnvironmentId

node-packages/commons/src/api.js

@@ -266,7 +266,10 @@ const getEnvironmentBackups = (openshiftProjectName: string): Promise<Project[]>
         name
       }
       backups {
-        ...${backupFragment}
+        id
+        backupId
+        source
+        created
       }
     }
   }

services/api-db/docker-entrypoint-initdb.d/01-migrations.sql

@@ -703,6 +703,24 @@ CREATE OR REPLACE PROCEDURE
   END;
 $$
 
+CREATE OR REPLACE PROCEDURE
+  add_index_for_environment_backup_environment()
+
+  BEGIN
+    IF NOT EXISTS (
+      SELECT NULL
+      FROM INFORMATION_SCHEMA.STATISTICS
+      WHERE
+        table_name = 'environment_backup'
+        AND table_schema = 'infrastructure'
+        AND index_name='backup_environment'
+    ) THEN
+      ALTER TABLE `environment_backup`
+      ADD INDEX `backup_environment` (`environment`);
+    END IF;
+  END;
+$$
+
 DELIMITER ;
 
 CALL add_production_environment_to_project();
@@ -739,6 +757,7 @@ CALL add_deploy_base_head_ref_title_to_environment();
 CALL convert_env_vars_from_varchar_to_text();
 CALL convert_user_ssh_key_usid_to_char();
 CALL add_private_key_to_project();
+CALL add_index_for_environment_backup_environment();
 
 -- Drop legacy SSH key procedures
 DROP PROCEDURE IF EXISTS CreateProjectSshKey;

services/api/src/resolvers.js

@@ -46,6 +46,7 @@ const {
   getEnvironmentHitsMonthByEnvironmentId,
   getEnvironmentByDeploymentId,
   getEnvironmentByTaskId,
+  getEnvironmentByBackupId,
   getEnvironmentServicesByEnvironmentId,
   setEnvironmentServices,
   deleteEnvironment,
@@ -199,6 +200,7 @@ const resolvers /* : { [string]: ResolversObj | typeof GraphQLDate } */ = {
   },
   Backup: {
     restore: getRestoreByBackupId,
+    environment: getEnvironmentByBackupId,
   },
   Query: {
     userBySshKey: getUserBySshKey,

services/api/src/resources/backup/sql.js

@@ -21,15 +21,13 @@ const Sql /* : SqlObj */ = {
     { environmentId, includeDeleted } /* : { environmentId: number, includeDeleted: boolean } */,
   ) => {
     const query = knex('environment_backup')
-      .join('environment as e', 'e.id', '=', 'environment_backup.environment')
-      .select('environment_backup.*')
-      .where('e.id', environmentId);
+      .where('environment', environmentId);
 
     if (includeDeleted) {
       return query.toString();
     }
 
-    return query.where('environment_backup.deleted', '=', '0000-00-00 00:00:00').toString();
+    return query.where('deleted', '=', '0000-00-00 00:00:00').toString();
   },
   insertBackup: (
     {

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

@@ -167,6 +167,41 @@ const getEnvironmentByTaskId = async (
   return environment;
 };
 
+const getEnvironmentByBackupId = async (
+  { id: backup_id },
+  args,
+  {
+    sqlClient,
+    hasPermission,
+  },
+) => {
+  const prep = prepare(
+    sqlClient,
+    `SELECT
+        e.*
+      FROM environment_backup eb
+      JOIN environment e on eb.environment = e.id
+      JOIN project p ON e.project = p.id
+      WHERE eb.id = :backup_id
+      LIMIT 1
+    `,
+  );
+
+  const rows = await query(sqlClient, prep({ backup_id }));
+
+  const environment = rows[0];
+
+  if (!environment) {
+    return null;
+  }
+
+  await hasPermission('environment', 'view', {
+    project: environment.project,
+  });
+
+  return environment;
+};
+
 const getEnvironmentStorageByEnvironmentId = async (
   { id: eid },
   args,
@@ -764,6 +799,7 @@ const Resolvers /* : ResolversObj */ = {
   getEnvironmentHitsMonthByEnvironmentId,
   getEnvironmentByDeploymentId,
   getEnvironmentByTaskId,
+  getEnvironmentByBackupId,
   getEnvironmentServicesByEnvironmentId,
   setEnvironmentServices,
   deleteEnvironment,