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

MNG-06 fix: 댓글 알림 안오는 오류 수정 #221

Merged
merged 1 commit into from
Feb 3, 2024
Merged

MNG-06 fix: 댓글 알림 안오는 오류 수정 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/com/moing/backend/domain/alarm/application/SingleAlarmEventUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class SingleAlarmEventUseCase {
@Async
@EventListener
public void onSingleAlarmEvent(SingleFcmEvent event) {
if (event.getMember().isFirePush() && !event.getMember().isSignOut()) { //알림 on, 로그아웃 안함
if (event.isAlarmPush() && !event.getMember().isSignOut()) { //알림 on, 로그아웃 안함
singleMessageSender.send(new SingleRequest(event.getMember().getFcmToken(), event.getTitle(), event.getBody(), event.getMember().getMemberId(), event.getIdInfo(), event.getName(), event.getAlarmType(), event.getPath()));
}
saveSingleAlarmHistoryUseCase.saveAlarmHistory(event.getMember().getMemberId(), event.getIdInfo(), event.getTitle(), event.getBody(), event.getName(), event.getAlarmType(), event.getPath());
Expand Down
19 changes: 10 additions & 9 deletions ...va/com/moing/backend/domain/boardComment/application/service/SendCommentAlarmUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

import com.moing.backend.domain.board.domain.entity.Board;
import com.moing.backend.domain.boardComment.domain.entity.BoardComment;
import com.moing.backend.domain.history.application.dto.response.MemberIdAndToken;
import com.moing.backend.domain.history.application.dto.response.NewUploadInfo;
import com.moing.backend.domain.history.application.mapper.AlarmHistoryMapper;
import com.moing.backend.domain.history.domain.entity.AlarmType;
import com.moing.backend.domain.history.domain.entity.PagePath;
import com.moing.backend.domain.member.domain.entity.Member;
Expand All @@ -17,12 +14,10 @@
import org.springframework.stereotype.Service;

import javax.transaction.Transactional;
import java.util.List;
import java.util.Optional;

import static com.moing.backend.domain.history.domain.entity.PagePath.MISSION_PATH;
import java.util.Objects;

import static com.moing.backend.global.config.fcm.constant.NewCommentUploadMessage.NEW_COMMENT_UPLOAD_MESSAGE;
import static com.moing.backend.global.config.fcm.constant.NewNoticeUploadMessage.NEW_NOTICE_UPLOAD_MESSAGE;

@Service
@RequiredArgsConstructor
Expand All @@ -35,13 +30,15 @@ public void sendNewUploadAlarm(BaseBoardServiceResponse response, BoardComment c
Member member = response.getMember();
Team team = response.getTeam();
Board board = response.getBoard();
Member receiver = board.getTeamMember().getMember();

String title = NEW_COMMENT_UPLOAD_MESSAGE.title(comment.getContent());
String body = NEW_COMMENT_UPLOAD_MESSAGE.body(member.getNickName(),board.getTitle());

// 알림 보내기
eventPublisher.publishEvent(new SingleFcmEvent(board.getTeamMember().getMember(), title, body, createIdInfo(team.getTeamId(), board.getBoardId()), team.getName(), AlarmType.NEW_UPLOAD, PagePath.NOTICE_PATH.getValue()));

if(checkBoardWriter(receiver, member)){
eventPublisher.publishEvent(new SingleFcmEvent(receiver, title, body, createIdInfo(team.getTeamId(), board.getBoardId()), team.getName(), AlarmType.NEW_UPLOAD, PagePath.NOTICE_PATH.getValue(), receiver.isNewUploadPush()));
}
}

private String createIdInfo(Long teamId, Long boardId) {
Expand All @@ -50,4 +47,8 @@ private String createIdInfo(Long teamId, Long boardId) {
jo.put("boardId", boardId);
return jo.toJSONString();
}

private boolean checkBoardWriter(Member boardWriter, Member commentWriter){
return !Objects.equals(boardWriter.getMemberId(), commentWriter.getMemberId());
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/moing/backend/domain/fire/application/service/FireThrowAlarmUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void sendFireThrowAlarm(Member throwMember, Member receiveMember, Team te
String message = getMessage(throwMember.getNickName(), receiveMember.getNickName(), randomNum);
String idInfo = createIdInfo(mission.getType() == MissionType.REPEAT, mission.getTeam().getTeamId(), mission.getId());

eventPublisher.publishEvent(new SingleFcmEvent(receiveMember, title, message, idInfo, team.getName(), AlarmType.FIRE, MISSION_PATH.getValue()));
eventPublisher.publishEvent(new SingleFcmEvent(receiveMember, title, message, idInfo, team.getName(), AlarmType.FIRE, MISSION_PATH.getValue(), receiveMember.isFirePush()));
}

public String getMessage(String pusher, String receiver, int num) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/moing/backend/global/config/fcm/dto/event/SingleFcmEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ public class SingleFcmEvent {
private String name;
private AlarmType alarmType;
private String path;
private boolean isAlarmPush;

}
Loading