From 8aa45baee847555be433b0e554187a79786924d1 Mon Sep 17 00:00:00 2001
From: "makabe.t" <makabe.t@nds-tyo.co.jp>
Date: Wed, 24 Jan 2024 02:52:13 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20PR=20697:=20DB=E9=96=A2=E9=80=A3?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 概要
[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を起動できることを確認
---
 dictation_function/.env                                       | 1 +
 dictation_function/src/functions/licenseAlert.ts              | 2 +-
 dictation_function/src/functions/licenseAutoAllocation.ts     | 2 +-
 .../src/functions/licenseAutoAllocationManualRetry.ts         | 2 +-
 dictation_server/.env                                         | 1 +
 dictation_server/src/app.module.ts                            | 2 +-
 dictation_server/src/common/validators/env.validator.ts       | 4 ++++
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dictation_function/.env b/dictation_function/.env
index f8bd781..9f8024b 100644
--- a/dictation_function/.env
+++ b/dictation_function/.env
@@ -1,5 +1,6 @@
 DB_HOST=omds-mysql
 DB_PORT=3306
 DB_NAME=omds
+DB_NAME_CCB=omds_ccb
 DB_USERNAME=omdsdbuser
 DB_PASSWORD=omdsdbpass
\ No newline at end of file
diff --git a/dictation_function/src/functions/licenseAlert.ts b/dictation_function/src/functions/licenseAlert.ts
index ad4119f..a11af0d 100644
--- a/dictation_function/src/functions/licenseAlert.ts
+++ b/dictation_function/src/functions/licenseAlert.ts
@@ -107,7 +107,7 @@ export async function licenseAlert(
       port: Number(process.env.DB_PORT),
       username: process.env.DB_USERNAME,
       password: process.env.DB_PASSWORD,
-      database: process.env.DB_NAME,
+      database: process.env.DB_NAME_CCB,
       entities: [User, Account, License],
     });
     await datasource.initialize();
diff --git a/dictation_function/src/functions/licenseAutoAllocation.ts b/dictation_function/src/functions/licenseAutoAllocation.ts
index b4b623f..a1ece5d 100644
--- a/dictation_function/src/functions/licenseAutoAllocation.ts
+++ b/dictation_function/src/functions/licenseAutoAllocation.ts
@@ -85,7 +85,7 @@ export async function licenseAutoAllocation(
         port: Number(process.env.DB_PORT),
         username: process.env.DB_USERNAME,
         password: process.env.DB_PASSWORD,
-        database: process.env.DB_NAME,
+        database: process.env.DB_NAME_CCB,
         entities: [User, Account, License, LicenseAllocationHistory],
       });
       await datasource.initialize();
diff --git a/dictation_function/src/functions/licenseAutoAllocationManualRetry.ts b/dictation_function/src/functions/licenseAutoAllocationManualRetry.ts
index 18fa0f2..c34de46 100644
--- a/dictation_function/src/functions/licenseAutoAllocationManualRetry.ts
+++ b/dictation_function/src/functions/licenseAutoAllocationManualRetry.ts
@@ -48,7 +48,7 @@ export async function licenseAutoAllocationManualRetry(
           port: Number(process.env.DB_PORT),
           username: process.env.DB_USERNAME,
           password: process.env.DB_PASSWORD,
-          database: process.env.DB_NAME,
+          database: process.env.DB_NAME_CCB,
           entities: [User, Account, License, LicenseAllocationHistory],
         });
         await datasource.initialize();
diff --git a/dictation_server/.env b/dictation_server/.env
index c104e29..e519213 100644
--- a/dictation_server/.env
+++ b/dictation_server/.env
@@ -1,5 +1,6 @@
 DB_HOST=omds-mysql
 DB_PORT=3306
 DB_NAME=omds
+DB_NAME_CCB=omds_ccb
 DB_USERNAME=omdsdbuser
 DB_PASSWORD=omdsdbpass
diff --git a/dictation_server/src/app.module.ts b/dictation_server/src/app.module.ts
index 667cde8..1157fa4 100644
--- a/dictation_server/src/app.module.ts
+++ b/dictation_server/src/app.module.ts
@@ -98,7 +98,7 @@ import * as redisStore from 'cache-manager-redis-store';
         port: configService.get('DB_PORT'),
         username: configService.get('DB_USERNAME'),
         password: configService.get('DB_PASSWORD'),
-        database: configService.get('DB_NAME'),
+        database: configService.get('DB_NAME_CCB'),
         autoLoadEntities: true, // forFeature()で登録されたEntityを自動的にロード
         synchronize: false, // trueにすると自動的にmigrationが行われるため注意
       }),
diff --git a/dictation_server/src/common/validators/env.validator.ts b/dictation_server/src/common/validators/env.validator.ts
index 8ce706f..bd931d3 100644
--- a/dictation_server/src/common/validators/env.validator.ts
+++ b/dictation_server/src/common/validators/env.validator.ts
@@ -24,6 +24,10 @@ export class EnvValidator {
   @IsString()
   DB_NAME: string;
 
+  @IsNotEmpty()
+  @IsString()
+  DB_NAME_CCB: string;
+
   @IsNotEmpty()
   @IsString()
   DB_USERNAME: string;