feat: finished org-level integration management flow

backend/src/db/migrations/20240830142938_native-slack-integration.ts

@@ -7,8 +7,10 @@ export async function up(knex: Knex): Promise<void> {
   if (!(await knex.schema.hasTable(TableName.SlackIntegrations))) {
     await knex.schema.createTable(TableName.SlackIntegrations, (tb) => {
       tb.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
-      tb.string("projectId").notNullable().unique();
-      tb.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
+      tb.string("slug").notNullable();
+      tb.uuid("orgId").notNullable();
+      tb.foreign("orgId").references("id").inTable(TableName.Organization).onDelete("CASCADE");
+      tb.string("description");
       tb.string("teamId").notNullable();
       tb.string("teamName").notNullable();
       tb.string("slackUserId").notNullable();
@@ -16,6 +18,20 @@ export async function up(knex: Knex): Promise<void> {
       tb.binary("encryptedBotAccessToken").notNullable();
       tb.string("slackBotId").notNullable();
       tb.string("slackBotUserId").notNullable();
+      tb.unique(["orgId", "slug"]);
+      tb.timestamps(true, true, true);
+    });
+
+    await createOnUpdateTrigger(knex, TableName.SlackIntegrations);
+  }
+
+  if (!(await knex.schema.hasTable(TableName.ProjectSlackConfigs))) {
+    await knex.schema.createTable(TableName.ProjectSlackConfigs, (tb) => {
+      tb.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
+      tb.string("projectId").notNullable().unique();
+      tb.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
+      tb.uuid("slackIntegrationId").notNullable();
+      tb.foreign("slackIntegrationId").references("id").inTable(TableName.SlackIntegrations).onDelete("CASCADE");
       tb.boolean("isAccessRequestNotificationEnabled").notNullable().defaultTo(false);
       tb.string("accessRequestChannels").notNullable().defaultTo("");
       tb.boolean("isSecretRequestNotificationEnabled").notNullable().defaultTo(false);
@@ -23,7 +39,7 @@ export async function up(knex: Knex): Promise<void> {
       tb.timestamps(true, true, true);
     });
 
-    await createOnUpdateTrigger(knex, TableName.SlackIntegrations);
+    await createOnUpdateTrigger(knex, TableName.ProjectSlackConfigs);
   }
 
   if (!(await knex.schema.hasTable(TableName.AdminSlackConfig))) {
@@ -39,9 +55,12 @@ export async function up(knex: Knex): Promise<void> {
 }
 
 export async function down(knex: Knex): Promise<void> {
-  await knex.schema.dropTableIfExists(TableName.SlackIntegrations);
-  await dropOnUpdateTrigger(knex, TableName.SlackIntegrations);
+  await knex.schema.dropTableIfExists(TableName.ProjectSlackConfigs);
+  await dropOnUpdateTrigger(knex, TableName.ProjectSlackConfigs);
 
   await knex.schema.dropTableIfExists(TableName.AdminSlackConfig);
   await dropOnUpdateTrigger(knex, TableName.AdminSlackConfig);
+
+  await knex.schema.dropTableIfExists(TableName.SlackIntegrations);
+  await dropOnUpdateTrigger(knex, TableName.SlackIntegrations);
 }

backend/src/db/schemas/index.ts

@@ -63,6 +63,7 @@ export * from "./project-environments";
 export * from "./project-keys";
 export * from "./project-memberships";
 export * from "./project-roles";
+export * from "./project-slack-configs";
 export * from "./project-user-additional-privilege";
 export * from "./project-user-membership-roles";
 export * from "./projects";

backend/src/db/schemas/models.ts

@@ -116,6 +116,7 @@ export enum TableName {
   // @depreciated
   KmsKeyVersion = "kms_key_versions",
   SlackIntegrations = "slack_integrations",
+  ProjectSlackConfigs = "project_slack_configs",
   AdminSlackConfig = "admin_slack_configs"
 }
 

backend/src/db/schemas/project-slack-configs.ts

@@ -0,0 +1,24 @@
+// Code generated by automation script, DO NOT EDIT.
+// Automated by pulling database and generating zod schema
+// To update. Just run npm run generate:schema
+// Written by akhilmhdh.
+
+import { z } from "zod";
+
+import { TImmutableDBKeys } from "./models";
+
+export const ProjectSlackConfigsSchema = z.object({
+  id: z.string().uuid(),
+  projectId: z.string(),
+  slackIntegrationId: z.string().uuid(),
+  isAccessRequestNotificationEnabled: z.boolean().default(false),
+  accessRequestChannels: z.string().default(""),
+  isSecretRequestNotificationEnabled: z.boolean().default(false),
+  secretRequestChannels: z.string().default(""),
+  createdAt: z.date(),
+  updatedAt: z.date()
+});
+
+export type TProjectSlackConfigs = z.infer<typeof ProjectSlackConfigsSchema>;
+export type TProjectSlackConfigsInsert = Omit<z.input<typeof ProjectSlackConfigsSchema>, TImmutableDBKeys>;
+export type TProjectSlackConfigsUpdate = Partial<Omit<z.input<typeof ProjectSlackConfigsSchema>, TImmutableDBKeys>>;

backend/src/db/schemas/slack-integrations.ts

@@ -11,7 +11,9 @@ import { TImmutableDBKeys } from "./models";
 
 export const SlackIntegrationsSchema = z.object({
   id: z.string().uuid(),
-  projectId: z.string(),
+  slug: z.string(),
+  orgId: z.string().uuid(),
+  description: z.string().nullable().optional(),
   teamId: z.string(),
   teamName: z.string(),
   slackUserId: z.string(),
@@ -19,10 +21,6 @@ export const SlackIntegrationsSchema = z.object({
   encryptedBotAccessToken: zodBuffer,
   slackBotId: z.string(),
   slackBotUserId: z.string(),
-  isAccessRequestNotificationEnabled: z.boolean().default(false),
-  accessRequestChannels: z.string().default(""),
-  isSecretRequestNotificationEnabled: z.boolean().default(false),
-  secretRequestChannels: z.string().default(""),
   createdAt: z.date(),
   updatedAt: z.date()
 });