diff --git a/dictation_server/src/api/odms/openapi.json b/dictation_server/src/api/odms/openapi.json index d91cfc5..caf1c85 100644 --- a/dictation_server/src/api/odms/openapi.json +++ b/dictation_server/src/api/odms/openapi.json @@ -3792,7 +3792,7 @@ "properties": { "url": { "type": "string" } }, "required": ["url"] }, - "TemplateFile": { + "TemplateUploadFinishedRequest": { "type": "object", "properties": { "name": { @@ -3801,21 +3801,11 @@ }, "url": { "type": "string", - "description": "テンプレートファイルのURL" + "description": "テンプレートファイルのアップロード先URL" } }, "required": ["name", "url"] }, - "TemplateUploadFinishedRequest": { - "type": "object", - "properties": { - "templateFile": { - "description": "テンプレートファイルのファイル情報", - "allOf": [{ "$ref": "#/components/schemas/TemplateFile" }] - } - }, - "required": ["templateFile"] - }, "TemplateUploadFinishedReqponse": { "type": "object", "properties": {} }, "Assignee": { "type": "object", @@ -4023,6 +4013,17 @@ "required": ["poNumber"] }, "CancelOrderResponse": { "type": "object", "properties": {} }, + "TemplateFile": { + "type": "object", + "properties": { + "id": { "type": "number", "description": "テンプレートファイルのID" }, + "name": { + "type": "string", + "description": "テンプレートファイルのファイル名" + } + }, + "required": ["id", "name"] + }, "GetTemplatesResponse": { "type": "object", "properties": { diff --git a/dictation_server/src/features/files/files.controller.ts b/dictation_server/src/features/files/files.controller.ts index eb0d311..8a89dc4 100644 --- a/dictation_server/src/features/files/files.controller.ts +++ b/dictation_server/src/features/files/files.controller.ts @@ -331,13 +331,14 @@ export class FilesController { @Req() req: Request, @Body() body: TemplateUploadFinishedRequest, ): Promise { - const { templateFile } = body; + const { name, url } = body; const token = retrieveAuthorizationToken(req); const accessToken = jwt.decode(token, { json: true }) as AccessToken; const context = makeContext(accessToken.userId); console.log(context.trackingId); - console.log(templateFile); + console.log(name); + console.log(url); return {}; } diff --git a/dictation_server/src/features/files/types/types.ts b/dictation_server/src/features/files/types/types.ts index ed38f54..2de8a4a 100644 --- a/dictation_server/src/features/files/types/types.ts +++ b/dictation_server/src/features/files/types/types.ts @@ -1,5 +1,4 @@ import { ApiProperty } from '@nestjs/swagger'; -import { TemplateFile } from '../../templates/types/types'; export class AudioUploadLocationRequest {} @@ -95,8 +94,10 @@ export class AudioUploadFinishedResponse { } export class TemplateUploadFinishedRequest { - @ApiProperty({ description: 'テンプレートファイルのファイル情報' }) - templateFile: TemplateFile; + @ApiProperty({ description: 'テンプレートファイルのファイル名' }) + name: string; + @ApiProperty({ description: 'テンプレートファイルのアップロード先URL' }) + url: string; } export class TemplateUploadFinishedReqponse {} diff --git a/dictation_server/src/features/templates/types/types.ts b/dictation_server/src/features/templates/types/types.ts index a331ad8..243298d 100644 --- a/dictation_server/src/features/templates/types/types.ts +++ b/dictation_server/src/features/templates/types/types.ts @@ -1,10 +1,10 @@ import { ApiProperty } from '@nestjs/swagger'; export class TemplateFile { + @ApiProperty({ description: 'テンプレートファイルのID' }) + id: number; @ApiProperty({ description: 'テンプレートファイルのファイル名' }) name: string; - @ApiProperty({ description: 'テンプレートファイルのURL' }) - url: string; } export class GetTemplatesResponse {