Skip to content

Commit 7b9d203

Browse files
cezudascezudas
committed
Rename method
1 parent 4e2650a commit 7b9d203

8 files changed

Lines changed: 43 additions & 34 deletions

‎packages/server/api/src/app/database/get-default-user-db-token.ts‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@ import { AppSystemProp, system } from '@openops/server-shared';
33
import { projectService } from '../project/project-service';
44
import { userService } from '../user/user-service';
55

6-
export const getDefaultUserDbToken = async (): Promise<TablesServerContext> => {
7-
const defaultUserEmail = system.getOrThrow(AppSystemProp.OPENOPS_ADMIN_EMAIL);
6+
export const getDefaultProjectTablesDatabaseToken =
7+
async (): Promise<TablesServerContext> => {
8+
const defaultUserEmail = system.getOrThrow(
9+
AppSystemProp.OPENOPS_ADMIN_EMAIL,
10+
);
811

9-
const defaultUser = await userService.getUserByEmail(defaultUserEmail);
10-
if (!defaultUser) {
11-
throw new Error('Default user not found');
12-
}
12+
const defaultUser = await userService.getUserByEmail(defaultUserEmail);
13+
if (!defaultUser) {
14+
throw new Error('Default user not found');
15+
}
1316

14-
const project = await projectService.getOneForUser(defaultUser);
15-
if (!project) {
16-
throw new Error('Project not found');
17-
}
18-
return {
19-
tablesDatabaseId: project.tablesDatabaseId,
20-
tablesDatabaseToken: project.tablesDatabaseToken,
17+
const project = await projectService.getOneForUser(defaultUser);
18+
if (!project) {
19+
throw new Error('Project not found');
20+
}
21+
return {
22+
tablesDatabaseId: project.tablesDatabaseId,
23+
tablesDatabaseToken: project.tablesDatabaseToken,
24+
};
2125
};
22-
};

‎packages/server/api/src/app/database/seeds/auto-instances-shutdown-table-seed.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FlagEntity } from '../../flags/flag.entity';
44
import { SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME } from '../../openops-tables/template-tables/create-auto-instances-shutdown-table';
55
import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
66
import { databaseConnection } from '../database-connection';
7-
import { getDefaultUserDbToken } from '../get-default-user-db-token';
7+
import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
88

99
const AUTO_INSTANCES_SHUTDOWN_TABLE_SEED = 'AUTOINSTANCESSHUTDOWN';
1010

