Merge branch 'mg/OPS-3127-2' of https://github.com/openops-cloud/openops into mg/OPS-3127-2

MarceloRGonc · MarceloRGonc · commit fc66c9b4ccce · 2025-12-03T14:01:49.000Z
diff --git a/packages/server/api/src/app/database/seeds/auto-instances-shutdown-table-seed.ts b/packages/server/api/src/app/database/seeds/auto-instances-shutdown-table-seed.ts
@@ -1,10 +1,13 @@
 import { getTableByName } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { FlagEntity } from '../../flags/flag.entity';
-import { SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME } from '../../openops-tables/template-tables/create-auto-instances-shutdown-table';
-import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
+import {
+  createAutoInstancesShutdownTable,
+  SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME,
+} from '../../openops-tables/template-tables/create-auto-instances-shutdown-table';
 import { databaseConnection } from '../database-connection';
 import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
+import { getAdminTokenAndDatabaseId } from './get-admin-token-and-database';
 
 const AUTO_INSTANCES_SHUTDOWN_TABLE_SEED = 'AUTOINSTANCESSHUTDOWN';
 
@@ -39,7 +42,8 @@ export const seedAutoInstancesShutdownTable = async (): Promise<void> => {
   );
 
   if (!table) {
-    await seedTemplateTablesService.createAutoInstancesShutdownTable();
+    const tokenAndDatabaseId = await getAdminTokenAndDatabaseId();
+    await createAutoInstancesShutdownTable(tokenAndDatabaseId);
   }
 
   await setTableSeedFlag();
diff --git a/packages/server/api/src/app/database/seeds/get-admin-token-and-database.ts b/packages/server/api/src/app/database/seeds/get-admin-token-and-database.ts
@@ -0,0 +1,34 @@
+import { AppSystemProp, system } from '@openops/server-shared';
+import { Project } from '@openops/shared';
+import { authenticateAdminUserInOpenOpsTables } from '../../openops-tables/auth-admin-tables';
+import { projectService } from '../../project/project-service';
+import { userService } from '../../user/user-service';
+
+const getAdminUserProject = async (): Promise<Project> => {
+  const email = system.getOrThrow(AppSystemProp.OPENOPS_ADMIN_EMAIL);
+  const user = await userService.getByOrganizationAndEmail({
+    organizationId: null,
+    email,
+  });
+
+  if (!user) {
+    throw new Error(`Admin user not found for email: ${email}`);
+  }
+
+  const project = await projectService.getOneForUser(user);
+
+  if (!project) {
+    throw new Error(`No project found for user: ${email}`);
+  }
+
+  return project;
+};
+
+export const getAdminTokenAndDatabaseId = async (): Promise<{
+  token: string;
+  tablesDatabaseId: number;
+}> => {
+  const { token } = await authenticateAdminUserInOpenOpsTables();
+  const { tablesDatabaseId } = await getAdminUserProject();
+  return { token, tablesDatabaseId };
+};
diff --git a/packages/server/api/src/app/database/seeds/openops-aggregated-costs-seed.ts b/packages/server/api/src/app/database/seeds/openops-aggregated-costs-seed.ts
@@ -1,10 +1,13 @@
 import { getTableByName } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { FlagEntity } from '../../flags/flag.entity';
-import { SEED_TABLE_NAME } from '../../openops-tables/template-tables/create-aggregated-costs-table';
-import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
+import {
+  createAggregatedCostsTable,
+  SEED_TABLE_NAME,
+} from '../../openops-tables/template-tables/create-aggregated-costs-table';
 import { databaseConnection } from '../database-connection';
 import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
+import { getAdminTokenAndDatabaseId } from './get-admin-token-and-database';
 
 const AGGREGATED_TABLE_SEED = 'AGGREGATEDCOSTS';
 
@@ -38,7 +41,8 @@ export const seedFocusDataAggregationTemplateTable =
     );
 
     if (!table) {
-      await seedTemplateTablesService.createAggregatedCostsTable();
+      const tokenAndDatabaseId = await getAdminTokenAndDatabaseId();
+      await createAggregatedCostsTable(tokenAndDatabaseId);
     }
 
     await setTableSeedFlag();
