Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refact : 알림 서버 사용하지 않는 클래스, 의존 제거 #617 #619

Merged
merged 16 commits into from
Aug 11, 2024
Merged

refact : 알림 서버 사용하지 않는 클래스, 의존 제거 #617 #619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c1e2b7d
fix : 쓸모 없는 의존성 및 클래스 제거
seokho-1116 Aug 8, 2024
51146f1
feat : aop를 이용한 로깅 추가
seokho-1116 Aug 8, 2024
d7bfbcf
fix : 캡슐 스킨 생성 시 fcm 토큰 오류 수정
seokho-1116 Aug 9, 2024
57a0b88
fix : 알림 전송 시 검증 조건 변경
seokho-1116 Aug 9, 2024
4aca479
fix : 큐, 익스체인지 이름 변경
seokho-1116 Aug 10, 2024
264392b
fix : rabbitmq 큐 설정 변경
seokho-1116 Aug 10, 2024
01bb253
fix : rabbitmq 데드레터 설정
seokho-1116 Aug 10, 2024
52e1c90
fix : bulk send 검증 조건 수정
seokho-1116 Aug 10, 2024
a946e99
fix : 패키지 분리
seokho-1116 Aug 10, 2024
f197c04
feat : error handler 추가
seokho-1116 Aug 10, 2024
f38d8fb
fix : 사용하지 않는 함수 삭제
seokho-1116 Aug 10, 2024
bebe4c9
feat : after 로깅 추가
seokho-1116 Aug 10, 2024
2a0b9dc
fix : 에러 로깅 추가
seokho-1116 Aug 10, 2024
4fb58cb
Merge pull request #624 from tukcomCD2024/fix/capsule_skin_noti-notif…
seokho-1116 Aug 11, 2024
e2365d2
fix : 패키지명 수정
seokho-1116 Aug 11, 2024
0deeb62
Merge pull request #620 from tukcomCD2024/feat/setup_logging-B-#618
seokho-1116 Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions ...site/timecapsulearchive/notification/data/request/CapsuleSkinNotificationSendRequest.java
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...ain/java/site/timecapsulearchive/notification/data/request/FriendNotificationRequest.java
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...cation/src/main/java/site/timecapsulearchive/notification/global/error/ErrorResponse.java
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions ...c/main/java/site/timecapsulearchive/notification/global/error/GlobalExceptionHandler.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...otification/infra/fcm/FcmMessageData.java → ...otification/infra/fcm/FCMMessageData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package site.timecapsulearchive.notification.infra.fcm;