@@ -35,7 +35,7 @@ export const seedAutoInstancesShutdownTable = async (): Promise<void> => {
3535

3636
const table = await getTableByName(
3737
SEED_OPENOPS_AUTO_INSTANCES_SHUTDOWN_TABLE_NAME,
38-
await getDefaultUserDbToken(),
38+
await getDefaultProjectTablesDatabaseToken(),
3939
);
4040

4141
if (!table) {

‎packages/server/api/src/app/database/seeds/openops-aggregated-costs-seed.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FlagEntity } from '../../flags/flag.entity';
44
import { SEED_TABLE_NAME } from '../../openops-tables/template-tables/create-aggregated-costs-table';
55
import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
66
import { databaseConnection } from '../database-connection';
7-
import { getDefaultUserDbToken } from '../get-default-user-db-token';
7+
import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
88

99
const AGGREGATED_TABLE_SEED = 'AGGREGATEDCOSTS';
1010

@@ -34,7 +34,7 @@ export const seedFocusDataAggregationTemplateTable =
3434

3535
const table = await getTableByName(
3636
SEED_TABLE_NAME,
37-
await getDefaultUserDbToken(),
37+
await getDefaultProjectTablesDatabaseToken(),
3838
);
3939

4040
if (!table) {

‎packages/server/api/src/app/database/seeds/openops-delete-old-opportunities-table.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { logger } from '@openops/server-shared';
1010
import { FlagEntity } from '../../flags/flag.entity';
1111
import { SEED_OPENOPS_TABLE_NAME } from '../../openops-tables/template-tables/create-opportunities-table';
1212
import { databaseConnection } from '../database-connection';
13-
import { getDefaultUserDbToken } from '../get-default-user-db-token';
13+
import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
1414

1515
const OPENOPS_OLD_OPPORTUNITIES_TABLE_DELETED = 'OPPORTUNITYDEL1';
1616

@@ -57,7 +57,7 @@ export const deleteOldOpportunitiesTable = async (): Promise<void> => {
5757

5858
const table = await getTableByName(
5959
SEED_OPENOPS_TABLE_NAME,
60-
await getDefaultUserDbToken(),
60+
await getDefaultProjectTablesDatabaseToken(),
6161
);
6262
if (!table) {
6363
logger.info('Skip: OpenOps deletion of old opportunities table', {

‎packages/server/api/src/app/database/seeds/openops-knonw-cost-types-by-application-seed.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FlagEntity } from '../../flags/flag.entity';
44
import { SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME } from '../../openops-tables/template-tables/create-known-cost-types-by-application-table';
55
import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
66
import { databaseConnection } from '../database-connection';
7-
import { getDefaultUserDbToken } from '../get-default-user-db-token';
7+
import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
88

99
const KNOWN_COST_TYPES_BY_APPLICATION = 'KNOWNCOSTTYPES';
1010

@@ -35,7 +35,7 @@ export const seedKnownCostTypesByApplicationTable = async (): Promise<void> => {
3535

3636
const table = await getTableByName(
3737
SEED_OPENOPS_KNOWN_COST_TYPES_BY_APPLICATION_TABLE_NAME,
38-
await getDefaultUserDbToken(),
38+
await getDefaultProjectTablesDatabaseToken(),
3939
);
4040

4141
if (!table) {

‎packages/server/api/src/app/database/seeds/openops-opportunities-table-seed.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FlagEntity } from '../../flags/flag.entity';
44
import { SEED_OPENOPS_TABLE_NAME } from '../../openops-tables/template-tables/create-opportunities-table';
55
import { seedTemplateTablesService } from '../../openops-tables/template-tables/seed-tables-for-templates';
66
import { databaseConnection } from '../database-connection';
7-
import { getDefaultUserDbToken } from '../get-default-user-db-token';
7+
import { getDefaultProjectTablesDatabaseToken } from '../get-default-user-db-token';
88

99
const OPPORTUNITIES_TABLE_SEED = 'OPPORTUNITIESSEED';
1010

@@ -35,7 +35,7 @@ export const seedOpportunitesTemplateTable = async (): Promise<void> => {
3535

3636
const table = await getTableByName(
3737
SEED_OPENOPS_TABLE_NAME,
38-
await getDefaultUserDbToken(),
38+
await getDefaultProjectTablesDatabaseToken(),
3939
);
4040

4141
if (!table) {

‎packages/server/api/src/app/openops-analytics/analytics-seeding-service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
getTableIdByTableName,
44
} from '@openops/common';
55
import { AppSystemProp, logger, system } from '@openops/server-shared';
6-
import { getDefaultUserDbToken } from '../database/get-default-user-db-token';
6+
import { getDefaultProjectTablesDatabaseToken } from '../database/get-default-user-db-token';
77
import { SEED_OPENOPS_TABLE_NAME } from '../openops-tables/template-tables/create-opportunities-table';
88
import { getOrCreatePostgresDatabaseConnection } from './create-database-connection';
99
import { getOrCreateDataset } from './create-dataset';
@@ -43,7 +43,7 @@ export async function seedAnalyticsDashboards(): Promise<void> {
4343
try {
4444
seedTableId = await getTableIdByTableName(
4545
SEED_OPENOPS_TABLE_NAME,
46-
await getDefaultUserDbToken(),
46+
await getDefaultProjectTablesDatabaseToken(),
4747
);
4848
} catch (error) {
4949
logger.error(`Could not find table with name: ${SEED_OPENOPS_TABLE_NAME}`, {

‎packages/server/api/test/unit/openops-analytics/analytics-seeding-service.test.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jest.mock('../../../src/app/openops-analytics/populate-homepage', () => {
5252
};
5353
});
5454

55-
const getDefaultUserDbTokenMock = jest.fn();
55+
const getDefaultProjectTablesDatabaseTokenMock = jest.fn();
5656
jest.mock('../../../src/app/database/get-default-user-db-token', () => ({
57-
getDefaultUserDbToken: jest.fn(),
57+
getDefaultProjectTablesDatabaseToken: jest.fn(),
5858
}));
5959

6060
import { TablesServerContext } from '@openops/common';
6161
import { EncryptedObject } from '@openops/shared';
62-
import { getDefaultUserDbToken } from '../../../src/app/database/get-default-user-db-token';
62+
import { getDefaultProjectTablesDatabaseToken } from '../../../src/app/database/get-default-user-db-token';
6363
import { seedAnalyticsDashboards } from '../../../src/app/openops-analytics/analytics-seeding-service';
6464
import { SEED_OPENOPS_TABLE_NAME } from '../../../src/app/openops-tables/template-tables/create-opportunities-table';
6565

@@ -74,8 +74,8 @@ const mockTablesServerContext: TablesServerContext = {
7474
describe('seedAnalyticsDashboards', () => {
7575
beforeEach(() => {
7676
jest.clearAllMocks();
77-
(getDefaultUserDbToken as jest.Mock).mockImplementation(
78-
getDefaultUserDbTokenMock,
77+
(getDefaultProjectTablesDatabaseToken as jest.Mock).mockImplementation(
78+
getDefaultProjectTablesDatabaseTokenMock,
7979
);
8080
process.env.OPS_POSTGRES_PASSWORD = 'some password';
8181
process.env.OPS_POSTGRES_PORT = 'some port';
@@ -86,7 +86,9 @@ describe('seedAnalyticsDashboards', () => {
8686
});
8787

8888
it('should succesfully create seed related objects', async () => {
89-
getDefaultUserDbTokenMock.mockResolvedValue(mockTablesServerContext);
89+
getDefaultProjectTablesDatabaseTokenMock.mockResolvedValue(
90+
mockTablesServerContext,
91+
);
9092
openopsCommonMock.getTableIdByTableName.mockResolvedValue(1);
9193
openopsCommonMock.authenticateOpenOpsAnalyticsAdmin.mockResolvedValue({
9294
access_token: 'some token',
@@ -144,7 +146,9 @@ describe('seedAnalyticsDashboards', () => {
144146
});
145147

146148
it('should not create dataset and log error if table with seed name was not found.', async () => {
147-
getDefaultUserDbTokenMock.mockResolvedValue(mockTablesServerContext);
149+
getDefaultProjectTablesDatabaseTokenMock.mockResolvedValue(
150+
mockTablesServerContext,
151+
);
148152
openopsCommonMock.getTableIdByTableName.mockRejectedValueOnce(
149153
new Error('Table not found'),
150154
);
@@ -171,7 +175,9 @@ describe('seedAnalyticsDashboards', () => {
171175
});
172176

173177
it('should user alternative host name if provided', async () => {
174-
getDefaultUserDbTokenMock.mockResolvedValue(mockTablesServerContext);
178+
getDefaultProjectTablesDatabaseTokenMock.mockResolvedValue(
179+
mockTablesServerContext,
180+
);
175181
openopsCommonMock.getTableIdByTableName.mockResolvedValue(1);
176182
process.env.OPS_OPENOPS_TABLES_DB_HOST = 'alternative host';
177183
openopsCommonMock.authenticateOpenOpsAnalyticsAdmin.mockResolvedValue({

0 commit comments

Comments
 (0)