From 66e79eb10a07b81ce042d748242d1df5d9e0c58c 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?= Date: Tue, 5 Jul 2022 02:17:16 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:rocket:=20feat(readme)=20:=20=EC=95=B1=20?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 18f71c0..a2d2409 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![github_img2](https://user-images.githubusercontent.com/13329304/176240116-90cccb5f-e0b4-4437-94d2-523e6ac2150b.png)
한강공원에 사람이 얼마나 있을까? 대학교 앞 카페에 공부할 자리가 있으려나?
-👀
지금 이 순간 당신이 원하는 장소에 대해 정보를 공유하고 싶을 때 티키타카를 이용해보세요.
스팟 채팅방, 질의응답 그리고 쪽지를 통해 사람들과 감정을 교류할 수 있어요.
+👀지금 이 순간 당신이 원하는 장소에 대해 정보를 공유하고 싶을 때 티키타카를 이용해보세요.
스팟 채팅방, 질의응답 그리고 쪽지를 통해 사람들과 감정을 교류할 수 있어요.
![github_img3](https://user-images.githubusercontent.com/13329304/176240134-1b8045d9-b3b3-4175-b787-1909200fe4fd.png) @@ -38,6 +38,7 @@
⚡️ 같이 티키타카할 준비가 됐다면 망설이지 말고 놀러오세요:)⚡️

+
Download on the App Store
--- From a38a091614d7ff9d46aa13f7658993495fb03c9e 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?= Date: Sat, 9 Jul 2022 02:45:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:rocket:=20feat(alarm)=20:=20=EB=B2=88?= =?UTF-8?q?=EA=B0=9C=20=EB=B3=B4=EB=82=BC=EC=8B=9C=20=ED=8C=8C=EC=A7=80?= =?UTF-8?q?=EC=A7=81...=20=EC=95=8C=EB=A6=BC=20=EC=B6=94=EA=B0=80=20,=20?= =?UTF-8?q?=EB=94=A5=EB=A7=81=ED=81=AC=EB=8A=94=20=EB=85=BC=EC=9D=98=20?= =?UTF-8?q?=ED=95=84=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/alarm/alarm.service.ts | 7 +++++++ src/apis/alarm/dto/sendPushAlarm.sub.dto.ts | 7 +++++++ src/apis/alarm/pushAlarm.processor.ts | 7 +++++++ src/common/consts/enum.ts | 1 + 4 files changed, 22 insertions(+) diff --git a/src/apis/alarm/alarm.service.ts b/src/apis/alarm/alarm.service.ts index c39ec5c..70b76c2 100644 --- a/src/apis/alarm/alarm.service.ts +++ b/src/apis/alarm/alarm.service.ts @@ -103,7 +103,14 @@ export class AlarmService { user: receiver.userId.toString(), alarmType: ALARM_STORE_TYPE.LIGHTNING, }; + + const sendPushAlarmObj: SendPushAlarmPubDto = { + nickname: sender.nickname, + pushAlarmType: PUSH_ALARM_TYPE.LIGHTNING, + receivers: [receiver.userId], + }; await this.saveAlarmQueue.add(ALARM_STORE_TYPE.LIGHTNING, saveAlarmDto); + await this.pushAlarmQueue.add(PUSH_ALARM_TYPE.LIGHTNING, sendPushAlarmObj); } // 내 레벨이 올랐을 때 (기획 기달려야함) diff --git a/src/apis/alarm/dto/sendPushAlarm.sub.dto.ts b/src/apis/alarm/dto/sendPushAlarm.sub.dto.ts index 1a0faea..5ec46bb 100644 --- a/src/apis/alarm/dto/sendPushAlarm.sub.dto.ts +++ b/src/apis/alarm/dto/sendPushAlarm.sub.dto.ts @@ -53,6 +53,9 @@ export class SendPushAlarmSubDto { ); case PUSH_ALARM_TYPE.LIGHTNING_LEVELUP: return DEEPLINK_BASEURL + 'screen-type?mypage'; + case PUSH_ALARM_TYPE.LIGHTNING: + // 변경 요망 딥링크 관련 + return DEEPLINK_BASEURL + 'screen-type?mypage'; } } @@ -67,6 +70,8 @@ export class SendPushAlarmSubDto { return '쪽지가 도착했어요'; case PUSH_ALARM_TYPE.LIGHTNING_LEVELUP: return '등급이 업그레이드 되었어요!'; + case PUSH_ALARM_TYPE.LIGHTNING: + return '파지지직..⚡️'; } } @@ -75,6 +80,8 @@ export class SendPushAlarmSubDto { switch (this.pushAlarmType) { case PUSH_ALARM_TYPE.LIGHTNING_LEVELUP: return '티키타카에서 새로 받은 아이템을 확인해보세요'; + case PUSH_ALARM_TYPE.LIGHTNING: + return this.nickname + '님이 번개를 줬어요'; default: return this.nickname + ' : ' + this.content; } diff --git a/src/apis/alarm/pushAlarm.processor.ts b/src/apis/alarm/pushAlarm.processor.ts index 87a7d4d..f6022ad 100644 --- a/src/apis/alarm/pushAlarm.processor.ts +++ b/src/apis/alarm/pushAlarm.processor.ts @@ -154,4 +154,11 @@ export class PushAlarmProcessor { const sendPushAlarmDto = plainToInstance(SendPushAlarmSubDto, job.data); await this.sendPushAlarm(sendPushAlarmDto); } + + @Process(PUSH_ALARM_TYPE.LIGHTNING) + async handleLightningAlarm(job: Job) { + // job.data + const sendPushAlarmDto = plainToInstance(SendPushAlarmSubDto, job.data); + await this.sendPushAlarm(sendPushAlarmDto); + } } diff --git a/src/common/consts/enum.ts b/src/common/consts/enum.ts index 8b16ff9..a9185d1 100644 --- a/src/common/consts/enum.ts +++ b/src/common/consts/enum.ts @@ -133,6 +133,7 @@ enum PUSH_ALARM_TYPE { LETTER = 'letter', CHAT = 'chat', LIGHTNING_LEVELUP = 'lightningLevelUp', + LIGHTNING = 'lightning', } // enum ALARM_TYPE {