From d1a8b887e5b5f259915da0e3c447a1cdfdbd49a3 Mon Sep 17 00:00:00 2001
From: "makabe.t" <makabe.t@nds-tyo.co.jp>
Date: Tue, 19 Sep 2023 02:56:19 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20PR=20417:=20ActiveWorktypeID=E3=82=92?=
 =?UTF-8?q?=E6=9C=AA=E8=A8=AD=E5=AE=9A=E3=81=AB=E6=88=BB=E3=81=9B=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 概要
[Task2677: ActiveWorktypeIDを未設定に戻せるように修正](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2677)

- ActiveWorktypeIDを設定後、未選択に戻す操作ができるように修正

## レビューポイント
- 修正箇所の共有

## UIの変更
- なし

## 動作確認状況
- ローカルで確認
---
 .../src/pages/WorkTypeIdSettingPage/index.tsx |  2 +-
 .../accounts/accounts.service.spec.ts         | 31 +++++++++++++++++++
 .../accounts/accounts.repository.service.ts   | 28 +++++++++++------
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx b/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx
index 4fa599c..b2b8715 100644
--- a/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx
+++ b/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx
@@ -140,7 +140,7 @@ const WorktypeIdSettingPage: React.FC = (): JSX.Element => {
                     <select
                       name="Active Worktype"
                       className={styles.formInput}
-                      value={activeWorktypeId}
+                      value={activeWorktypeId ?? ""}
                       onChange={onChangeActiveWorktype}
                     >
                       {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
diff --git a/dictation_server/src/features/accounts/accounts.service.spec.ts b/dictation_server/src/features/accounts/accounts.service.spec.ts
index 1ac8181..6f61cf0 100644
--- a/dictation_server/src/features/accounts/accounts.service.spec.ts
+++ b/dictation_server/src/features/accounts/accounts.service.spec.ts
@@ -4402,6 +4402,37 @@ describe('updateActiveWorktype', () => {
     }
   });
 
+  it('アカウントのActiveWorktypeIDをNULLに更新できる（WorkTypeID⇒NULL）', async () => {
+    const module = await makeTestingModule(source);
+    // 第五階層のアカウント作成
+    const { account, admin } = await makeTestAccount(source, { tier: 5 });
+
+    const service = module.get<AccountsService>(AccountsService);
+    const context = makeContext(admin.external_id);
+
+    const worktype1 = await createWorktype(
+      source,
+      account.id,
+      'worktype1',
+      'description1',
+      true,
+    );
+
+    //作成したデータを確認
+    {
+      const beforeAccount = await getAccount(source, account.id);
+      expect(beforeAccount.active_worktype_id).toBe(worktype1.id);
+    }
+
+    await service.updateActiveWorktype(context, admin.external_id, undefined);
+
+    //実行結果を確認
+    {
+      const { active_worktype_id } = await getAccount(source, account.id);
+      expect(active_worktype_id).toBe(null);
+    }
+  });
+
   it('自アカウント内に指定されたIDのWorktypeIDが存在しない場合、400エラーとなること（WorkTypeIDが存在しない場合）', async () => {
     const module = await makeTestingModule(source);
     // 第五階層のアカウント作成
diff --git a/dictation_server/src/repositories/accounts/accounts.repository.service.ts b/dictation_server/src/repositories/accounts/accounts.repository.service.ts
index 8ce21f2..6636f21 100644
--- a/dictation_server/src/repositories/accounts/accounts.repository.service.ts
+++ b/dictation_server/src/repositories/accounts/accounts.repository.service.ts
@@ -771,26 +771,34 @@ export class AccountsRepositoryService {
   /**
    * ActiveWorktypeIdを更新する
    * @param accountId
-   * @param id ActiveWorktypeIdの内部ID
+   * @param [id] ActiveWorktypeIdの内部ID
    * @returns active worktype id
    */
-  async updateActiveWorktypeId(accountId: number, id: number): Promise<void> {
+  async updateActiveWorktypeId(
+    accountId: number,
+    id?: number | undefined,
+  ): Promise<void> {
     return await this.dataSource.transaction(async (entityManager) => {
       const worktypeRepo = entityManager.getRepository(Worktype);
       const accountRepo = entityManager.getRepository(Account);
 
-      // 自アカウント内に指定IDのワークタイプが存在するか確認
-      const worktype = await worktypeRepo.findOne({
-        where: { account_id: accountId, id: id },
-      });
+      if (id) {
+        // 自アカウント内に指定IDのワークタイプが存在するか確認
+        const worktype = await worktypeRepo.findOne({
+          where: { account_id: accountId, id: id },
+        });
 
-      // ワークタイプが存在しない場合はエラー
-      if (!worktype) {
-        throw new WorktypeIdNotFoundError('Worktype is not found. id: ${id}');
+        // ワークタイプが存在しない場合はエラー
+        if (!worktype) {
+          throw new WorktypeIdNotFoundError('Worktype is not found. id: ${id}');
+        }
       }
 
       // アカウントのActiveWorktypeIDを更新
-      await accountRepo.update({ id: accountId }, { active_worktype_id: id });
+      await accountRepo.update(
+        { id: accountId },
+        { active_worktype_id: id ?? null },
+      );
     });
   }
 }