diff --git a/packages/server/src/database/migrations/mariadb/index.ts b/packages/server/src/database/migrations/mariadb/index.ts index 272a6bb1f..04aa1ec7d 100644 --- a/packages/server/src/database/migrations/mariadb/index.ts +++ b/packages/server/src/database/migrations/mariadb/index.ts @@ -48,6 +48,7 @@ import { AddSSOColumns1730519457880 } from '../../../enterprise/database/migrati import { AddPersonalWorkspace1734074497540 } from '../../../enterprise/database/migrations/mariadb/1734074497540-AddPersonalWorkspace' import { RefactorEnterpriseDatabase1737076223692 } from '../../../enterprise/database/migrations/mariadb/1737076223692-RefactorEnterpriseDatabase' import { ExecutionLinkWorkspaceId1746862866554 } from '../../../enterprise/database/migrations/mariadb/1746862866554-ExecutionLinkWorkspaceId' +import { AddStatusInOrganization1749714174104 } from '../../../enterprise/database/migrations/mariadb/1749714174104-AddStatusInOrganization' export const mariadbMigrations = [ Init1693840429259, @@ -98,5 +99,6 @@ export const mariadbMigrations = [ FixOpenSourceAssistantTable1743758056188, AddErrorToEvaluationRun1744964560174, ExecutionLinkWorkspaceId1746862866554, - ModifyExecutionDataColumnType1747902489801 + ModifyExecutionDataColumnType1747902489801, + AddStatusInOrganization1749714174104 ] diff --git a/packages/server/src/database/migrations/mysql/index.ts b/packages/server/src/database/migrations/mysql/index.ts index c51ebb8a9..3d29cb1f1 100644 --- a/packages/server/src/database/migrations/mysql/index.ts +++ b/packages/server/src/database/migrations/mysql/index.ts @@ -49,6 +49,7 @@ import { AddSSOColumns1730519457880 } from '../../../enterprise/database/migrati import { AddPersonalWorkspace1734074497540 } from '../../../enterprise/database/migrations/mysql/1734074497540-AddPersonalWorkspace' import { RefactorEnterpriseDatabase1737076223692 } from '../../../enterprise/database/migrations/mysql/1737076223692-RefactorEnterpriseDatabase' import { ExecutionLinkWorkspaceId1746862866554 } from '../../../enterprise/database/migrations/mysql/1746862866554-ExecutionLinkWorkspaceId' +import { AddStatusInOrganization1749714174104 } from '../../../enterprise/database/migrations/mysql/1749714174104-AddStatusInOrganization' export const mysqlMigrations = [ Init1693840429259, @@ -100,5 +101,6 @@ export const mysqlMigrations = [ AddErrorToEvaluationRun1744964560174, FixErrorsColumnInEvaluationRun1746437114935, ExecutionLinkWorkspaceId1746862866554, - ModifyExecutionDataColumnType1747902489801 + ModifyExecutionDataColumnType1747902489801, + AddStatusInOrganization1749714174104 ] diff --git a/packages/server/src/database/migrations/postgres/index.ts b/packages/server/src/database/migrations/postgres/index.ts index 4da17daa4..57919a9e8 100644 --- a/packages/server/src/database/migrations/postgres/index.ts +++ b/packages/server/src/database/migrations/postgres/index.ts @@ -48,6 +48,7 @@ import { AddSSOColumns1730519457880 } from '../../../enterprise/database/migrati import { AddPersonalWorkspace1734074497540 } from '../../../enterprise/database/migrations/postgres/1734074497540-AddPersonalWorkspace' import { RefactorEnterpriseDatabase1737076223692 } from '../../../enterprise/database/migrations/postgres/1737076223692-RefactorEnterpriseDatabase' import { ExecutionLinkWorkspaceId1746862866554 } from '../../../enterprise/database/migrations/postgres/1746862866554-ExecutionLinkWorkspaceId' +import { AddStatusInOrganization1749714174104 } from '../../../enterprise/database/migrations/postgres/1749714174104-AddStatusInOrganization' export const postgresMigrations = [ Init1693891895163, @@ -98,5 +99,6 @@ export const postgresMigrations = [ FixOpenSourceAssistantTable1743758056188, AddErrorToEvaluationRun1744964560174, ExecutionLinkWorkspaceId1746862866554, - ModifyExecutionSessionIdFieldType1748450230238 + ModifyExecutionSessionIdFieldType1748450230238, + AddStatusInOrganization1749714174104 ] diff --git a/packages/server/src/database/migrations/sqlite/index.ts b/packages/server/src/database/migrations/sqlite/index.ts index 0b15e2693..9b7456591 100644 --- a/packages/server/src/database/migrations/sqlite/index.ts +++ b/packages/server/src/database/migrations/sqlite/index.ts @@ -46,6 +46,7 @@ import { AddSSOColumns1730519457880 } from '../../../enterprise/database/migrati import { AddPersonalWorkspace1734074497540 } from '../../../enterprise/database/migrations/sqlite/1734074497540-AddPersonalWorkspace' import { RefactorEnterpriseDatabase1737076223692 } from '../../../enterprise/database/migrations/sqlite/1737076223692-RefactorEnterpriseDatabase' import { ExecutionLinkWorkspaceId1746862866554 } from '../../../enterprise/database/migrations/sqlite/1746862866554-ExecutionLinkWorkspaceId' +import { AddStatusInOrganization1749714174104 } from '../../../enterprise/database/migrations/sqlite/1749714174104-AddStatusInOrganization' export const sqliteMigrations = [ Init1693835579790, @@ -94,5 +95,6 @@ export const sqliteMigrations = [ AddExecutionEntity1738090872625, FixOpenSourceAssistantTable1743758056188, AddErrorToEvaluationRun1744964560174, - ExecutionLinkWorkspaceId1746862866554 + ExecutionLinkWorkspaceId1746862866554, + AddStatusInOrganization1749714174104 ] diff --git a/packages/server/src/enterprise/database/entities/organization.entity.ts b/packages/server/src/enterprise/database/entities/organization.entity.ts index 1f6ad47ca..baca30be4 100644 --- a/packages/server/src/enterprise/database/entities/organization.entity.ts +++ b/packages/server/src/enterprise/database/entities/organization.entity.ts @@ -5,6 +5,12 @@ export enum OrganizationName { DEFAULT_ORGANIZATION = 'Default Organization' } +export enum OrganizationStatus { + ACTIVE = 'active', + UNDER_REVIEW = 'under_review', + PAST_DUE = 'past_due' +} + @Entity() export class Organization { @PrimaryGeneratedColumn('uuid') @@ -19,6 +25,9 @@ export class Organization { @Column({ type: 'varchar', length: 100, nullable: true }) subscriptionId?: string + @Column({ type: 'varchar', length: 20, default: OrganizationStatus.ACTIVE }) + status: string + @CreateDateColumn() createdDate?: Date diff --git a/packages/server/src/enterprise/database/migrations/mariadb/1749714174104-AddStatusInOrganization.ts b/packages/server/src/enterprise/database/migrations/mariadb/1749714174104-AddStatusInOrganization.ts new file mode 100644 index 000000000..1bc9e25a4 --- /dev/null +++ b/packages/server/src/enterprise/database/migrations/mariadb/1749714174104-AddStatusInOrganization.ts @@ -0,0 +1,12 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' +import { OrganizationStatus } from '../../entities/organization.entity' + +export class AddStatusInOrganization1749714174104 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`alter table \`organization\` add \`status\` varchar(20) default "${OrganizationStatus.ACTIVE}" not null ;`) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`alter table \`organization\` drop column \`status\` ;`) + } +} diff --git a/packages/server/src/enterprise/database/migrations/mysql/1749714174104-AddStatusInOrganization.ts b/packages/server/src/enterprise/database/migrations/mysql/1749714174104-AddStatusInOrganization.ts new file mode 100644 index 000000000..1bc9e25a4 --- /dev/null +++ b/packages/server/src/enterprise/database/migrations/mysql/1749714174104-AddStatusInOrganization.ts @@ -0,0 +1,12 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' +import { OrganizationStatus } from '../../entities/organization.entity' + +export class AddStatusInOrganization1749714174104 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`alter table \`organization\` add \`status\` varchar(20) default "${OrganizationStatus.ACTIVE}" not null ;`) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`alter table \`organization\` drop column \`status\` ;`) + } +} diff --git a/packages/server/src/enterprise/database/migrations/postgres/1749714174104-AddStatusInOrganization.ts b/packages/server/src/enterprise/database/migrations/postgres/1749714174104-AddStatusInOrganization.ts new file mode 100644 index 000000000..504304693 --- /dev/null +++ b/packages/server/src/enterprise/database/migrations/postgres/1749714174104-AddStatusInOrganization.ts @@ -0,0 +1,12 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' +import { OrganizationStatus } from '../../entities/organization.entity' + +export class AddStatusInOrganization1749714174104 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + queryRunner.query(`alter table "organization" add column "status" varchar(20) default '${OrganizationStatus.ACTIVE}' not null;`) + } + + public async down(queryRunner: QueryRunner): Promise { + queryRunner.query(`alter table "organization" drop column "status";`) + } +} diff --git a/packages/server/src/enterprise/database/migrations/sqlite/1749714174104-AddStatusInOrganization.ts b/packages/server/src/enterprise/database/migrations/sqlite/1749714174104-AddStatusInOrganization.ts new file mode 100644 index 000000000..504304693 --- /dev/null +++ b/packages/server/src/enterprise/database/migrations/sqlite/1749714174104-AddStatusInOrganization.ts @@ -0,0 +1,12 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' +import { OrganizationStatus } from '../../entities/organization.entity' + +export class AddStatusInOrganization1749714174104 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + queryRunner.query(`alter table "organization" add column "status" varchar(20) default '${OrganizationStatus.ACTIVE}' not null;`) + } + + public async down(queryRunner: QueryRunner): Promise { + queryRunner.query(`alter table "organization" drop column "status";`) + } +}