From 33d4ab3d2fd6e512a299317b8def65e0b24a4cbc Mon Sep 17 00:00:00 2001 From: "makabe.t" Date: Thu, 11 Apr 2024 04:29:16 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20863:=20=EF=BC=88Sprint31=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=EF=BC=89=E4=B8=80=E9=83=A8=E3=81=AEentity=E3=81=A7MyS?= =?UTF-8?q?QL=E4=B8=8A=E3=81=AE=E5=9E=8B=E3=81=8Cbigint=E3=81=AE=E3=82=82?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6bigintTransformer?= =?UTF-8?q?=E3=81=A7=E5=A4=89=E6=8F=9B=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=8C=E5=85=A5=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task3928: （Sprint31対応）一部のentityでMySQL上の型がbigintのものに対してbigintTransformerで変換する処理が入っていない](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3928) - 現在、bigint型で変換を適用していない部分へのTransformerの適用はうまくいかないため保留。 - 既存処理については問題ありません - Functionのテストで日付に依存している箇所があったので修正しています。 ## レビューポイント - 共有 ## UIの変更 - なし ## クエリの変更 - なし ## 動作確認状況 - ローカルで確認 - 行った修正がデグレを発生させていないことを確認できるか - テストの修正のみ --- .../src/test/analysisLicenses.spec.ts | 132 +++++++++--------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/dictation_function/src/test/analysisLicenses.spec.ts b/dictation_function/src/test/analysisLicenses.spec.ts index 75e694c..56e2bea 100644 --- a/dictation_function/src/test/analysisLicenses.spec.ts +++ b/dictation_function/src/test/analysisLicenses.spec.ts @@ -2604,137 +2604,137 @@ describe("analysisLicenses", () => { expect(csvContentUS).toBe( '"アカウント","対象年月","カテゴリー1","カテゴリー2","ライセンス種別","役割","数量"' + "\r\n" + - '"test inc.","202402","有効ライセンス数","所有ライセンス数","Trial","","9"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","所有ライセンス数","Trial","","9"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","所有ライセンス数","Standard","","9"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","所有ライセンス数","Standard","","9"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","所有ライセンス数","Card","","7"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","所有ライセンス数","Card","","7"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Trial","Author","1"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Trial","Author","1"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Trial","Typist","2"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Trial","Typist","2"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Trial","None","3"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Trial","None","3"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Standard","Author","4"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Standard","Author","4"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Standard","Typist","1"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Standard","Typist","1"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Standard","None","2"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Standard","None","2"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Card","Author","2"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Card","Author","2"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Card","Typist","3"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Card","Typist","3"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","使用中ライセンス数","Card","None","1"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Card","None","1"` + "\r\n" + - '"test inc.","202402","新規発行ライセンス数","","Trial","","3"' + + `"test inc.","${lastMonthYYYYMM}","新規発行ライセンス数","","Trial","","3"` + "\r\n" + - '"test inc.","202402","新規発行ライセンス数","","Standard","","2"' + + `"test inc.","${lastMonthYYYYMM}","新規発行ライセンス数","","Standard","","2"` + "\r\n" + - '"test inc.","202402","新規発行ライセンス数","","Card","","1"' + + `"test inc.","${lastMonthYYYYMM}","新規発行ライセンス数","","Card","","1"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Trial","Author","5"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Trial","Author","5"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Trial","Typist","3"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Trial","Typist","3"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Trial","None","2"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Trial","None","2"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Trial","Unallocated","1"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Trial","Unallocated","1"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Standard","Author","2"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Standard","Author","2"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Standard","Typist","1"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Standard","Typist","1"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Standard","None","2"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Standard","None","2"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Standard","Unallocated","2"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Standard","Unallocated","2"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Card","Author","1"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Card","Author","1"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Card","Typist","2"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Card","Typist","2"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Card","None","3"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Card","None","3"` + "\r\n" + - '"test inc.","202402","失効ライセンス数","","Card","Unallocated","5"' + + `"test inc.","${lastMonthYYYYMM}","失効ライセンス数","","Card","Unallocated","5"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","","トライアルから切り替え","Author","1"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","","トライアルから切り替え","Author","1"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","","トライアルから切り替え","Typist","2"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","","トライアルから切り替え","Typist","2"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","","トライアルから切り替え","None","1"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","","トライアルから切り替え","None","1"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","","カードから切り替え","Author","1"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","","カードから切り替え","Author","1"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","","カードから切り替え","Typist","2"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","","カードから切り替え","Typist","2"` + "\r\n" + - '"test inc.","202402","有効ライセンス数","","カードから切り替え","None","3"' + + `"test inc.","${lastMonthYYYYMM}","有効ライセンス数","","カードから切り替え","None","3"` + "\r\n" + - '"1","202402","有効ライセンス数","所有ライセンス数","Trial","","9"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","所有ライセンス数","Trial","","9"` + "\r\n" + - '"1","202402","有効ライセンス数","所有ライセンス数","Standard","","9"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","所有ライセンス数","Standard","","9"` + "\r\n" + - '"1","202402","有効ライセンス数","所有ライセンス数","Card","","7"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","所有ライセンス数","Card","","7"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Trial","Author","1"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Trial","Author","1"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Trial","Typist","2"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Trial","Typist","2"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Trial","None","3"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Trial","None","3"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Standard","Author","4"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Standard","Author","4"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Standard","Typist","1"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Standard","Typist","1"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Standard","None","2"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Standard","None","2"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Card","Author","2"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Card","Author","2"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Card","Typist","3"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Card","Typist","3"` + "\r\n" + - '"1","202402","有効ライセンス数","使用中ライセンス数","Card","None","1"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","使用中ライセンス数","Card","None","1"` + "\r\n" + - '"1","202402","新規発行ライセンス数","","Trial","","3"' + + `"1","${lastMonthYYYYMM}","新規発行ライセンス数","","Trial","","3"` + "\r\n" + - '"1","202402","新規発行ライセンス数","","Standard","","2"' + + `"1","${lastMonthYYYYMM}","新規発行ライセンス数","","Standard","","2"` + "\r\n" + - '"1","202402","新規発行ライセンス数","","Card","","1"' + + `"1","${lastMonthYYYYMM}","新規発行ライセンス数","","Card","","1"` + "\r\n" + - '"1","202402","失効ライセンス数","","Trial","Author","5"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Trial","Author","5"` + "\r\n" + - '"1","202402","失効ライセンス数","","Trial","Typist","3"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Trial","Typist","3"` + "\r\n" + - '"1","202402","失効ライセンス数","","Trial","None","2"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Trial","None","2"` + "\r\n" + - '"1","202402","失効ライセンス数","","Trial","Unallocated","1"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Trial","Unallocated","1"` + "\r\n" + - '"1","202402","失効ライセンス数","","Standard","Author","2"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Standard","Author","2"` + "\r\n" + - '"1","202402","失効ライセンス数","","Standard","Typist","1"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Standard","Typist","1"` + "\r\n" + - '"1","202402","失効ライセンス数","","Standard","None","2"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Standard","None","2"` + "\r\n" + - '"1","202402","失効ライセンス数","","Standard","Unallocated","2"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Standard","Unallocated","2"` + "\r\n" + - '"1","202402","失効ライセンス数","","Card","Author","1"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Card","Author","1"` + "\r\n" + - '"1","202402","失効ライセンス数","","Card","Typist","2"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Card","Typist","2"` + "\r\n" + - '"1","202402","失効ライセンス数","","Card","None","3"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Card","None","3"` + "\r\n" + - '"1","202402","失効ライセンス数","","Card","Unallocated","5"' + + `"1","${lastMonthYYYYMM}","失効ライセンス数","","Card","Unallocated","5"` + "\r\n" + - '"1","202402","有効ライセンス数","","トライアルから切り替え","Author","1"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","","トライアルから切り替え","Author","1"` + "\r\n" + - '"1","202402","有効ライセンス数","","トライアルから切り替え","Typist","2"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","","トライアルから切り替え","Typist","2"` + "\r\n" + - '"1","202402","有効ライセンス数","","トライアルから切り替え","None","1"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","","トライアルから切り替え","None","1"` + "\r\n" + - '"1","202402","有効ライセンス数","","カードから切り替え","Author","1"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","","カードから切り替え","Author","1"` + "\r\n" + - '"1","202402","有効ライセンス数","","カードから切り替え","Typist","2"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","","カードから切り替え","Typist","2"` + "\r\n" + - '"1","202402","有効ライセンス数","","カードから切り替え","None","3"' + + `"1","${lastMonthYYYYMM}","有効ライセンス数","","カードから切り替え","None","3"` + "\r\n" ); });