Merge pull request #67 from depromeet/dev

푸시알람 부분 완료 ( 레벨업 알람 푸시알림으로 변경)
depromeet · May 25, 2022 · 1af9030 · 1af9030
2 parents d8dec50 + e6d7cac
commit 1af9030
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 26 deletions.
diff --git a/src/apis/alarm/alarm.service.ts b/src/apis/alarm/alarm.service.ts
@@ -104,14 +104,23 @@ export class AlarmService {
   // 내 레벨이 올랐을 때 (기획 기달려야함)
 
   async handleLevelUpAlarm(receiver: UserIdDto, level: string) {
-    const saveAlarmDto: SaveAlarmDto = {
-      user: receiver.userId.toString(),
-      content: level,
-      alarmType: ALARM_STORE_TYPE.LIGHTNING_LEVELUP,
+    // const saveAlarmDto: SaveAlarmDto = {
+    //   user: receiver.userId.toString(),
+    //   content: level,
+    //   alarmType: ALARM_STORE_TYPE.LIGHTNING_LEVELUP,
+    // };
+    // await this.saveAlarmQueue.add(
+    //   ALARM_STORE_TYPE.LIGHTNING_LEVELUP,
+    //   saveAlarmDto,
+    // );
+
+    const sendPushAlarmObj: SendPushAlarmPubDto = {
+      receivers: [receiver.userId],
+      pushAlarmType: PUSH_ALARM_TYPE.LIGHTNING_LEVELUP,
     };
-    await this.saveAlarmQueue.add(
-      ALARM_STORE_TYPE.LIGHTNING_LEVELUP,
-      saveAlarmDto,
+    await this.pushAlarmQueue.add(
+      PUSH_ALARM_TYPE.LIGHTNING_LEVELUP,
+      sendPushAlarmObj,
     );
   }
 

diff --git a/src/apis/alarm/dto/alarmShow.dto.ts b/src/apis/alarm/dto/alarmShow.dto.ts
@@ -47,7 +47,6 @@ export class AlarmShowDto {
         return (
           DEEPLINK_BASEURL + 'question-detail?question_id=' + this.questionId
         );
-      case ALARM_STORE_TYPE.LIGHTNING_LEVELUP:
         return DEEPLINK_BASEURL + 'screen-type?mypage';
     }
   }
@@ -65,8 +64,6 @@ export class AlarmShowDto {
         return (
           this.nickname + '님이 댓글을 남겼어요 ' + '“' + this.content + '“'
         );
-      case ALARM_STORE_TYPE.LIGHTNING_LEVELUP:
-        return `${this.content}로 레벨업을 했어요 축하드려요!`;
       case ALARM_STORE_TYPE.OFFICIAL:
         return '서비스 공식알림';
     }
@@ -82,8 +79,6 @@ export class AlarmShowDto {
         return this.nickname;
       case ALARM_STORE_TYPE.COMMENT:
         return this.roomName;
-      case ALARM_STORE_TYPE.LIGHTNING_LEVELUP:
-        return `레벨 업 축하`;
       case ALARM_STORE_TYPE.OFFICIAL:
         return '티키타카 비밀 운영자';
     }

diff --git a/src/apis/alarm/dto/sendPushAlarm.sub.dto.ts b/src/apis/alarm/dto/sendPushAlarm.sub.dto.ts
@@ -7,10 +7,10 @@ export class SendPushAlarmSubDto {
   @Expose()
   roomName?: string;
   @Expose()
-  nickname: string;
+  nickname?: string;
 
   @Expose()
-  content: string;
+  content?: string;
 
   @Expose()
   pushAlarmType: PUSH_ALARM_TYPE;
@@ -45,6 +45,8 @@ export class SendPushAlarmSubDto {
         return (
           DEEPLINK_BASEURL + 'letter-room?letter-room_id=' + this.letterRoomId
         );
+      case PUSH_ALARM_TYPE.LIGHTNING_LEVELUP:
+        return DEEPLINK_BASEURL + 'screen-type?mypage';
     }
   }
 
@@ -57,12 +59,19 @@ export class SendPushAlarmSubDto {
         return '내 질문에 새로운 댓글이 달렸어요';
       case PUSH_ALARM_TYPE.LETTER:
         return '쪽지가 도착했어요';
+      case PUSH_ALARM_TYPE.LIGHTNING_LEVELUP:
+        return '등급이 업그레이드 되었어요!';
     }
   }
 
   @Expose()
   get body(): string {
-    return this.nickname + ' : ' + this.content;
+    switch (this.pushAlarmType) {
+      case PUSH_ALARM_TYPE.LIGHTNING_LEVELUP:
+        return '티키타카에서 새로 받은 아이템을 확인해보세요';
+      default:
+        return this.nickname + ' : ' + this.content;
+    }
   }
 
   @Expose()

diff --git a/src/apis/alarm/pushAlarm.processor.ts b/src/apis/alarm/pushAlarm.processor.ts
@@ -100,4 +100,11 @@ export class PushAlarmProcessor {
       console.log(result);
     }
   }
+
+  @Process(PUSH_ALARM_TYPE.LIGHTNING_LEVELUP)
+  async handleLightningLevelUpSaveAlarm(job: Job) {
+    // job.data
+    const sendPushAlarmDto = plainToInstance(SendPushAlarmSubDto, job.data);
+    await this.sendPushAlarm(sendPushAlarmDto);
+  }
 }
diff --git a/src/apis/alarm/saveAlarm.processor.ts b/src/apis/alarm/saveAlarm.processor.ts
@@ -31,14 +31,4 @@ export class SaveAlarmProcessor {
     console.log(saveAlarmDto, instanceToPlain(saveAlarmDto));
     await this.alarmRepository.createAlarm(saveAlarmDto);
   }
-
-  @Process(ALARM_STORE_TYPE.LIGHTNING_LEVELUP)
-  async handleLightningLevelUpSaveAlarm(job: Job) {
-    // job.data
-    console.log('processor Lightning ', job.data);
-
-    const saveAlarmDto = plainToInstance(SaveAlarmDto, job.data);
-    console.log(saveAlarmDto, instanceToPlain(saveAlarmDto));
-    await this.alarmRepository.createAlarm(saveAlarmDto);
-  }
 }
diff --git a/src/common/consts/enum.ts b/src/common/consts/enum.ts
@@ -137,6 +137,7 @@ enum PUSH_ALARM_TYPE {
   COMMENT = 'comment',
   LETTER = 'letter',
   CHAT = 'chat',
+  LIGHTNING_LEVELUP = 'lightningLevelUp',
 }
 
 // enum ALARM_TYPE {
@@ -153,7 +154,6 @@ enum ALARM_STORE_TYPE {
   COMMENT = 'comment',
   // 번개 줬을 떄
   LIGHTNING = 'lightning',
-  LIGHTNING_LEVELUP = 'lightningLevelUp',
 
   // 번개 라이트닝 레벨업?
   // LIGHTNING = 'lightning',