From 976271ab9267521f2f2c5324049156acbaae54d3 Mon Sep 17 00:00:00 2001 From: "makabe.t" Date: Tue, 31 Oct 2023 06:52:29 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20543:=20=E3=83=87=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=82=A4=E3=83=91=E3=82=A4=E3=83=97=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=B3yaml=E3=82=92=E4=BF=AE=E6=AD=A3&=E3=83=AA=E3=83=9D?= =?UTF-8?q?=E3=82=B8=E3=83=88=E3=83=AA=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task2995: デプロイパイプラインyamlを修正](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2995) - STGデプロイパイプラインの定義yamlについて以下の環境変数に0から具体的な値を設定しました。 - REFRESH_TOKEN_LIFETIME_WEB: 86400000 - REFRESH_TOKEN_LIFETIME_DEFAULT: 2592000000 - ACCESS_TOKEN_LIFETIME_WEB: 7200000 - ユーザーリポジトリの`findSameAccountUsers`についてentityManagerを使っていない箇所を使うように修正しました。 ## レビューポイント - 共有 ## UIの変更 - なし ## 動作確認状況 - ローカルで確認 --- azure-pipelines-staging.yml | 6 +++--- .../src/repositories/users/users.repository.service.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml index 9782b91..a0e46a5 100644 --- a/azure-pipelines-staging.yml +++ b/azure-pipelines-staging.yml @@ -80,9 +80,9 @@ jobs: TENANT_NAME: xxxxxxxxxxxx SIGNIN_FLOW_NAME: xxxxxxxxxxxx STORAGE_TOKEN_EXPIRE_TIME: 0 - REFRESH_TOKEN_LIFETIME_WEB: 0 - REFRESH_TOKEN_LIFETIME_DEFAULT: 0 - ACCESS_TOKEN_LIFETIME_WEB: 0 + REFRESH_TOKEN_LIFETIME_WEB: 86400000 + REFRESH_TOKEN_LIFETIME_DEFAULT: 2592000000 + ACCESS_TOKEN_LIFETIME_WEB: 7200000 REDIS_HOST: xxxxxxxxxxxx REDIS_PORT: 0 REDIS_PASSWORD: xxxxxxxxxxxx diff --git a/dictation_server/src/repositories/users/users.repository.service.ts b/dictation_server/src/repositories/users/users.repository.service.ts index 8a43aad..2b5324b 100644 --- a/dictation_server/src/repositories/users/users.repository.service.ts +++ b/dictation_server/src/repositories/users/users.repository.service.ts @@ -349,7 +349,7 @@ export class UsersRepositoryService { throw new AccountNotFoundError('Account is Not Found.'); } - const dbUsers = await this.dataSource.getRepository(User).find({ + const dbUsers = await repo.find({ relations: { userGroupMembers: { userGroup: true,