Merge branch 'develop' into dependabot/npm_and_yarn/aws-sdk/client-dynamodb-3.687.0

Author: 24-105

eslint.config.mjs

@@ -33,6 +33,7 @@ export default [
       '@typescript-eslint/explicit-function-return-type': 'error',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/no-explicit-any': 'off',
+      'no-return-await': 'error',
     },
     ignores: ['.eslintrc.js', 'src/test/**/*.ts'],
   },

package-lock.json

@@ -44,7 +44,8 @@
     "node-jose": "^2.2.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
-    "typeorm": "^0.3.20"
+    "typeorm": "^0.3.20",
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",

package.json

@@ -3,7 +3,6 @@ import {
   IsNotEmpty,
   IsNumber,
   IsString,
-  Min,
 } from '@nestjs/class-validator';
 
 import {
@@ -96,7 +95,7 @@ export class QuakeHistoryComments {
 }
 
 // P2P地震情報 API quake history response Dto
-export class fetchP2pQuakeHistoryResponseDto {
+export class receiveP2pQuakeHistoryResponseDto {
   @IsNotEmpty()
   @IsString()
   id: string;
@@ -120,21 +119,3 @@ export class fetchP2pQuakeHistoryResponseDto {
   @IsNotEmpty()
   comments: QuakeHistoryComments;
 }
-
-// P2P地震情報 API quake history request Dto
-export class FetchP2pQuakeHistoryRequestDto {
-  @IsNotEmpty()
-  @IsNumber()
-  @Min(0)
-  codes: number;
-
-  @IsNotEmpty()
-  @IsNumber()
-  @Min(1)
-  limit: number;
-
-  @IsNotEmpty()
-  @IsNumber()
-  @Min(0)
-  offset: number;
-}

src/application/dto/quakeHistoryDto.ts

@@ -30,7 +30,7 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
     const adminPrivateKey = readKeyFile(FILE_PATH.ADMIN_PRIVATE_KEY_FILE_PATH);
 
     try {
-      const jwtList = await this.generateJwts(privateKey, adminPrivateKey);
+      const jwtList = this.generateJwts(privateKey, adminPrivateKey);
       await this.updateChannelAccessTokens(jwtList);
     } catch (err) {
       this.logger.error(
@@ -55,7 +55,7 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
       return channelAccessToken;
     }
 
-    return await this.refreshChannelAccessToken(channelIss);
+    return this.refreshChannelAccessToken(channelIss);
   }
 
   /**
@@ -64,9 +64,7 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
    * @returns channel access token
    */
   private async getChannelAccessToken(channelIss: string): Promise<string> {
-    return await this.channelAccessTokenRepository.getChannelAccessToken(
-      channelIss,
-    );
+    return this.channelAccessTokenRepository.getChannelAccessToken(channelIss);
   }
 
   /**
@@ -75,7 +73,7 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
    * @returns true if valid, false otherwise
    */
   private async verifyChannelAccessToken(token: string): Promise<boolean> {
-    return await this.channelAccessTokenApi.verifyChannelAccessToken(token);
+    return this.channelAccessTokenApi.verifyChannelAccessToken(token);
   }
 
   /**
@@ -84,7 +82,7 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
    */
   private async refreshChannelAccessToken(channelIss: string): Promise<string> {
     await this.processChannelAccessToken();
-    return await this.getChannelAccessToken(channelIss);
+    return this.getChannelAccessToken(channelIss);
   }
 
   /**
@@ -93,15 +91,15 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
    * @param adminPrivateKey Admin private key
    * @returns JWTs
    */
-  private async generateJwts(
+  private generateJwts(
     privateKey: string,
     adminPrivateKey: string,
-  ): Promise<{ jwt: string; iss: string }[]> {
+  ): { jwt: string; iss: string }[] {
     const jwtList = [];
 
     try {
       this.logger.log(LOG_MESSAGES.GENERATE_JWT);
-      const jwt = await generateJwt(
+      const jwt = generateJwt(
         privateKey,
         process.env.LINE_QUALE_QUICK_ALERT_KID,
         process.env.LINE_QUALE_QUICK_ALERT_ISS,
@@ -115,7 +113,7 @@ export class ChannelAccessTokenService implements IChannelAccessTokenService {
 
     try {
       this.logger.log(LOG_MESSAGES.GENERATE_ADMIN_JWT);
-      const jwt = await generateJwt(
+      const jwt = generateJwt(
         adminPrivateKey,
         process.env.LINE_QUALE_QUICK_ALERT_ADMIN_KID,
         process.env.LINE_QUALE_QUICK_ALERT_ADMIN_ISS,

src/application/jobs/quakeBatchJob.ts

@@ -16,7 +16,7 @@ export class EncryptionService implements IEncryptionService {
    * @param text text to encrypt
    * @returns encrypted text
    */
-  async encrypt(text: string): Promise<string> {
+  encrypt(text: string): string {
     return encrypt(text, this.key, this.iv);
   }
 
@@ -25,7 +25,7 @@ export class EncryptionService implements IEncryptionService {
    * @param text text to decrypt
    * @returns decrypted text
    */
-  async decrypt(text: string): Promise<string> {
+  decrypt(text: string): string {
     return decrypt(text, this.key);
   }
 }

src/application/services/channelAccessTokenService.ts

@@ -154,7 +154,7 @@ export class MessageEventService implements IMessageEventService {
       const correspondingMessage = createCorrespondingMessage(
         userProfile.displayName,
       );
-      const text = await createTextMessage(correspondingMessage);
+      const text = createTextMessage(correspondingMessage);
 
       await this.pushMessageService.pushMessage(channelAccessToken, userId, [
         text,

src/application/services/encryptionService.ts

@@ -28,10 +28,13 @@ export class PushMessageService implements IPushMessageService {
     this.logger.log(`${LOG_MESSAGES.PUSH_MESSAGE}: ${userId}`);
 
     try {
-      const pushMessageRequest = await createPushMessageRequest(userId, texts);
+      const pushMessageRequest = createPushMessageRequest(userId, texts);
       await this.messageApi.pushMessage(channelAccessToken, pushMessageRequest);
     } catch (err) {
-      this.logger.error(`${LOG_MESSAGES.PUSH_MESSAGE_FAILED}: ${userId}`);
+      this.logger.error(
+        `${LOG_MESSAGES.PUSH_MESSAGE_FAILED}: ${userId}`,
+        err.stack,
+      );
       throw err;
     }
   }