Merge branch 'develop' of https://github.com/woowacourse-teams/2024-c…

…orea into feat/#773
woowacourse-teams · Nov 21, 2024 · 170d167 · 170d167
2 parents 08a8ffe + bdd82ac
commit 170d167
Show file tree

Hide file tree

Showing 52 changed files with 1,062 additions and 345 deletions.
diff --git a/backend/src/main/java/corea/ContextInitializer.java b/backend/src/main/java/corea/ContextInitializer.java
@@ -409,8 +409,8 @@ private void matchingAndReviewComplete(List<Participation> participations, Room
     }
 
     private void reviewSocialAndDevelopFeedback(MatchResult matchResult) {
-        socialFeedbackRepository.save(new SocialFeedback(matchResult.getRoomId(), matchResult.getReviewee(), matchResult.getReviewer(), 5, List.of(KIND, GOOD_AT_EXPLAINING), "너무 맘에 드는 말투이고, 설명이 친절했어요! 기회가 된다면 한번 더 리뷰 받고 싶어요~"));
-        developFeedbackRepository.save(new DevelopFeedback(matchResult.getRoomId(), matchResult.getReviewer(), matchResult.getReviewee(), 5, List.of(EASY_TO_UNDERSTAND_THE_CODE, MAKE_CODE_FOR_THE_PURPOSE), "코드를 이해하기 쉬워 리뷰하기 편했어요!~", 3));
+        socialFeedbackRepository.save(new SocialFeedback(matchResult.getRoomId(), matchResult.getReviewee(), matchResult.getReviewer(), 5, List.of(POSITIVE_SOCIAL_FEEDBACK_1, POSITIVE_SOCIAL_FEEDBACK_2), "너무 맘에 드는 말투이고, 설명이 친절했어요! 기회가 된다면 한번 더 리뷰 받고 싶어요~"));
+        developFeedbackRepository.save(new DevelopFeedback(matchResult.getRoomId(), matchResult.getReviewer(), matchResult.getReviewee(), 5, List.of(POSITIVE_DEVELOP_FEEDBACK_1, POSITIVE_DEVELOP_FEEDBACK_2), "코드를 이해하기 쉬워 리뷰하기 편했어요!~", 3));
         matchResult.reviewComplete();
         matchResult.reviewerCompleteFeedback();
         matchResult.revieweeCompleteFeedback();

diff --git a/backend/src/main/java/corea/alarm/domain/Alarm.java b/backend/src/main/java/corea/alarm/domain/Alarm.java
@@ -0,0 +1,22 @@
+package corea.alarm.domain;
+
+import corea.member.domain.Member;
+
+public interface Alarm {
+
+    boolean isStatus(boolean status);
+
+    boolean isNotReceiver(Member member);
+
+    void read();
+
+    String getActionType();
+
+    Long getId();
+
+    Long getActorId();
+
+    Long getInteractionId();
+
+    Long getReceiverId();
+}
diff --git a/backend/src/main/java/corea/alarm/domain/AlarmActionType.java b/backend/src/main/java/corea/alarm/domain/AlarmActionType.java
@@ -3,4 +3,7 @@
 public enum AlarmActionType {
     REVIEW_COMPLETE,
     REVIEW_URGE,
+    MATCH_COMPLETE,
+    MATCH_FAIL,
+    FEEDBACK_CREATED,
 }
diff --git a/backend/src/main/java/corea/alarm/domain/AlarmType.java b/backend/src/main/java/corea/alarm/domain/AlarmType.java
@@ -2,7 +2,8 @@
 
 public enum AlarmType {
     // 유저간 상호작용으로 인한 알람
-    USER;
+    USER,
+    SERVER;
 
     public static AlarmType from(String value) {
         return AlarmType.valueOf(value);

diff --git a/.../alarm/domain/UserAlarmsByActionType.java → ...orea/alarm/domain/AlarmsByActionType.java b/.../alarm/domain/UserAlarmsByActionType.java → ...orea/alarm/domain/AlarmsByActionType.java
@@ -6,12 +6,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public record UserAlarmsByActionType(Map<AlarmActionType, List<UserToUserAlarm>> data) {
+public record AlarmsByActionType(Map<AlarmActionType, List<Alarm>> data) {
+
     public Set<Long> getActorIds() {
         return data.values()
                 .stream()
                 .flatMap(Collection::stream)
-                .map(UserToUserAlarm::getActorId)
+                .map(Alarm::getActorId)
                 .collect(Collectors.toSet());
     }
 
@@ -20,11 +21,11 @@ public Set<Long> getRoomIds() {
                 .stream()
                 .flatMap(Collection::stream)
                 //.filter(alarm -> alarm.getAlarmActionType() == AlarmActionType.REVIEW_COMPLETE)
-                .map(UserToUserAlarm::getInteractionId)
+                .map(Alarm::getInteractionId)
                 .collect(Collectors.toSet());
     }
 
-    public List<UserToUserAlarm> getList() {
+    public List<Alarm> getList() {
         return data.values()
                 .stream()
                 .flatMap(Collection::stream)

diff --git a/backend/src/main/java/corea/alarm/domain/ServerToUserAlarm.java b/backend/src/main/java/corea/alarm/domain/ServerToUserAlarm.java
@@ -0,0 +1,60 @@
+package corea.alarm.domain;
+
+import corea.global.BaseTimeEntity;
+import corea.member.domain.Member;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import static jakarta.persistence.GenerationType.IDENTITY;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class ServerToUserAlarm extends BaseTimeEntity implements Alarm {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    @Enumerated(EnumType.STRING)
+    private AlarmActionType alarmActionType;
+
+    private Long receiverId;
+
+    private Long interactionId;
+
+    private boolean isRead;
+
+    public ServerToUserAlarm(AlarmActionType alarmActionType, long receiverId, long interactionId, boolean isRead) {
+        this(null, alarmActionType, receiverId, interactionId, isRead);
+    }
+
+    @Override
+    public boolean isStatus(boolean status) {
+        return isRead == status;
+    }
+
+    @Override
+    public String getActionType() {
+        return alarmActionType.name();
+    }
+
+    @Override
+    public Long getActorId() {
+        return null;
+    }
+
+    @Override
+    public boolean isNotReceiver(Member member) {
+        return !receiverId.equals(member.getId());
+    }
+
+    @Override
+    public void read() {
+        isRead = true;
+    }
+}
diff --git a/backend/src/main/java/corea/alarm/domain/ServerToUserAlarmReader.java b/backend/src/main/java/corea/alarm/domain/ServerToUserAlarmReader.java
@@ -0,0 +1,40 @@
+package corea.alarm.domain;
+
+import corea.alarm.repository.ServerToUserAlarmRepository;
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
+import corea.global.annotation.Reader;
+import corea.member.domain.Member;
+import lombok.RequiredArgsConstructor;
+
+import java.util.EnumMap;
+import java.util.stream.Collectors;
+
+@Reader
+@RequiredArgsConstructor
+public class ServerToUserAlarmReader {
+
+    private final ServerToUserAlarmRepository serverToUserAlarmRepository;
+
+    public long countReceivedAlarm(Member member, boolean isRead) {
+        return serverToUserAlarmRepository.findAllByReceiverId(member.getId())
+                .stream()
+                .filter(alarm -> alarm.isStatus(isRead))
+                .count();
+    }
+
+    public ServerToUserAlarm find(long actionId) {
+        return serverToUserAlarmRepository.findById(actionId)
+                .orElseThrow(() -> new CoreaException(ExceptionType.NOT_RECEIVED_ALARM));
+    }
+
+    public AlarmsByActionType findAllByReceiver(Member member) {
+        return new AlarmsByActionType(serverToUserAlarmRepository.findAllByReceiverId(member.getId())
+                .stream()
+                .collect(Collectors.groupingBy(
+                        ServerToUserAlarm::getAlarmActionType,
+                        () -> new EnumMap<>(AlarmActionType.class),
+                        Collectors.toList()
+                )));
+    }
+}
diff --git a/backend/src/main/java/corea/alarm/domain/ServerToUserAlarmWriter.java b/backend/src/main/java/corea/alarm/domain/ServerToUserAlarmWriter.java
@@ -0,0 +1,27 @@
+package corea.alarm.domain;
+
+import corea.alarm.repository.ServerToUserAlarmRepository;
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
+import corea.global.annotation.Writer;
+import corea.member.domain.Member;
+import lombok.RequiredArgsConstructor;
+
+@Writer
+@RequiredArgsConstructor
+public class ServerToUserAlarmWriter {
+
+    private final ServerToUserAlarmRepository serverToUserAlarmRepository;
+
+    public ServerToUserAlarm create(ServerToUserAlarm serverToUserAlarm) {
+        return serverToUserAlarmRepository.save(serverToUserAlarm);
+    }
+
+    public ServerToUserAlarm check(Member member, ServerToUserAlarm serverToUserAlarm) {
+        if (serverToUserAlarm.isNotReceiver(member)) {
+            throw new CoreaException(ExceptionType.NOT_RECEIVED_ALARM);
+        }
+        serverToUserAlarm.read();
+        return serverToUserAlarm;
+    }
+}
diff --git a/backend/src/main/java/corea/alarm/domain/UserToUserAlarm.java b/backend/src/main/java/corea/alarm/domain/UserToUserAlarm.java
@@ -14,7 +14,7 @@
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
-public class UserToUserAlarm extends BaseTimeEntity {
+public class UserToUserAlarm extends BaseTimeEntity implements Alarm {
 
     @Id
     @GeneratedValue(strategy = IDENTITY)
@@ -40,23 +40,27 @@ public UserToUserAlarm(AlarmActionType alarmActionType, long actorId, long recei
         this(null, alarmActionType, actorId, receiverId, interactionId, isRead);
     }
 
+    public boolean isUrgeAlarm() {
+        return alarmActionType == AlarmActionType.REVIEW_URGE;
+    }
+
+    @Override
     public boolean isStatus(boolean status) {
         return isRead == status;
     }
 
+    @Override
     public String getActionType() {
         return alarmActionType.name();
     }
 
+    @Override
     public boolean isNotReceiver(Member member) {
         return !receiverId.equals(member.getId());
     }
 
+    @Override
     public void read() {
         isRead = true;
     }
-
-    public boolean isUrgeAlarm() {
-        return alarmActionType == AlarmActionType.REVIEW_URGE;
-    }
 }
diff --git a/backend/src/main/java/corea/alarm/domain/UserToUserAlarmReader.java b/backend/src/main/java/corea/alarm/domain/UserToUserAlarmReader.java
@@ -1,5 +1,6 @@
 package corea.alarm.domain;
 
+import corea.alarm.repository.UserToUserAlarmRepository;
 import corea.exception.CoreaException;
 import corea.exception.ExceptionType;
 import corea.global.annotation.Reader;
@@ -28,8 +29,8 @@ public UserToUserAlarm find(long actionId) {
                 .orElseThrow(() -> new CoreaException(ExceptionType.NOT_RECEIVED_ALARM));
     }
 
-    public UserAlarmsByActionType findAllByReceiver(Member member) {
-        return new UserAlarmsByActionType(userToUserAlarmRepository.findAllByReceiverId(member.getId())
+    public AlarmsByActionType findAllByReceiver(Member member) {
+        return new AlarmsByActionType(userToUserAlarmRepository.findAllByReceiverId(member.getId())
                 .stream()
                 .collect(Collectors.groupingBy(
                         UserToUserAlarm::getAlarmActionType,

diff --git a/backend/src/main/java/corea/alarm/domain/UserToUserAlarmWriter.java b/backend/src/main/java/corea/alarm/domain/UserToUserAlarmWriter.java
@@ -1,5 +1,6 @@
 package corea.alarm.domain;
 
+import corea.alarm.repository.UserToUserAlarmRepository;
 import corea.exception.CoreaException;
 import corea.exception.ExceptionType;
 import corea.global.annotation.Writer;
@@ -15,7 +16,7 @@ public class UserToUserAlarmWriter {
     public UserToUserAlarm create(UserToUserAlarm userToUserAlarm) {
         return userToUserAlarmRepository.save(userToUserAlarm);
     }
-  
+
     public UserToUserAlarm check(Member member, UserToUserAlarm userToUserAlarm) {
         if (userToUserAlarm.isNotReceiver(member)) {
             throw new CoreaException(ExceptionType.NOT_RECEIVED_ALARM);

diff --git a/backend/src/main/java/corea/alarm/dto/AlarmResponse.java b/backend/src/main/java/corea/alarm/dto/AlarmResponse.java
@@ -1,6 +1,7 @@
 package corea.alarm.dto;
 
 import corea.alarm.domain.AlarmType;
+import corea.alarm.domain.ServerToUserAlarm;
 import corea.alarm.domain.UserToUserAlarm;
 import corea.member.domain.Member;
 import corea.room.domain.Room;
@@ -31,7 +32,13 @@ public record AlarmResponse(
         String alarmType
 ) {
 
-    public static AlarmResponse from(UserToUserAlarm alarm, Member member, Room room) {
-        return new AlarmResponse(alarm.getId(), alarm.getActionType(), MemberResponse.from(member), InteractionResponse.from(room), alarm.isRead(), alarm.getCreateAt(), AlarmType.USER.name());
+    public static AlarmResponse of(UserToUserAlarm alarm, Member member, Room room) {
+        return new AlarmResponse(alarm.getId(), alarm.getActionType(), MemberResponse.from(member),
+                InteractionResponse.from(room), alarm.isRead(), alarm.getCreateAt(), AlarmType.USER.name());
+    }
+
+    public static AlarmResponse of(ServerToUserAlarm alarm, Room room) {
+        return new AlarmResponse(alarm.getId(), alarm.getActionType(), null,
+                InteractionResponse.from(room), alarm.isRead(), alarm.getCreateAt(), AlarmType.SERVER.name());
     }
 }
diff --git a/backend/src/main/java/corea/alarm/dto/AlarmResponses.java b/backend/src/main/java/corea/alarm/dto/AlarmResponses.java
@@ -1,6 +1,10 @@
 package corea.alarm.dto;
 
+import corea.alarm.domain.Alarm;
+import corea.alarm.domain.ServerToUserAlarm;
 import corea.alarm.domain.UserToUserAlarm;
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
 import corea.member.domain.Member;
 import corea.room.domain.Room;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -13,10 +17,18 @@ public record AlarmResponses(
         @Schema(description = "알림 리스트")
         List<AlarmResponse> data) {
 
-    public static AlarmResponses from(List<UserToUserAlarm> responses, Map<Long, Member> members, Map<Long, Room> rooms) {
+    public static AlarmResponses of(List<Alarm> alarms, Map<Long, Member> members, Map<Long, Room> userAlarmRooms, Map<Long, Room> serverAlarmRooms) {
         //@formatter:off
-        return new AlarmResponses(responses.stream()
-                .map(alarm -> AlarmResponse.from(alarm, members.get(alarm.getActorId()), rooms.get(alarm.getInteractionId())))
+        return new AlarmResponses(alarms.stream()
+                .map(alarm -> {
+                    if (alarm instanceof UserToUserAlarm userAlarm) {
+                        return AlarmResponse.of(userAlarm, members.get(userAlarm.getActorId()), userAlarmRooms.get(userAlarm.getInteractionId()));
+                    }
+                    if (alarm instanceof ServerToUserAlarm serverAlarm){
+                        return AlarmResponse.of(serverAlarm, serverAlarmRooms.get(serverAlarm.getInteractionId()));
+                    }
+                    throw new CoreaException(ExceptionType.UNDEFINED_ALARM_TYPE);
+                })
                 .sorted(Comparator.comparing(AlarmResponse::createAt).reversed())
                 .toList());
         //@formatter:on

diff --git a/backend/src/main/java/corea/alarm/dto/CreateServerToUserAlarmInput.java b/backend/src/main/java/corea/alarm/dto/CreateServerToUserAlarmInput.java
@@ -0,0 +1,18 @@
+package corea.alarm.dto;
+
+import corea.alarm.domain.AlarmActionType;
+import corea.alarm.domain.ServerToUserAlarm;
+
+public record CreateServerToUserAlarmInput(AlarmActionType alarmType,
+                                           long receiverId,
+                                           long interactionId) {
+
+    public ServerToUserAlarm toEntity() {
+        return new ServerToUserAlarm(
+                alarmType,
+                receiverId,
+                interactionId,
+                false
+        );
+    }
+}
diff --git a/backend/src/main/java/corea/alarm/repository/ServerToUserAlarmRepository.java b/backend/src/main/java/corea/alarm/repository/ServerToUserAlarmRepository.java
@@ -0,0 +1,11 @@
+package corea.alarm.repository;
+
+import corea.alarm.domain.ServerToUserAlarm;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface ServerToUserAlarmRepository extends JpaRepository<ServerToUserAlarm, Long> {
+
+    List<ServerToUserAlarm> findAllByReceiverId(long receiverId);
+}
diff --git a/...arm/domain/UserToUserAlarmRepository.java → ...repository/UserToUserAlarmRepository.java b/...arm/domain/UserToUserAlarmRepository.java → ...repository/UserToUserAlarmRepository.java
@@ -1,5 +1,6 @@
-package corea.alarm.domain;
+package corea.alarm.repository;
 
+import corea.alarm.domain.UserToUserAlarm;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;