From ed7b6ada3e33660c743ab6f5d40850b294cde282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8E=E1=85=A1=E1=86=AB=E1=84=8C?=
 =?UTF-8?q?=E1=85=B5=E1=86=AB?= <water0641@naver.com>
Date: Sat, 18 Jun 2022 15:14:46 +0900
Subject: [PATCH] =?UTF-8?q?:rocket:=20feat(alarm)=20:=20=EC=B1=84=ED=8C=85?=
 =?UTF-8?q?=EB=B0=A9=20=EB=82=B4=EB=B6=80=EB=93=A4=EC=96=B4=EA=B0=80?=
 =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=9D=BC?=
 =?UTF-8?q?=EC=8B=9C=EC=97=90=20=EC=B1=84=ED=8C=85=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EA=BA=BC=EC=A4=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/alarm/dto/userFcmInfo.dto.ts | 3 +++
 src/apis/alarm/pushAlarm.processor.ts | 3 +++
 src/models/user.model.ts              | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/src/apis/alarm/dto/userFcmInfo.dto.ts b/src/apis/alarm/dto/userFcmInfo.dto.ts
index fbec6f9..ef77736 100644
--- 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
index 7c80b16..d5bb4c9 100644
--- 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
index ee7695b..927cbfa 100644
--- 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;
 }