Introduce Deployment Revamping

Author: lucemans

src/database/migrations.ts

@@ -21,6 +21,7 @@ import { deployment_configs_create } from './migrations/15_deployment_configs_cr
 import { auth_key_upgrade } from './migrations/16_auth_key';
 import { domains_by_domain } from './migrations/17_domains_by_domain';
 import { owner_admin } from './migrations/18_owner_admin';
+import { rebuild_deployments } from './migrations/19_rebuild_deployments';
 
 export type MigrationState = {
     instance_id: string;
@@ -123,4 +124,6 @@ export const Migrations: Migration<TableScheme>[] = [
     domains_by_domain,
     // Add admin field to owners
     owner_admin,
+    // Rebuild the entirey of deployments
+    rebuild_deployments,
 ];

src/database/migrations/19_rebuild_deployments.ts

@@ -0,0 +1,104 @@
+import { createTableRaw, ScylloClient } from 'scyllo';
+
+import { DeploymentV4, DeploymentV5 } from '../../types/Deployment.type';
+import { log } from '../../util/logging';
+import { Migration } from '../migrations';
+
+const createTable = async (
+    database: ScylloClient<{
+        deployments: DeploymentV5;
+    }>,
+    table_name: string
+) => {
+    const query = createTableRaw<{ deployments: DeploymentV5 }, 'deployments'>(
+        'signal',
+        table_name as 'deployments',
+        true,
+        {
+            app_id: {
+                type: 'bigint',
+            },
+            deploy_id: {
+                type: 'bigint',
+            },
+            cid: {
+                type: 'text',
+            },
+            context: {
+                type: 'text',
+            },
+            sid: {
+                type: 'text',
+            },
+        },
+        'app_id',
+        ['deploy_id']
+    );
+
+    log.debug(query.query);
+
+    await database.query({
+        args: query.args,
+        query: query.query,
+    });
+
+    // await database.createIndex(
+    //     table_name as 'deployments',
+    //     table_name + '_by_app_id',
+    //     'app_id'
+    // );
+};
+
+export const rebuild_deployments: Migration<{
+    deployments: DeploymentV4;
+    deployments_tmp: DeploymentV5;
+}> = async (database) => {
+    log.debug('creating table');
+    await createTable(database, 'deployments_tmp');
+
+    log.debug('getting ol');
+    const deployments_from_old = await database.selectFrom('deployments', [
+        'app_id',
+        'deploy_id',
+    ]);
+
+    for (const deployment of deployments_from_old) {
+        const deploymentData = await database.selectOneFrom(
+            'deployments',
+            '*',
+            { app_id: deployment.app_id, deploy_id: deployment.deploy_id }
+        );
+
+        await database.insertInto('deployments_tmp', {
+            app_id: deploymentData?.app_id,
+            cid: deploymentData?.cid,
+            context: '',
+            deploy_id: deploymentData?.deploy_id,
+            sid: deploymentData?.sid,
+        });
+    }
+
+    await database.dropTable('deployments');
+
+    await createTable(database, 'deployments');
+
+    const deployments_form_intermediary = await database.selectFrom(
+        'deployments_tmp',
+        ['app_id', 'deploy_id']
+    );
+
+    for (const deployment of deployments_form_intermediary) {
+        const deploymentData = await database.selectOneFrom(
+            'deployments_tmp',
+            '*',
+            {
+                app_id: deployment.app_id,
+                deploy_id: deployment.deploy_id,
+            }
+        );
+
+        await (
+            database as ScylloClient<{ deployments: DeploymentV5 }>
+        ).insertInto('deployments', deploymentData as DeploymentV5);
+    }
+};

src/routes/api/apps/ls.ts

@@ -3,17 +3,40 @@ import { generateSunflake } from 'sunflake';
 
 import { DB } from '../../../database';
 import { useAuth } from '../../../util/http/useAuth';
+import { log } from '../../../util/logging';
 
 export const generateSnowflake = generateSunflake();
 
 export const AppLsRoute: FastifyPluginAsync = async (router, _options) => {
     router.get('/', async (_request, reply) => {
         const { user_id } = await useAuth(_request, reply);
 
-        reply.send(
-            await DB.selectFrom('applications', '*', {
-                owner_id: user_id,
+        const applications = await DB.selectFrom('applications', '*', {
+            owner_id: user_id,
+        });
+
+        log.debug(applications);
+
+        const applicationsAndDomains = await Promise.all(
+            applications.map(async (app) => {
+                const [last_deploy] = await DB.selectFrom(
+                    'deployments',
+                    ['deploy_id'],
+                    { app_id: app.app_id },
+                    'ORDER BY deploy_id DESC'
+                );
+
+                if (!last_deploy) return app;
+
+                return {
+                    ...app,
+                    preview_url: '/api/image/deploy/' + last_deploy.deploy_id,
+                };
             })
         );
+
+        log.debug(applicationsAndDomains);
+
+        reply.send(applicationsAndDomains);
     });
 };

src/routes/protected/create.ts

@@ -109,11 +109,6 @@ export const CreateRoute: FastifyPluginAsync = async (router, options) => {
                 cid: '',
                 deploy_id,
                 sid: bucket_name,
-                comment: request.query.comment,
-                git_actor: request.query.git_actor,
-                git_sha: request.query.git_sha,
-                git_src: request.query.git_src,
-                git_type: request.query.git_type,
             });
             const { domain_id } = (await DB.selectOneFrom(
                 'applications',

src/types/Deployment.type.ts

@@ -22,4 +22,11 @@ export type DeploymentV3 = DeploymentV2 & {
 
 export type DeploymentV4 = Omit<DeploymentV3, 'timestamp'>;
 
-export type Deployment = DeploymentV4;
+export type DeploymentV5 = Omit<
+    DeploymentV4,
+    'git_sha' | 'git_src' | 'git_type' | 'git_actor' | 'comment'
+> & {
+    context: string; // CI/CD Context
+};
+
+export type Deployment = DeploymentV5;