diff --git a/dictation_server/src/features/accounts/accounts.controller.ts b/dictation_server/src/features/accounts/accounts.controller.ts index c0300a0..a16086e 100644 --- a/dictation_server/src/features/accounts/accounts.controller.ts +++ b/dictation_server/src/features/accounts/accounts.controller.ts @@ -132,9 +132,6 @@ export class AccountsController { @Req() req: Request, @Body() body: GetLicenseSummaryRequest, ): Promise { - console.log(req.header('Authorization')); - console.log(body); - const response = await this.accountService.getLicenseSummary( body.accountId, ); @@ -170,8 +167,6 @@ export class AccountsController { @UseGuards(RoleGuard.requireds({ roles: [ADMIN_ROLES.ADMIN] })) @Get('me') async getMyAccount(@Req() req: Request): Promise { - console.log(req.header('Authorization')); - // アクセストークン取得 const accessToken = retrieveAuthorizationToken(req); const payload = jwt.decode(accessToken, { json: true }) as AccessToken; @@ -204,8 +199,6 @@ export class AccountsController { @UseGuards(AuthGuard) @Get('typists') async getTypists(@Req() req: Request): Promise { - console.log(req.header('Authorization')); - // アクセストークン取得 const accessToken = retrieveAuthorizationToken(req); const payload = jwt.decode(accessToken, { json: true }) as AccessToken; @@ -238,8 +231,6 @@ export class AccountsController { @UseGuards(AuthGuard) @Get('typist-groups') async getTypistGroups(@Req() req: Request): Promise { - console.log(req.header('Authorization')); - // アクセストークン取得 const accessToken = retrieveAuthorizationToken(req); const payload = jwt.decode(accessToken, { json: true }) as AccessToken; @@ -546,8 +537,6 @@ export class AccountsController { @Req() req: Request, @Body() body: IssueLicenseRequest, ): Promise { - console.log(req.header('Authorization')); - console.log(body); const { orderedAccountId, poNumber } = body; const token = retrieveAuthorizationToken(req); diff --git a/dictation_server/src/features/accounts/accounts.service.ts b/dictation_server/src/features/accounts/accounts.service.ts index 2f9caab..7f68bea 100644 --- a/dictation_server/src/features/accounts/accounts.service.ts +++ b/dictation_server/src/features/accounts/accounts.service.ts @@ -107,8 +107,8 @@ export class AccountsService { }; return licenseSummaryResponse; } catch (e) { - console.log(e); - console.log('get licenseSummary failed'); + this.logger.error(`error=${e}`); + this.logger.error('get licenseSummary failed'); throw new HttpException( makeErrorResponse('E009999'), HttpStatus.INTERNAL_SERVER_ERROR, diff --git a/dictation_server/src/features/auth/auth.controller.ts b/dictation_server/src/features/auth/auth.controller.ts index a3c1742..b0b2f3e 100644 --- a/dictation_server/src/features/auth/auth.controller.ts +++ b/dictation_server/src/features/auth/auth.controller.ts @@ -51,7 +51,6 @@ export class AuthController { operationId: 'token', }) async token(@Body() body: TokenRequest): Promise { - console.log(body); const idToken = await this.authService.getVerifiedIdToken(body.idToken); const isVerified = await this.authService.isVerifiedUser(idToken); diff --git a/dictation_server/src/features/licenses/licenses.controller.ts b/dictation_server/src/features/licenses/licenses.controller.ts index 534bc81..2d88908 100644 --- a/dictation_server/src/features/licenses/licenses.controller.ts +++ b/dictation_server/src/features/licenses/licenses.controller.ts @@ -73,10 +73,6 @@ export class LicensesController { @Req() req: Request, @Body() body: CreateOrdersRequest, ): Promise { - console.log(req.header('Authorization')); - console.log(body); - - // AuthGuardでチェック済みなのでここでのアクセストークンチェックはしない const accessToken = retrieveAuthorizationToken(req); const payload = jwt.decode(accessToken, { json: true }) as AccessToken; @@ -115,9 +111,6 @@ export class LicensesController { @Req() req: Request, @Body() body: IssueCardLicensesRequest, ): Promise { - console.log(req.header('Authorization')); - console.log(body); - const accessToken = retrieveAuthorizationToken(req); const payload = jwt.decode(accessToken, { json: true }) as AccessToken; @@ -161,9 +154,6 @@ export class LicensesController { @Req() req: Request, @Body() body: ActivateCardLicensesRequest, ): Promise { - console.log(req.header('Authorization')); - console.log(body); - const accessToken = retrieveAuthorizationToken(req); const payload = jwt.decode(accessToken, { json: true }) as AccessToken; diff --git a/dictation_server/src/features/tasks/tasks.controller.ts b/dictation_server/src/features/tasks/tasks.controller.ts index 057dece..b2c860e 100644 --- a/dictation_server/src/features/tasks/tasks.controller.ts +++ b/dictation_server/src/features/tasks/tasks.controller.ts @@ -137,9 +137,6 @@ export class TasksController { @Headers() headers, @Query() body: AudioNextRequest, ): Promise { - const { endedFileId } = body; - console.log(endedFileId); - return { nextFileId: 1234 }; } @@ -403,9 +400,6 @@ export class TasksController { @Headers() headers, @Param() params: ChangeStatusRequest, ): Promise { - const { audioFileId } = params; - console.log(audioFileId); - return {}; } @@ -445,9 +439,6 @@ export class TasksController { @Headers() headers, @Param() params: ChangeStatusRequest, ): Promise { - const { audioFileId } = params; - console.log(audioFileId); - return {}; } diff --git a/dictation_server/src/repositories/licenses/licenses.repository.service.ts b/dictation_server/src/repositories/licenses/licenses.repository.service.ts index 675aaf9..fff76eb 100644 --- a/dictation_server/src/repositories/licenses/licenses.repository.service.ts +++ b/dictation_server/src/repositories/licenses/licenses.repository.service.ts @@ -424,6 +424,7 @@ export class LicensesRepositoryService { ): Promise { const nowDate = new DateWithZeroTime(); const licenseRepo = this.dataSource.getRepository(License); + // EntityManagerではorderBy句で、expiry_dateに対して複数条件でソートを使用するため出来ない為、createQueryBuilderを使用する。 const queryBuilder = licenseRepo .createQueryBuilder('license') .where('license.account_id = :accountId', { accountId: myAccountId })