Add new billing columns for tenants (#68)

* Add new migration for billing * Add new billing columns for model Tenant * Change column name in model * Change column
datalens-tech · Feb 2, 2024 · 23e983a · 23e983a
1 parent 9bfac40
commit 23e983a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/db/models/new/tenant/index.ts b/src/db/models/new/tenant/index.ts
@@ -1,4 +1,5 @@
 import {Model} from '../../..';
+import {BillingRate} from './types';
 
 export const TenantColumn = {
     TenantId: 'tenantId',
@@ -10,6 +11,10 @@ export const TenantColumn = {
     RetriesCount: 'retriesCount',
     FoldersEnabled: 'foldersEnabled',
     CollectionsEnabled: 'collectionsEnabled',
+    BillingRate: 'billingRate',
+    BillingAccountId: 'billingAccountId',
+    BillingInstanceServiceId: 'billingInstanceServiceId',
+    BillingStartedAt: 'billingStartedAt',
 } as const;
 
 export class Tenant extends Model {
@@ -30,4 +35,8 @@ 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>;
 }
diff --git a/src/db/models/new/tenant/types.ts b/src/db/models/new/tenant/types.ts
@@ -0,0 +1,4 @@
+export enum BillingRate {
+    Community = 'community',
+    Business = 'business',
+}
diff --git a/src/db/presentations/joined-migration-tenant/index.ts b/src/db/presentations/joined-migration-tenant/index.ts
@@ -13,6 +13,10 @@ const selectedTenantColumns = [
     TenantColumn.RetriesCount,
     TenantColumn.CollectionsEnabled,
     TenantColumn.FoldersEnabled,
+    TenantColumn.BillingRate,
+    TenantColumn.BillingAccountId,
+    TenantColumn.BillingInstanceServiceId,
+    TenantColumn.BillingStartedAt,
 ] as const;
 
 const selectedMigrationTenantColumns = [
@@ -32,6 +36,10 @@ 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,
     ToId: MigrationTenantColumn.ToId,
     Migrating: MigrationTenantColumn.Migrating,
@@ -58,7 +66,7 @@ export const joinMigrationTenant =
         );
     };
 
-type SelectedTenantColumns = Pick<Tenant, ArrayElement<typeof selectedTenantColumns>>;
+export type SelectedTenantColumns = Pick<Tenant, ArrayElement<typeof selectedTenantColumns>>;
 
 type SelectedMigrationTenantColumns = Pick<
     MigrationTenant,