From 84204c3c37847e2f92a8959e4cc4e007aaa2a363 Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilmhdh@gmail.com>
Date: Fri, 15 Mar 2024 15:51:33 +0530
Subject: [PATCH] feat(server): added new user additional migration and schemas
---
backend/src/@types/knex.d.ts | 8 +++++
...85040_project-user-additional-privilege.ts | 31 +++++++++++++++++
backend/src/db/schemas/index.ts | 1 +
backend/src/db/schemas/models.ts | 1 +
.../project-user-additional-privilege.ts | 33 +++++++++++++++++++
5 files changed, 74 insertions(+)
create mode 100644 backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts
create mode 100644 backend/src/db/schemas/project-user-additional-privilege.ts
diff --git a/backend/src/@types/knex.d.ts b/backend/src/@types/knex.d.ts
index 29d526e52..9b4bfec96 100644
--- a/backend/src/@types/knex.d.ts
+++ b/backend/src/@types/knex.d.ts
@@ -92,6 +92,9 @@ import {
TProjects,
TProjectsInsert,
TProjectsUpdate,
+ TProjectUserAdditionalPrivilege,
+ TProjectUserAdditionalPrivilegeInsert,
+ TProjectUserAdditionalPrivilegeUpdate,
TProjectUserMembershipRoles,
TProjectUserMembershipRolesInsert,
TProjectUserMembershipRolesUpdate,
@@ -239,6 +242,11 @@ declare module "knex/types/tables" {
TProjectUserMembershipRolesUpdate
>;
[TableName.ProjectRoles]: Knex.CompositeTableType<TProjectRoles, TProjectRolesInsert, TProjectRolesUpdate>;
+ [TableName.ProjectUserAdditionalPrivilege]: Knex.CompositeTableType<
+ TProjectUserAdditionalPrivilege,
+ TProjectUserAdditionalPrivilegeInsert,
+ TProjectUserAdditionalPrivilegeUpdate
+ >;
[TableName.ProjectKeys]: Knex.CompositeTableType<TProjectKeys, TProjectKeysInsert, TProjectKeysUpdate>;
[TableName.Secret]: Knex.CompositeTableType<TSecrets, TSecretsInsert, TSecretsUpdate>;
[TableName.SecretBlindIndex]: Knex.CompositeTableType<
diff --git a/backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts b/backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts
new file mode 100644
index 000000000..0d9d81507
--- /dev/null
+++ b/backend/src/db/migrations/20240313185040_project-user-additional-privilege.ts
@@ -0,0 +1,31 @@
+import { Knex } from "knex";
+
+import { TableName } from "../schemas";
+import { createOnUpdateTrigger, dropOnUpdateTrigger } from "../utils";
+
+export async function up(knex: Knex): Promise<void> {
+ if (!(await knex.schema.hasTable(TableName.ProjectUserAdditionalPrivilege))) {
+ await knex.schema.createTable(TableName.ProjectUserAdditionalPrivilege, (t) => {
+ t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
+ t.string("name").notNullable();
+ t.string("slug", 60).notNullable();
+ t.string("description");
+ t.uuid("projectMembershipId").notNullable();
+ t.foreign("projectMembershipId").references("id").inTable(TableName.ProjectMembership).onDelete("CASCADE");
+ t.boolean("isTemporary").notNullable().defaultTo(false);
+ t.string("temporaryMode");
+ t.string("temporaryRange"); // could be cron or relative time like 1H or 1minute etc
+ t.datetime("temporaryAccessStartTime");
+ t.datetime("temporaryAccessEndTime");
+ t.jsonb("permissions").notNullable();
+ t.timestamps(true, true, true);
+ });
+ }
+
+ await createOnUpdateTrigger(knex, TableName.ProjectUserAdditionalPrivilege);
+}
+
+export async function down(knex: Knex): Promise<void> {
+ await dropOnUpdateTrigger(knex, TableName.ProjectUserAdditionalPrivilege);
+ await knex.schema.dropTableIfExists(TableName.ProjectUserAdditionalPrivilege);
+}
diff --git a/backend/src/db/schemas/index.ts b/backend/src/db/schemas/index.ts
index efa80cfac..96993dc10 100644
--- a/backend/src/db/schemas/index.ts
+++ b/backend/src/db/schemas/index.ts
@@ -28,6 +28,7 @@ export * from "./project-environments";
export * from "./project-keys";
export * from "./project-memberships";
export * from "./project-roles";
+export * from "./project-user-additional-privilege";
export * from "./project-user-membership-roles";
export * from "./projects";
export * from "./saml-configs";
diff --git a/backend/src/db/schemas/models.ts b/backend/src/db/schemas/models.ts
index bda66682e..8af8951fd 100644
--- a/backend/src/db/schemas/models.ts
+++ b/backend/src/db/schemas/models.ts
@@ -20,6 +20,7 @@ export enum TableName {
Environment = "project_environments",
ProjectMembership = "project_memberships",
ProjectRoles = "project_roles",
+ ProjectUserAdditionalPrivilege = "project_user_additional_privilege",
ProjectUserMembershipRole = "project_user_membership_roles",
ProjectKeys = "project_keys",
Secret = "secrets",
diff --git a/backend/src/db/schemas/project-user-additional-privilege.ts b/backend/src/db/schemas/project-user-additional-privilege.ts
new file mode 100644
index 000000000..c20d83543
--- /dev/null
+++ b/backend/src/db/schemas/project-user-additional-privilege.ts
@@ -0,0 +1,33 @@
+// 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 ProjectUserAdditionalPrivilegeSchema = z.object({
+ id: z.string().uuid(),
+ name: z.string(),
+ slug: z.string(),
+ description: z.string().nullable().optional(),
+ projectMembershipId: z.string().uuid(),
+ isTemporary: z.boolean().default(false),
+ temporaryMode: z.string().nullable().optional(),
+ temporaryRange: z.string().nullable().optional(),
+ temporaryAccessStartTime: z.date().nullable().optional(),
+ temporaryAccessEndTime: z.date().nullable().optional(),
+ permissions: z.unknown(),
+ createdAt: z.date(),
+ updatedAt: z.date()
+});
+
+export type TProjectUserAdditionalPrivilege = z.infer<typeof ProjectUserAdditionalPrivilegeSchema>;
+export type TProjectUserAdditionalPrivilegeInsert = Omit<
+ z.input<typeof ProjectUserAdditionalPrivilegeSchema>,
+ TImmutableDBKeys
+>;
+export type TProjectUserAdditionalPrivilegeUpdate = Partial<
+ Omit<z.input<typeof ProjectUserAdditionalPrivilegeSchema>, TImmutableDBKeys>
+>;