Merge pull request #4570 from activepieces/refactor/unify-cloud-with-ee

refactor: unify cloud database entities with enterprise

packages/server/api/src/app/database/database-common.ts

@@ -1,5 +1,7 @@
 import { EntitySchemaColumnOptions } from 'typeorm'
+import { getEdition } from '../helper/secret-helper'
 import { DatabaseType, system, SystemProp } from '@activepieces/server-shared'
+import { ApEdition } from '@activepieces/shared'
 
 const databaseType = system.get(SystemProp.DB_TYPE)
 
@@ -43,3 +45,7 @@ export const BaseColumnSchemaPart = {
         updateDate: true,
     } as EntitySchemaColumnOptions,
 }
+
+export function isNotOneOfTheseEditions(editions: ApEdition[]): boolean {
+    return !editions.includes(getEdition())
+}

packages/server/api/src/app/database/database-connection.ts

@@ -72,25 +72,6 @@ function getEntities(): EntitySchema<unknown>[] {
 
     switch (edition) {
         case ApEdition.CLOUD:
-            entities.push(
-                ProjectMemberEntity,
-                AppSumoEntity,
-                ReferralEntity,
-                ProjectPlanEntity,
-                FlowTemplateEntity,
-                ConnectionKeyEntity,
-                AppCredentialEntity,
-                CustomDomainEntity,
-                SigningKeyEntity,
-                OAuthAppEntity,
-                OtpEntity,
-                ApiKeyEntity,
-                GitRepoEntity,
-                AuditEventEntity,
-                ActivityEntity,
-                ProjectBillingEntity,
-            )
-            break
         case ApEdition.ENTERPRISE:
             entities.push(
                 ProjectMemberEntity,
@@ -104,6 +85,13 @@ function getEntities(): EntitySchema<unknown>[] {
                 GitRepoEntity,
                 AuditEventEntity,
                 ActivityEntity,
+
+                // CLOUD
+                AppSumoEntity,
+                ReferralEntity,
+                ConnectionKeyEntity,
+                AppCredentialEntity,
+                ProjectBillingEntity,
             )
             break
         case ApEdition.COMMUNITY:

packages/server/api/src/app/database/migration/common/1696245170062-add-piece-type-and-package-type-to-flow-template.ts

@@ -1,8 +1,13 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
 import { logger } from '@activepieces/server-shared'
+import { ApEdition } from '@activepieces/shared'
 export class AddPieceTypeAndPackageTypeToFlowTemplate1696245170062
 implements MigrationInterface {
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD])) {
+            return
+        }
         const connection = queryRunner.connection
         const templates = await connection.query('SELECT * FROM flow_template')
         for (const template of templates) {
@@ -21,6 +26,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD])) {
+            return
+        }
         const connection = queryRunner.connection
         const templates = await connection.query('SELECT * FROM flow_template')
         for (const template of templates) {

packages/server/api/src/app/database/migration/postgres/1698602417745-add-signing-key.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
 import { logger } from '@activepieces/server-shared'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddSigningKey1698602417745 implements MigrationInterface {
     name = 'AddSigningKey1698602417745'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             CREATE TABLE "signing_key" (
                 "id" character varying(21) NOT NULL,
@@ -30,6 +35,9 @@ export class AddSigningKey1698602417745 implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "signing_key" DROP CONSTRAINT "fk_signing_key_generated_by"
         `)

packages/server/api/src/app/database/migration/postgres/1698698190965-AddDisplayNameToSigningKey.ts

@@ -1,17 +1,25 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddDisplayNameToSigningKey1698698190965
 implements MigrationInterface {
     name = 'AddDisplayNameToSigningKey1698698190965'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "signing_key"
             ADD "displayName" character varying NOT NULL
         `)
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "signing_key" DROP COLUMN "displayName"
         `)

packages/server/api/src/app/database/migration/postgres/1699221414907-AddOAuth2AppEntiity.ts

@@ -1,9 +1,14 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddOAuth2AppEntiity1699221414907 implements MigrationInterface {
     name = 'AddOAuth2AppEntiity1699221414907'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             CREATE TABLE "oauth_app" (
                 "id" character varying(21) NOT NULL,
@@ -26,6 +31,9 @@ export class AddOAuth2AppEntiity1699221414907 implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "oauth_app" DROP CONSTRAINT "fk_oauth_app_platform_id"
         `)

packages/server/api/src/app/database/migration/postgres/1699281870038-add-filtered-pieces-to-platform.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddFilteredPiecesToPlatform1699281870038
 implements MigrationInterface {
     name = 'AddFilteredPiecesToPlatform1699281870038'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "platform"
             ADD "filteredPieceNames" character varying array,
@@ -24,6 +29,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "platform" DROP COLUMN "filteredPieceBehavior"
         `)

packages/server/api/src/app/database/migration/postgres/1699491705906-AddSmtpAndPrivacyUrlToPlatform.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddSmtpAndPrivacyUrlToPlatform1699491705906
 implements MigrationInterface {
     name = 'AddSmtpAndPrivacyUrlToPlatform1699491705906'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "platform"
             ADD "smtpHost" character varying
@@ -59,6 +64,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
         ALTER TABLE "platform" DROP COLUMN "cloudAuthEnabled"
     `)

packages/server/api/src/app/database/migration/postgres/1700132368636-RemoveUnusedFieldsinBilling.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class RemoveUnusedFieldsinBilling1700132368636
 implements MigrationInterface {
     name = 'RemoveUnusedFieldsinBilling1700132368636'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "project_plan" DROP COLUMN "activeFlows"
         `)
@@ -37,6 +42,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
         ALTER TABLE "project_usage"
         ADD "bots" integer NOT NULL DEFAULT '0'

packages/server/api/src/app/database/migration/postgres/1700396157624-add-otp-entity.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
 import { logger } from '@activepieces/server-shared'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddOtpEntity1700396157624 implements MigrationInterface {
     name = 'AddOtpEntity1700396157624'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             CREATE TABLE "otp" (
                 "id" character varying(21) NOT NULL,
@@ -28,6 +33,9 @@ export class AddOtpEntity1700396157624 implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "otp" DROP CONSTRAINT "fk_otp_user_id"
         `)

packages/server/api/src/app/database/migration/postgres/1700406308445-AddPlatformDefaultLanguage.ts

@@ -1,17 +1,25 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddPlatformDefaultLanguage1700406308445
 implements MigrationInterface {
     name = 'AddPlatformDefaultLanguage1700406308445'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "platform"
             ADD "defaultLocale" character varying
         `)
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "platform" DROP COLUMN "defaultLocale"
         `)

packages/server/api/src/app/database/migration/postgres/1700751925992-MakeStripeCustomerIdNullable.ts

@@ -1,11 +1,16 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
 import { logger } from '@activepieces/server-shared'
+import { ApEdition } from '@activepieces/shared'
 
 export class MakeStripeCustomerIdNullable1700751925992
 implements MigrationInterface {
     name = 'MakeStripeCustomerIdNullable1700751925992'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         logger.info('MakeStripeCustomerIdNullable1700751925992 is up')
         await queryRunner.query(`
             ALTER TABLE "project_plan"
@@ -18,6 +23,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         logger.info('MakeStripeCustomerIdNullable1700751925992 is down')
         await queryRunner.query(`
             ALTER TABLE "project_plan"

packages/server/api/src/app/database/migration/postgres/1701084418793-add-state-to-otp.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
 import { logger } from '@activepieces/server-shared'
+import { ApEdition } from '@activepieces/shared'
 
 export class AddStateToOtp1701084418793 implements MigrationInterface {
     name = 'AddStateToOtp1701084418793'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "otp"
             ADD "state" character varying NOT NULL
@@ -14,6 +19,9 @@ export class AddStateToOtp1701084418793 implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             ALTER TABLE "otp" DROP COLUMN "state"
         `)

packages/server/api/src/app/database/migration/postgres/1701261357197-migrate-ee-users-to-oldest-platform.ts

@@ -1,11 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
-import { isNil } from '@activepieces/shared'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition, isNil } from '@activepieces/shared'
 
 export class MigrateEeUsersToOldestPlatform1701261357197
 implements MigrationInterface {
     name = 'MigrateEeUsersToOldestPlatform1701261357197'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.ENTERPRISE])) {
+            return
+        }
         const result = await queryRunner.query(`
         SELECT *
         FROM platform
@@ -25,6 +29,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             UPDATE "user"
             SET "platformId" = NULL

packages/server/api/src/app/database/migration/postgres/1701647565290-ModifyProjectMembersAndRemoveUserId.ts

@@ -1,10 +1,15 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
+import { isNotOneOfTheseEditions } from '../../database-common'
+import { ApEdition } from '@activepieces/shared'
 
 export class ModifyProjectMembersAndRemoveUserId1701647565290
 implements MigrationInterface {
     name = 'ModifyProjectMembersAndRemoveUserId1701647565290'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
         ALTER TABLE "project_member"
         ADD "email" character varying
@@ -40,6 +45,9 @@ implements MigrationInterface {
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
+        if (isNotOneOfTheseEditions([ApEdition.CLOUD, ApEdition.ENTERPRISE])) {
+            return
+        }
         await queryRunner.query(`
             DROP INDEX "public"."idx_project_member_project_id_email_platform_id"
         `)