public enum FcmMessageData {
public enum FCMMessageData {
TOPIC("topic"),
STATUS("status"),

Expand All @@ -11,7 +11,7 @@ public enum FcmMessageData {

private final String data;

FcmMessageData(String data) {
FCMMessageData(String data) {
this.data = data;
}

Expand Down
14 changes: 6 additions & 8 deletions ...site/timecapsulearchive/notification/infra/fcm/capsuleskin/CapsuleSkinFcmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
import site.timecapsulearchive.notification.data.dto.CapsuleSkinNotificationSendDto;
import site.timecapsulearchive.notification.entity.CategoryName;
import site.timecapsulearchive.notification.infra.exception.MessageNotSendAbleException;
import site.timecapsulearchive.notification.infra.fcm.FCMManager;
import site.timecapsulearchive.notification.infra.fcm.FcmMessageData;
import site.timecapsulearchive.notification.infra.fcm.FCMMessageData;
import site.timecapsulearchive.notification.infra.s3.S3PreSignedUrlManager;

@Component
@RequiredArgsConstructor
public class CapsuleSkinFcmManagerImpl implements CapsuleSkinFcmManager {

private final FCMManager fcmManager;
private final S3PreSignedUrlManager s3PreSignedUrlManager;

public void sendCapsuleSkinNotification(
Expand All @@ -28,12 +26,12 @@ public void sendCapsuleSkinNotification(
FirebaseMessaging.getInstance()
.send(
Message.builder()
.putData(FcmMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FcmMessageData.STATUS.getData(), String.valueOf(dto.status()))
.putData(FcmMessageData.TITLE.getData(), dto.title())
.putData(FcmMessageData.TEXT.getData(), dto.text())
.putData(FCMMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FCMMessageData.STATUS.getData(), String.valueOf(dto.status()))
.putData(FCMMessageData.TITLE.getData(), dto.title())
.putData(FCMMessageData.TEXT.getData(), dto.text())
.setToken(fcmToken)
.putData(FcmMessageData.IMAGE.getData(),
.putData(FCMMessageData.IMAGE.getData(),
s3PreSignedUrlManager.createS3PreSignedUrlForGet(dto.skinUrl()))
.build()
);
Expand Down
21 changes: 9 additions & 12 deletions ...main/java/site/timecapsulearchive/notification/infra/fcm/friend/FriendFcmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@
import site.timecapsulearchive.notification.data.dto.FriendNotificationsDto;
import site.timecapsulearchive.notification.entity.CategoryName;
import site.timecapsulearchive.notification.infra.exception.MessageNotSendAbleException;
import site.timecapsulearchive.notification.infra.fcm.FCMManager;
import site.timecapsulearchive.notification.infra.fcm.FcmMessageData;
import site.timecapsulearchive.notification.infra.fcm.FCMMessageData;

@Component
@RequiredArgsConstructor
public class FriendFcmManagerImpl implements FriendFcmManager {

private final FCMManager fcmManager;

public void sendFriendNotification(
final FriendNotificationDto dto,
final CategoryName categoryName,
Expand All @@ -29,11 +26,11 @@ public void sendFriendNotification(
FirebaseMessaging.getInstance()
.send(
Message.builder()
.putData(FcmMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FcmMessageData.STATUS.getData(),
.putData(FCMMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FCMMessageData.STATUS.getData(),
String.valueOf(dto.notificationStatus()))
.putData(FcmMessageData.TITLE.getData(), dto.title())
.putData(FcmMessageData.TEXT.getData(), dto.text())
.putData(FCMMessageData.TITLE.getData(), dto.title())
.putData(FCMMessageData.TEXT.getData(), dto.text())
.setToken(fcmToken)
.build()
);
Expand All @@ -52,11 +49,11 @@ public void sendFriendNotifications(
.sendEachForMulticast(
MulticastMessage.builder()
.addAllTokens(fcmTokens)
.putData(FcmMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FcmMessageData.STATUS.getData(),
.putData(FCMMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FCMMessageData.STATUS.getData(),
String.valueOf(dto.notificationStatus()))
.putData(FcmMessageData.TITLE.getData(), dto.title())
.putData(FcmMessageData.TEXT.getData(), dto.text())
.putData(FCMMessageData.TITLE.getData(), dto.title())
.putData(FCMMessageData.TEXT.getData(), dto.text())
.build()
);
} catch (FirebaseMessagingException exception) {
Expand Down
22 changes: 10 additions & 12 deletions ...c/main/java/site/timecapsulearchive/notification/infra/fcm/group/GroupFcmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
import site.timecapsulearchive.notification.data.dto.GroupInviteNotificationDto;
import site.timecapsulearchive.notification.entity.CategoryName;
import site.timecapsulearchive.notification.infra.exception.MessageNotSendAbleException;
import site.timecapsulearchive.notification.infra.fcm.FCMManager;
import site.timecapsulearchive.notification.infra.fcm.FcmMessageData;
import site.timecapsulearchive.notification.infra.fcm.FCMMessageData;
import site.timecapsulearchive.notification.infra.s3.S3PreSignedUrlManager;

@Component
@RequiredArgsConstructor
public class GroupFcmManagerImpl implements GroupFcmManager {

private final FCMManager fcmManager;
private final S3PreSignedUrlManager s3PreSignedUrlManager;

public void sendGroupInviteNotifications(
Expand All @@ -32,12 +30,12 @@ public void sendGroupInviteNotifications(
.sendEachForMulticast(
MulticastMessage.builder()
.addAllTokens(fcmTokens)
.putData(FcmMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FcmMessageData.STATUS.getData(),
.putData(FCMMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FCMMessageData.STATUS.getData(),
String.valueOf(dto.notificationStatus()))
.putData(FcmMessageData.TITLE.getData(), dto.title())
.putData(FcmMessageData.TEXT.getData(), dto.text())
.putData(FcmMessageData.IMAGE.getData(),
.putData(FCMMessageData.TITLE.getData(), dto.title())
.putData(FCMMessageData.TEXT.getData(), dto.text())
.putData(FCMMessageData.IMAGE.getData(),
s3PreSignedUrlManager.createS3PreSignedUrlForGet(dto.groupProfileUrl()))
.build()
);
Expand All @@ -55,11 +53,11 @@ public void sendGroupAcceptNotification(
FirebaseMessaging.getInstance()
.send(
Message.builder()
.putData(FcmMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FcmMessageData.STATUS.getData(),
.putData(FCMMessageData.TOPIC.getData(), String.valueOf(categoryName))
.putData(FCMMessageData.STATUS.getData(),
String.valueOf(dto.notificationStatus()))
.putData(FcmMessageData.TITLE.getData(), dto.title())
.putData(FcmMessageData.TEXT.getData(), dto.text())
.putData(FCMMessageData.TITLE.getData(), dto.title())
.putData(FCMMessageData.TEXT.getData(), dto.text())
.setToken(fcmToken)
.build()
);
Expand Down
Loading