diff --git a/packages/server/api/src/app/database/seeds/openops-knonw-cost-types-by-application-seed.ts b/packages/server/api/src/app/database/seeds/openops-knonw-cost-types-by-application-seed.ts
@@ -1,10 +1,13 @@
 import { getTableByName } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { FlagEntity } from '../../flags/flag.entity';
-import { SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME } from '../../openops-tables/template-tables/create-known-cost-types-by-application-table';
-import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
+import {
+  createKnownCostTypesByApplicationTable,
+  SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME,
+} from '../../openops-tables/template-tables/create-known-cost-types-by-application-table';
 import { databaseConnection } from '../database-connection';
 import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
+import { getAdminTokenAndDatabaseId } from './get-admin-token-and-database';
 
 const KNOWN_COST_TYPES_BY_APPLICATION = 'KNOWNCOSTTYPES';
 
@@ -39,7 +42,8 @@ export const seedKnownCostTypesByApplicationTable = async (): Promise<void> => {
   );
 
   if (!table) {
-    await seedTemplateTablesService.createKnownCostTypesByApplicationTable();
+    const tokenAndDatabaseId = await getAdminTokenAndDatabaseId();
+    await createKnownCostTypesByApplicationTable(tokenAndDatabaseId);
   }
 
   await setTableSeedFlag();
diff --git a/packages/server/api/src/app/database/seeds/openops-opportunities-table-seed.ts b/packages/server/api/src/app/database/seeds/openops-opportunities-table-seed.ts
@@ -1,10 +1,13 @@
 import { getTableByName } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { FlagEntity } from '../../flags/flag.entity';
-import { SEED_OPENOPS_TABLE_NAME } from '../../openops-tables/template-tables/create-opportunities-table';
-import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
+import {
+  createOpportunitiesTable,
+  SEED_OPENOPS_TABLE_NAME,
+} from '../../openops-tables/template-tables/create-opportunities-table';
 import { databaseConnection } from '../database-connection';
 import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
+import { getAdminTokenAndDatabaseId } from './get-admin-token-and-database';
 
 const OPPORTUNITIES_TABLE_SEED = 'OPPORTUNITIESSEED';
 
@@ -39,7 +42,8 @@ export const seedOpportunitesTemplateTable = async (): Promise<void> => {
   );
 
   if (!table) {
-    await seedTemplateTablesService.createOpportunityTemplateTable();
+    const tokenAndDatabaseId = await getAdminTokenAndDatabaseId();
+    await createOpportunitiesTable(tokenAndDatabaseId);
   }
 
   await setTableSeedFlag();
diff --git a/packages/server/api/src/app/database/seeds/seed-template-tables.ts b/packages/server/api/src/app/database/seeds/seed-template-tables.ts
@@ -2,6 +2,7 @@ import { logger } from '@openops/server-shared';
 import { FlagEntity } from '../../flags/flag.entity';
 import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
 import { databaseConnection } from '../database-connection';
+import { getAdminTokenAndDatabaseId } from './get-admin-token-and-database';
 
 const TEMPLATE_TABLES_SEED = 'TEMPLATE_TABLES_SEED';
 
@@ -30,7 +31,8 @@ export const seedTemplateTables = async (): Promise<void> => {
     return;
   }
 
-  await seedTemplateTablesService.createBaseTemplateTables();
+  const tokenAndDatabaseId = await getAdminTokenAndDatabaseId();
+  await seedTemplateTablesService.createBaseTemplateTables(tokenAndDatabaseId);
 
   await setTableSeedFlag();
 };
diff --git a/packages/server/api/src/app/openops-tables/template-tables/create-aggregated-costs-table.ts b/packages/server/api/src/app/openops-tables/template-tables/create-aggregated-costs-table.ts
@@ -7,18 +7,19 @@ import {
 } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { openopsTables } from '../index';
+import { TokenAndDatabaseId } from './types';
 
 export const SEED_TABLE_NAME = 'Aggregated Costs';
 const SEED_LOG_HEADER = `[Seeding ${SEED_TABLE_NAME} table]`;
 
