Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/stripe-issues' of github.com:FlowiseAI/Flowise into fix/stripe-issues

This commit is contained in:
Ilango 2025-06-13 13:43:36 +05:30
parent aaf2f6eb19 260219e94d
commit 407c8bb1a8
9 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/src/database/migrations/mariadb/index.ts
View File

@ -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
]

4
packages/server/src/database/migrations/mysql/index.ts
View File

@ -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
]

4
packages/server/src/database/migrations/postgres/index.ts
View File

@ -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
]

4
packages/server/src/database/migrations/sqlite/index.ts
View File

@ -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
]

9
packages/server/src/enterprise/database/entities/organization.entity.ts
View File

@ -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

12
packages/server/src/enterprise/database/migrations/mariadb/1749714174104-AddStatusInOrganization.ts Normal file
View File

@ -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<void> {
await queryRunner.query(`alter table \`organization\` add \`status\` varchar(20) default "${OrganizationStatus.ACTIVE}" not null ;`)
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`alter table \`organization\` drop column \`status\` ;`)
}
}

12
packages/server/src/enterprise/database/migrations/mysql/1749714174104-AddStatusInOrganization.ts Normal file
View File

@ -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<void> {
await queryRunner.query(`alter table \`organization\` add \`status\` varchar(20) default "${OrganizationStatus.ACTIVE}" not null ;`)
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`alter table \`organization\` drop column \`status\` ;`)
}
}

12
packages/server/src/enterprise/database/migrations/postgres/1749714174104-AddStatusInOrganization.ts Normal file
View File

@ -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<void> {
queryRunner.query(`alter table "organization" add column "status" varchar(20) default '${OrganizationStatus.ACTIVE}' not null;`)
}
public async down(queryRunner: QueryRunner): Promise<void> {
queryRunner.query(`alter table "organization" drop column "status";`)
}
}

12
packages/server/src/enterprise/database/migrations/sqlite/1749714174104-AddStatusInOrganization.ts Normal file
View File

@ -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<void> {
queryRunner.query(`alter table "organization" add column "status" varchar(20) default '${OrganizationStatus.ACTIVE}' not null;`)
}
public async down(queryRunner: QueryRunner): Promise<void> {
queryRunner.query(`alter table "organization" drop column "status";`)
}
}