Merge pull request #96 from depromeet/dev

채팅방 내부시에 채팅알림 끔
depromeet · Jun 18, 2022 · 43f8045 · 43f8045
2 parents 1f8fe89 + 949a98f
commit 43f8045
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/apis/alarm/dto/userFcmInfo.dto.ts b/src/apis/alarm/dto/userFcmInfo.dto.ts
@@ -8,6 +8,7 @@ export const userFcmInfoSelect = {
   FCMToken: 1,
   appAlarm: 1,
   chatAlarm: 1,
+  iJoin: 1,
 };
 export class UserFcmInfoDto {
   //   @Transform(({ value }) => new Types.ObjectId(value), { toClassOnly: true })
@@ -20,4 +21,6 @@ export class UserFcmInfoDto {
 
   @Expose()
   chatAlarm: boolean;
+  @Expose()
+  isJoin: boolean;
 }
diff --git a/src/apis/alarm/pushAlarm.processor.ts b/src/apis/alarm/pushAlarm.processor.ts
@@ -43,6 +43,7 @@ export class PushAlarmProcessor {
       console.log(result);
     }
   }
+
   @OnQueueFailed()
   errorhandler(job: Job, err: Error) {
     console.log(err);
@@ -95,8 +96,10 @@ export class PushAlarmProcessor {
         const checkPushReciverIsSender = !e._id.equals(chatAlarmSubDto.sender);
         const checkAppAlarmOn = e.appAlarm;
         const checkChatAlarmOn = e.chatAlarm;
+        const checkRoomJoin = !e.isJoin;
         const checkFCMTokenValid = e.FCMToken.length === 0 ? false : true;
         return (
+          checkRoomJoin &&
           checkPushReciverIsSender &&
           checkChatAlarmOn &&
           checkAppAlarmOn &&

diff --git a/src/models/user.model.ts b/src/models/user.model.ts
@@ -201,6 +201,13 @@ export class User {
   @Expose()
   level: number;
 
+  @Prop({
+    type: Boolean,
+    default: false,
+  })
+  @Expose()
+  isJoin: boolean;
+
   lastChat: Types.ObjectId | null;
 }