-export async function createAggregatedCostsTable(
-  databaseId: number,
-  token: string,
-): Promise<{ tableId: number }> {
+export async function createAggregatedCostsTable({
+  token,
+  tablesDatabaseId,
+}: TokenAndDatabaseId): Promise<{ tableId: number }> {
   logger.debug(`${SEED_LOG_HEADER} Start`);
 
   const table = await openopsTables.createTable(
-    databaseId,
+    tablesDatabaseId,
     SEED_TABLE_NAME,
     [['Group Key']],
     token,
diff --git a/packages/server/api/src/app/openops-tables/template-tables/create-auto-instances-shutdown-table.ts b/packages/server/api/src/app/openops-tables/template-tables/create-auto-instances-shutdown-table.ts
@@ -7,20 +7,21 @@ import {
 } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { createTable } from '../create-table';
+import { TokenAndDatabaseId } from './types';
 
 export const SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME =
   'Auto instances shutdown';
 
-export async function createAutoInstancesShutdownTable(
-  token: string,
-  databaseId: number,
-): Promise<void> {
+export async function createAutoInstancesShutdownTable({
+  token,
+  tablesDatabaseId,
+}: TokenAndDatabaseId): Promise<void> {
   logger.debug(
     `[Seeding ${SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME} table] Start`,
   );
 
   const table = await createTable(
-    databaseId,
+    tablesDatabaseId,
     SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME,
     [['Resource ID']],
     token,
diff --git a/packages/server/api/src/app/openops-tables/template-tables/create-known-cost-types-by-application-table.ts b/packages/server/api/src/app/openops-tables/template-tables/create-known-cost-types-by-application-table.ts
@@ -8,20 +8,21 @@ import {
 } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { createTable } from '../create-table';
+import { TokenAndDatabaseId } from './types';
 
 export const SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME =
   'Known cost types by application';
 
-export async function createKnownCostTypesByApplicationTable(
-  token: string,
-  databaseId: number,
-) {
+export async function createKnownCostTypesByApplicationTable({
+  token,
+  tablesDatabaseId,
+}: TokenAndDatabaseId) {
   logger.debug(
     `[Seeding ${SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME} table] Start`,
   );
 
   const table = await createTable(
-    databaseId,
+    tablesDatabaseId,
     SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME,
     [['ID']],
     token,
diff --git a/packages/server/api/src/app/openops-tables/template-tables/create-opportunities-table.ts b/packages/server/api/src/app/openops-tables/template-tables/create-opportunities-table.ts
@@ -8,17 +8,18 @@ import {
 } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { createTable } from '../create-table';
+import { TokenAndDatabaseId } from './types';
 
 export const SEED_OPENOPS_TABLE_NAME = 'Opportunities';
 
-export async function createOpportunitiesTable(
-  token: string,
-  databaseId: number,
-) {
+export async function createOpportunitiesTable({
+  token,
+  tablesDatabaseId,
+}: TokenAndDatabaseId) {
   logger.debug(`[Seeding ${SEED_OPENOPS_TABLE_NAME} table] Start`);
 
   const table = await createTable(
-    databaseId,
+    tablesDatabaseId,
     SEED_OPENOPS_TABLE_NAME,
     [['ID']],
     token,
diff --git a/packages/server/api/src/app/openops-tables/template-tables/seed-tables-for-templates.ts b/packages/server/api/src/app/openops-tables/template-tables/seed-tables-for-templates.ts
@@ -1,84 +1,24 @@
-import { AppSystemProp, logger, system } from '@openops/server-shared';
-import { projectService } from '../../project/project-service';
-import { userService } from '../../user/user-service';
-import { authenticateAdminUserInOpenOpsTables } from '../auth-admin-tables';
-import { createAggregatedCostsTable } from './create-aggregated-costs-table';
-import { createAutoInstancesShutdownTable } from './create-auto-instances-shutdown-table';
+import { logger } from '@openops/server-shared';
 import { createBusinessUnitsTable } from './create-business-units-table';
 import { createIdleEbsVolumesToDeleteTable } from './create-idle-ebs-volumes-to-delete-table';
-import { createKnownCostTypesByApplicationTable } from './create-known-cost-types-by-application-table';
-import { createOpportunitiesTable } from './create-opportunities-table';
 import { createResourceBuTagAssignmentTable } from './create-resource-bu-tag-assignment-table';
 import { createTagOwnerMappingTable } from './create-tag-owner-mapping-table';
-
-const getProjectTablesDatabaseId = async (): Promise<number> => {
-  const email = system.getOrThrow(AppSystemProp.OPENOPS_ADMIN_EMAIL);
-  const user = await userService.getByOrganizationAndEmail({
-    organizationId: null,
-    email,
-  });
-
-  if (!user) {
-    throw new Error(`Admin user not found for email: ${email}`);
-  }
-
-  const project = await projectService.getOneForUser(user);
-
-  if (!project) {
-    throw new Error(`No project found for user: ${email}`);
-  }
-
-  return project.tablesDatabaseId;
-};
+import { TokenAndDatabaseId } from './types';
 
 export const seedTemplateTablesService = {
-  async createBaseTemplateTables() {
-    const { token } = await authenticateAdminUserInOpenOpsTables();
-    const databaseId = await getProjectTablesDatabaseId();
-
-    const buTable = await createBusinessUnitsTable(databaseId, token);
-    await createTagOwnerMappingTable(databaseId, token, buTable.tableId);
-    await createIdleEbsVolumesToDeleteTable(databaseId, token);
+  async createBaseTemplateTables({
+    token,
+    tablesDatabaseId,
+  }: TokenAndDatabaseId) {
+    const buTable = await createBusinessUnitsTable(tablesDatabaseId, token);
+    await createTagOwnerMappingTable(tablesDatabaseId, token, buTable.tableId);
+    await createIdleEbsVolumesToDeleteTable(tablesDatabaseId, token);
     await createResourceBuTagAssignmentTable(
-      databaseId,
+      tablesDatabaseId,
       token,
       buTable.tableId,
     );
 
     logger.info('[Seeding template tables] Done');
   },
-
-  async createOpportunityTemplateTable() {
-    const { token } = await authenticateAdminUserInOpenOpsTables();
-    const databaseId = await getProjectTablesDatabaseId();
-
-    await createOpportunitiesTable(token, databaseId);
-
-    logger.info('[Seeding opportunity template table] Done');
-  },
-
-  async createAggregatedCostsTable() {
-    const { token } = await authenticateAdminUserInOpenOpsTables();
-    const databaseId = await getProjectTablesDatabaseId();
-
-    await createAggregatedCostsTable(databaseId, token);
-  },
-
-  async createKnownCostTypesByApplicationTable() {
-    const { token } = await authenticateAdminUserInOpenOpsTables();
-    const databaseId = await getProjectTablesDatabaseId();
-
-    await createKnownCostTypesByApplicationTable(token, databaseId);
-
-    logger.info('[Seeding Known cost types by application table] Done');
-  },
-
-  async createAutoInstancesShutdownTable(): Promise<void> {
-    const { token } = await authenticateAdminUserInOpenOpsTables();
-    const databaseId = await getProjectTablesDatabaseId();
-
-    await createAutoInstancesShutdownTable(token, databaseId);
-
-    logger.info('[Seeding Auto Instances Shutdown table] Done');
-  },
 };
diff --git a/packages/server/api/src/app/openops-tables/template-tables/types.ts b/packages/server/api/src/app/openops-tables/template-tables/types.ts
@@ -0,0 +1,4 @@
+export type TokenAndDatabaseId = {
+  token: string;
+  tablesDatabaseId: number;
+};
diff --git a/packages/server/api/test/unit/openops-tables/create-opportunities-table.test.ts b/packages/server/api/test/unit/openops-tables/create-opportunities-table.test.ts
@@ -27,7 +27,10 @@ describe('createOpportunityTable', () => {
     openopsCommonMock.getPrimaryKeyFieldFromFields.mockReturnValue({ id: 1 });
     openopsCommonMock.makeOpenOpsTablesPost.mockReturnValue({ id: 1 });
 
-    await createOpportunitiesTable('some token', 2);
+    await createOpportunitiesTable({
+      token: 'some token',
+      tablesDatabaseId: 2,
+    });
 
     expect(createTableMock).toHaveBeenCalledTimes(1);
     expect(createTableMock).toHaveBeenCalledWith(
@@ -139,8 +142,8 @@ describe('createOpportunityTable', () => {
   it('should throw if something fails', async () => {
     openopsCommonMock.getFields.mockRejectedValue(new Error('some error'));
 
-    await expect(createOpportunitiesTable('some token', 2)).rejects.toThrow(
-      'some error',
-    );
+    await expect(
+      createOpportunitiesTable({ token: 'some token', tablesDatabaseId: 2 }),
+    ).rejects.toThrow('some error');
   });
 });
