From 2a54db7c8d88b8e4ea535c963e86fd47486df270 Mon Sep 17 00:00:00 2001
From: masaaki <masaaki@nds-tyo.co.jp>
Date: Tue, 1 Aug 2023 11:37:20 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20PR=20294:=20issueDate=E3=81=8Cnull?=
 =?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E7=94=BB=E9=9D=A2=E4=B8=8A=E5=88=9D?=
 =?UTF-8?q?=E6=9C=9F=E5=80=A4=E3=81=8C=E5=85=A5=E3=81=A3=E3=81=A6=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 概要
[Task2324: issueDateがnullの場合画面上初期値が入ってしまう](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2324)

- 元PBI or タスクへのリンク（内容・目的などはそちらにあるはず）
- issued_atがnullの場合にnew Dateして初期値が返却される問題を修正しました。値がnullの場合はそのままnullを返却しています。
- 併せて、整形されていないソースがあったので修正しています（accounts.service.mock.ts）
- 影響範囲（他の機能にも影響があるか）
  - 同様に日付を扱う項目としてordered_atがありますが、こちらはnot null項目のため対応は入れていません。

## レビューポイント
- 特筆する点は無し

## UIの変更
- 無し

## 動作確認状況
- ローカルで確認

## 補足
- 相談、参考資料などがあれば
---
 .../src/features/accounts/accounts.service.ts | 11 ++--
 .../accounts/test/accounts.service.mock.ts    | 50 ++++++++++---------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/dictation_server/src/features/accounts/accounts.service.ts b/dictation_server/src/features/accounts/accounts.service.ts
index bb2d857..59c4482 100644
--- a/dictation_server/src/features/accounts/accounts.service.ts
+++ b/dictation_server/src/features/accounts/accounts.service.ts
@@ -521,10 +521,13 @@ export class AccountsService {
       const orderHistories: LicenseOrder[] = [];
       for (const licenseOrder of licenseHistoryInfo.licenseOrders) {
         const returnLicenseOrder: LicenseOrder = {
-          issueDate: new Date(licenseOrder.issued_at)
-            .toISOString()
-            .substr(0, 10)
-            .replace(/-/g, '/'),
+          issueDate:
+            licenseOrder.issued_at !== null
+              ? new Date(licenseOrder.issued_at)
+                  .toISOString()
+                  .substr(0, 10)
+                  .replace(/-/g, '/')
+              : null,
           numberOfOrder: licenseOrder.quantity,
           orderDate: new Date(licenseOrder.ordered_at)
             .toISOString()
diff --git a/dictation_server/src/features/accounts/test/accounts.service.mock.ts b/dictation_server/src/features/accounts/test/accounts.service.mock.ts
index 490cb05..9f964c4 100644
--- a/dictation_server/src/features/accounts/test/accounts.service.mock.ts
+++ b/dictation_server/src/features/accounts/test/accounts.service.mock.ts
@@ -16,10 +16,12 @@ import { AdB2cUser } from '../../../gateways/adb2c/types/types';
 import { LicensesRepositoryService } from '../../../repositories/licenses/licenses.repository.service';
 
 export type LicensesRepositoryMockValue = {
-  getLicenseOrderHistoryInfo: {
-    total: number;
-    orderHistories: LicenseOrder[];
-  } | Error;
+  getLicenseOrderHistoryInfo:
+    | {
+        total: number;
+        orderHistories: LicenseOrder[];
+      }
+    | Error;
 };
 export type UsersRepositoryMockValue = {
   findUserById: User | Error;
@@ -63,7 +65,7 @@ export const makeAccountsServiceMock = async (
   adB2cMockValue: AdB2cMockValue,
   configMockValue: ConfigMockValue,
   sendGridMockValue: SendGridMockValue,
-  licensesRepositoryMockValue: LicensesRepositoryMockValue
+  licensesRepositoryMockValue: LicensesRepositoryMockValue,
 ): Promise<AccountsService> => {
   const module: TestingModule = await Test.createTestingModule({
     providers: [AccountsService],
@@ -122,9 +124,10 @@ export const makeAccountsRepositoryMock = (
             .mockResolvedValue(createAccount),
   };
 };
-export const makeLicensesRepositoryMock = (value: LicensesRepositoryMockValue) => {
-  const { getLicenseOrderHistoryInfo } =
-    value;
+export const makeLicensesRepositoryMock = (
+  value: LicensesRepositoryMockValue,
+) => {
+  const { getLicenseOrderHistoryInfo } = value;
 
   return {
     findUserById:
@@ -384,19 +387,20 @@ export const makeDefaultSendGridlValue = (): SendGridMockValue => {
     },
   };
 };
-export const makeDefaultLicensesRepositoryMockValue = (): LicensesRepositoryMockValue => {
-  return {
-    getLicenseOrderHistoryInfo: {
-      total: 100,
-      orderHistories: [
-        {
-          orderDate: '2023/04/01',
-          issueDate: '2023/04/01',
-          numberOfOrder: 10,
-          poNumber: 'PO001',
-          status:'Issued'
-        },
-      ],
-    },
+export const makeDefaultLicensesRepositoryMockValue =
+  (): LicensesRepositoryMockValue => {
+    return {
+      getLicenseOrderHistoryInfo: {
+        total: 100,
+        orderHistories: [
+          {
+            orderDate: '2023/04/01',
+            issueDate: '2023/04/01',
+            numberOfOrder: 10,
+            poNumber: 'PO001',
+            status: 'Issued',
+          },
+        ],
+      },
+    };
   };
-};
\ No newline at end of file