From e279957392a5e4acda6774b704e0647781138965 Mon Sep 17 00:00:00 2001 From: Kentaro Fukunaga Date: Mon, 7 Aug 2023 00:51:07 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20307:=20=E9=9F=B3=E5=A3=B0?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=ABZIP=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92=E3=82=B3=E3=83=B3=E3=83=86=E3=83=8A?= =?UTF-8?q?=E9=85=8D=E4=B8=8B=E3=81=AB=E5=B9=B3=E7=BD=AE=E3=81=8D=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task2346: 音声ファイルZIPファイルをコンテナ配下に平置きするよう修正する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2346) - 音声ファイルZIPのアップロード/ダウンロードを、コンテナ直下で操作するよう修正しました - Typistによる中間生成物アップロード対応のため - ツール側も修正しました。（詳細は補足参照） - タスク一覧に表示するファイル名から.zipを抜きました（顧客要望） ## レビューポイント - 対応に抜け漏れ無いか ## 動作確認状況 - ローカルでアップロード/ダウンロードできることを確認しました - タスク一覧も確認しました ## 補足 - ツール側の修正もあります。 - DL時にファイル名を抜き出しているところがありますが、そこを本修正に合わせて修正してます。 https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/_git/OMDSDictation/pullrequest/25?_a=overview --- dictation_client/src/pages/DictationPage/index.tsx | 4 +++- .../src/features/accounts/accounts.controller.ts | 4 +--- dictation_server/src/features/files/files.service.ts | 6 +----- .../src/gateways/blobstorage/blobstorage.service.ts | 11 ++++++----- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dictation_client/src/pages/DictationPage/index.tsx b/dictation_client/src/pages/DictationPage/index.tsx index 021d9fb..27173a5 100644 --- a/dictation_client/src/pages/DictationPage/index.tsx +++ b/dictation_client/src/pages/DictationPage/index.tsx @@ -1098,7 +1098,9 @@ const DictationPage: React.FC = (): JSX.Element => { {x.workType} )} {displayColumn.FileName && ( - {x.fileName} + + {x.fileName.replace(".zip", "")} + )} {displayColumn.FileLength && ( {x.audioDuration} diff --git a/dictation_server/src/features/accounts/accounts.controller.ts b/dictation_server/src/features/accounts/accounts.controller.ts index e2a6ba3..8c0fe98 100644 --- a/dictation_server/src/features/accounts/accounts.controller.ts +++ b/dictation_server/src/features/accounts/accounts.controller.ts @@ -114,9 +114,7 @@ export class AccountsController { }) @ApiBearerAuth() @UseGuards(AuthGuard) - @UseGuards( - RoleGuard.requireds({ roles: [ADMIN_ROLES.ADMIN] }), - ) + @UseGuards(RoleGuard.requireds({ roles: [ADMIN_ROLES.ADMIN] })) @Post('licenses/summary') async getLicenseSummary( @Req() req: Request, diff --git a/dictation_server/src/features/files/files.service.ts b/dictation_server/src/features/files/files.service.ts index 0b16cf2..db35646 100644 --- a/dictation_server/src/features/files/files.service.ts +++ b/dictation_server/src/features/files/files.service.ts @@ -213,13 +213,11 @@ export class FilesService { //DBから国情報とアカウントIDを取得する let accountId: number; let country: string; - let userId: number; try { const user = await this.usersRepository.findUserByExternalId( token.userId, ); accountId = user.account.id; - userId = user.id; country = user.account.country; } catch (e) { this.logger.error(`error=${e}`); @@ -259,7 +257,6 @@ export class FilesService { const url = await this.blobStorageService.publishUploadSas( context, accountId, - userId, country, ); return url; @@ -301,7 +298,6 @@ export class FilesService { const user = await this.usersRepository.findUserByExternalId(externalId); accountId = user.account.id; userId = user.id; - userId = user.id; country = user.account.country; isTypist = user.role === USER_ROLES.TYPIST; authorId = user.author_id; @@ -351,7 +347,7 @@ export class FilesService { ); } - const filePath = `${file.owner_user_id}/${file.file_name}`; + const filePath = `${file.file_name}`; const isFileExist = await this.blobStorageService.fileExists( context, diff --git a/dictation_server/src/gateways/blobstorage/blobstorage.service.ts b/dictation_server/src/gateways/blobstorage/blobstorage.service.ts index 3f41678..f5deda4 100644 --- a/dictation_server/src/gateways/blobstorage/blobstorage.service.ts +++ b/dictation_server/src/gateways/blobstorage/blobstorage.service.ts @@ -124,14 +124,12 @@ export class BlobstorageService { /** * SASトークン付きのBlobStorageアップロードURLを生成し返却します * @param accountId - * @param userId * @param country * @returns upload sas */ async publishUploadSas( context: Context, accountId: number, - userId: number, country: string, ): Promise { this.logger.log( @@ -175,11 +173,12 @@ export class BlobstorageService { ); const url = new URL(containerClient.url); - url.pathname += `/${userId}`; url.search = `${sasToken}`; this.logger.log( - `[OUT] [${context.trackingId}] ${this.publishUploadSas.name}`, + `[OUT] [${context.trackingId}] ${ + this.publishUploadSas.name + } url=${url.toString()}`, ); return url.toString(); } @@ -246,7 +245,9 @@ export class BlobstorageService { url.search = `${sasToken}`; this.logger.log( - `[OUT] [${context.trackingId}] ${this.publishDownloadSas.name}`, + `[OUT] [${context.trackingId}] ${ + this.publishDownloadSas.name + }, url=${url.toString()}`, ); return url.toString(); }