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();
}