Preparing for migrations (#87)

* Add new migration * Update billing column tenant * Rm migration
datalens-tech · Mar 12, 2024 · 554deab · 554deab
1 parent d7dc73d
commit 554deab
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/api/db.ts b/api/db.ts
@@ -15,7 +15,7 @@ export {
     RevisionModelColumnRaw,
 } from '../src/db/models/new/revision';
 
-export {Tenant, TenantColumn, BillingRate} from '../src/db/models/new/tenant';
+export {Tenant, TenantColumn} from '../src/db/models/new/tenant';
 export {MigrationTenant, MigrationTenantColumn} from '../src/db/models/new/migration-tenant';
 
 export {WorkbookModel, WorkbookModelColumn} from '../src/db/models/new/workbook';

diff --git a/src/db/models/new/tenant/index.ts b/src/db/models/new/tenant/index.ts
@@ -1,5 +1,4 @@
 import {Model} from '../../..';
-import {BillingRate} from './types';
 
 export const TenantColumn = {
     TenantId: 'tenantId',
@@ -11,8 +10,6 @@ export const TenantColumn = {
     RetriesCount: 'retriesCount',
     FoldersEnabled: 'foldersEnabled',
     CollectionsEnabled: 'collectionsEnabled',
-    BillingRate: 'billingRate',
-    BillingAccountId: 'billingAccountId',
     BillingInstanceServiceId: 'billingInstanceServiceId',
     BillingStartedAt: 'billingStartedAt',
     Branding: 'branding',
@@ -36,11 +33,7 @@ export class Tenant extends Model {
     [TenantColumn.RetriesCount]!: number;
     [TenantColumn.FoldersEnabled]!: boolean;
     [TenantColumn.CollectionsEnabled]!: boolean;
-    [TenantColumn.BillingRate]!: BillingRate;
-    [TenantColumn.BillingAccountId]!: Nullable<string>;
     [TenantColumn.BillingInstanceServiceId]!: Nullable<string>;
     [TenantColumn.BillingStartedAt]!: Nullable<string>;
     [TenantColumn.Branding]!: Record<string, unknown>;
 }
-
-export {BillingRate};
diff --git a/src/db/models/new/tenant/types.ts b/src/db/models/new/tenant/types.ts
diff --git a/src/db/presentations/joined-migration-tenant/index.ts b/src/db/presentations/joined-migration-tenant/index.ts
@@ -13,8 +13,6 @@ const selectedTenantColumns = [
     TenantColumn.RetriesCount,
     TenantColumn.CollectionsEnabled,
     TenantColumn.FoldersEnabled,
-    TenantColumn.BillingRate,
-    TenantColumn.BillingAccountId,
     TenantColumn.BillingInstanceServiceId,
     TenantColumn.BillingStartedAt,
     TenantColumn.Branding,
@@ -37,8 +35,6 @@ export const JoinedMigrationTenantColumn = {
     RetriesCount: TenantColumn.RetriesCount,
     CollectionsEnabled: TenantColumn.CollectionsEnabled,
     FoldersEnabled: TenantColumn.FoldersEnabled,
-    BillingRate: TenantColumn.BillingRate,
-    BillingAccountId: TenantColumn.BillingAccountId,
     BillingInstanceServiceId: TenantColumn.BillingInstanceServiceId,
     BillingStartedAt: TenantColumn.BillingStartedAt,
     FromId: MigrationTenantColumn.FromId,