Merged PR 697: DB関連コード修正
## 概要 [Task3509: DB関連コード修正](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3509) - 参照するDBがCCB用のスキーマとなるようにserverの参照DB名を変更しました。 対象: - server - .env - app.module.ts - function - .env - functions/* ※マージの取り込み分も入ってしまったので他は無視してください。 ## レビューポイント - 対応箇所は適切でしょうか。 ## UIの変更 - なし ## 動作確認状況 - ローカルで確認 - ローカルにスキーマを追加・マイグレーションしてserverを起動できることを確認
This commit is contained in:
parent
f2f8728319
commit
8aa45baee8
@ -1,5 +1,6 @@
|
|||||||
DB_HOST=omds-mysql
|
DB_HOST=omds-mysql
|
||||||
DB_PORT=3306
|
DB_PORT=3306
|
||||||
DB_NAME=omds
|
DB_NAME=omds
|
||||||
|
DB_NAME_CCB=omds_ccb
|
||||||
DB_USERNAME=omdsdbuser
|
DB_USERNAME=omdsdbuser
|
||||||
DB_PASSWORD=omdsdbpass
|
DB_PASSWORD=omdsdbpass
|
||||||
@ -107,7 +107,7 @@ export async function licenseAlert(
|
|||||||
port: Number(process.env.DB_PORT),
|
port: Number(process.env.DB_PORT),
|
||||||
username: process.env.DB_USERNAME,
|
username: process.env.DB_USERNAME,
|
||||||
password: process.env.DB_PASSWORD,
|
password: process.env.DB_PASSWORD,
|
||||||
database: process.env.DB_NAME,
|
database: process.env.DB_NAME_CCB,
|
||||||
entities: [User, Account, License],
|
entities: [User, Account, License],
|
||||||
});
|
});
|
||||||
await datasource.initialize();
|
await datasource.initialize();
|
||||||
|
|||||||
@ -85,7 +85,7 @@ export async function licenseAutoAllocation(
|
|||||||
port: Number(process.env.DB_PORT),
|
port: Number(process.env.DB_PORT),
|
||||||
username: process.env.DB_USERNAME,
|
username: process.env.DB_USERNAME,
|
||||||
password: process.env.DB_PASSWORD,
|
password: process.env.DB_PASSWORD,
|
||||||
database: process.env.DB_NAME,
|
database: process.env.DB_NAME_CCB,
|
||||||
entities: [User, Account, License, LicenseAllocationHistory],
|
entities: [User, Account, License, LicenseAllocationHistory],
|
||||||
});
|
});
|
||||||
await datasource.initialize();
|
await datasource.initialize();
|
||||||
|
|||||||
@ -48,7 +48,7 @@ export async function licenseAutoAllocationManualRetry(
|
|||||||
port: Number(process.env.DB_PORT),
|
port: Number(process.env.DB_PORT),
|
||||||
username: process.env.DB_USERNAME,
|
username: process.env.DB_USERNAME,
|
||||||
password: process.env.DB_PASSWORD,
|
password: process.env.DB_PASSWORD,
|
||||||
database: process.env.DB_NAME,
|
database: process.env.DB_NAME_CCB,
|
||||||
entities: [User, Account, License, LicenseAllocationHistory],
|
entities: [User, Account, License, LicenseAllocationHistory],
|
||||||
});
|
});
|
||||||
await datasource.initialize();
|
await datasource.initialize();
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
DB_HOST=omds-mysql
|
DB_HOST=omds-mysql
|
||||||
DB_PORT=3306
|
DB_PORT=3306
|
||||||
DB_NAME=omds
|
DB_NAME=omds
|
||||||
|
DB_NAME_CCB=omds_ccb
|
||||||
DB_USERNAME=omdsdbuser
|
DB_USERNAME=omdsdbuser
|
||||||
DB_PASSWORD=omdsdbpass
|
DB_PASSWORD=omdsdbpass
|
||||||
|
|||||||
@ -98,7 +98,7 @@ import * as redisStore from 'cache-manager-redis-store';
|
|||||||
port: configService.get('DB_PORT'),
|
port: configService.get('DB_PORT'),
|
||||||
username: configService.get('DB_USERNAME'),
|
username: configService.get('DB_USERNAME'),
|
||||||
password: configService.get('DB_PASSWORD'),
|
password: configService.get('DB_PASSWORD'),
|
||||||
database: configService.get('DB_NAME'),
|
database: configService.get('DB_NAME_CCB'),
|
||||||
autoLoadEntities: true, // forFeature()で登録されたEntityを自動的にロード
|
autoLoadEntities: true, // forFeature()で登録されたEntityを自動的にロード
|
||||||
synchronize: false, // trueにすると自動的にmigrationが行われるため注意
|
synchronize: false, // trueにすると自動的にmigrationが行われるため注意
|
||||||
}),
|
}),
|
||||||
|
|||||||
@ -24,6 +24,10 @@ export class EnvValidator {
|
|||||||
@IsString()
|
@IsString()
|
||||||
DB_NAME: string;
|
DB_NAME: string;
|
||||||
|
|
||||||
|
@IsNotEmpty()
|
||||||
|
@IsString()
|
||||||
|
DB_NAME_CCB: string;
|
||||||
|
|
||||||
@IsNotEmpty()
|
@IsNotEmpty()
|
||||||
@IsString()
|
@IsString()
|
||||||
DB_USERNAME: string;
|
DB_USERNAME: string;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user