diff --git a/backend/src/main/java/corea/alarm/service/AlarmService.java b/backend/src/main/java/corea/alarm/service/AlarmService.java index 5a136c49..ea085f03 100644 --- a/backend/src/main/java/corea/alarm/service/AlarmService.java +++ b/backend/src/main/java/corea/alarm/service/AlarmService.java @@ -109,10 +109,7 @@ public AlarmResponses getAlarm(long userId) { AlarmsByActionType userAlarms = userToUserAlarmReader.findAllByReceiver(member); AlarmsByActionType serverAlarms = serverToUserAlarmReader.findAllByReceiver(member); - List allAlarms = Stream.concat( - userAlarms.getList().stream(), - serverAlarms.getList().stream() - ).toList(); + List allAlarms = mergeAlarms(userAlarms, serverAlarms); Map actors = memberReader.findMembersMappedById(userAlarms.getActorIds()); Map userAlarmRooms = roomReader.findRoomsMappedById(userAlarms.getRoomIds()); @@ -120,4 +117,11 @@ public AlarmResponses getAlarm(long userId) { return AlarmResponses.of(allAlarms, actors, userAlarmRooms, serverAlarmRooms); } + + private List mergeAlarms(AlarmsByActionType userAlarms, AlarmsByActionType serverAlarms) { + return Stream.concat( + userAlarms.getList().stream(), + serverAlarms.getList().stream() + ).toList(); + } }