feat: 마이페이지 카페 조회 시 roadAddress 및 내가 남긴 리뷰 함께 조회 기능 구현 (#137)

* feat: cafe roadAddress 추가 * feat: 리뷰 남긴 카페 조회 시 내가 남긴 리뷰 함께 조회 * fix: 동시성 테스트 실패 수정 * feat: 코드리뷰 반영
mocacong · Dec 1, 2023 · 00034c2 · 00034c2
1 parent b2fad09
commit 00034c2
Show file tree

Hide file tree

Showing 36 changed files with 265 additions and 182 deletions.
diff --git a/src/main/java/mocacong/server/domain/Cafe.java b/src/main/java/mocacong/server/domain/Cafe.java
@@ -29,6 +29,12 @@ public class Cafe extends BaseTime {
     @Column(name = "map_id", unique = true, nullable = false)
     private String mapId;
 
+    @Column(name = "road_address")
+    private String roadAddress;
+
+    @Column(name = "phone_number")
+    private String phoneNumber;
+
     @OneToMany(mappedBy = "cafe", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Score> score;
 
@@ -54,6 +60,29 @@ public Cafe(String mapId, String name) {
         this.comments = new ArrayList<>();
     }
 
+    public Cafe(String mapId, String name, String roadAddress) {
+        this.mapId = mapId;
+        this.name = name;
+        this.roadAddress = roadAddress;
+        this.cafeDetail = new CafeDetail();
+        this.cafeImages = new ArrayList<>();
+        this.score = new ArrayList<>();
+        this.reviews = new ArrayList<>();
+        this.comments = new ArrayList<>();
+    }
+
+    public Cafe(String mapId, String name, String roadAddress, String phoneNumber) {
+        this.mapId = mapId;
+        this.name = name;
+        this.roadAddress = roadAddress;
+        this.phoneNumber = phoneNumber;
+        this.cafeDetail = new CafeDetail();
+        this.cafeImages = new ArrayList<>();
+        this.score = new ArrayList<>();
+        this.reviews = new ArrayList<>();
+        this.comments = new ArrayList<>();
+    }
+
     public void updateCafeDetails() {
         StudyType studyType = getMostFrequentStudyType();
         Wifi wifi = Wifi.averageFrom(reviews.stream().map(Review::getWifi)
@@ -71,6 +100,10 @@ public void updateCafeDetails() {
         this.cafeDetail = new CafeDetail(studyType, wifi, parking, toilet, desk, power, sound);
     }
 
+    public void updateCafeRoadAddress(String roadAddress) {
+        this.roadAddress = roadAddress;
+    }
+
     private StudyType getMostFrequentStudyType() {
         int solo = 0, group = 0;
         for (Review review : reviews) {

diff --git a/src/main/java/mocacong/server/dto/request/CafeRegisterRequest.java b/src/main/java/mocacong/server/dto/request/CafeRegisterRequest.java
@@ -14,4 +14,10 @@ public class CafeRegisterRequest {
 
     @NotBlank(message = "1012:공백일 수 없습니다.")
     private String name;
+
+    @NotBlank(message = "1012:공백일 수 없습니다.")
+    private String roadAddress;
+
+    @NotBlank(message = "1012:공백일 수 없습니다.")
+    private String phoneNumber;
 }
diff --git a/src/main/java/mocacong/server/dto/response/FindCafeResponse.java b/src/main/java/mocacong/server/dto/response/FindCafeResponse.java
@@ -11,6 +11,9 @@ public class FindCafeResponse {
 
     private Boolean favorite;
     private Long favoriteId;
+    private String name;
+    private String roadAddress;
+    private String phoneNumber;
     private double score;
     private Integer myScore;
     private String studyType;

diff --git a/src/main/java/mocacong/server/dto/response/MyCommentCafeResponse.java b/src/main/java/mocacong/server/dto/response/MyCommentCafeResponse.java
@@ -2,7 +2,9 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
+
 import lombok.*;
+
 import mocacong.server.domain.Cafe;
 import mocacong.server.domain.Comment;
 
@@ -15,12 +17,13 @@ public class MyCommentCafeResponse {
     private String mapId;
     private String name;
     private String studyType;
+    private String roadAddress;
     private List<String> comments;
 
     public static MyCommentCafeResponse of(Cafe cafe, List<Comment> comments) {
         List<String> contents = comments.stream()
                 .map(Comment::getContent)
                 .collect(Collectors.toList());
-        return new MyCommentCafeResponse(cafe.getMapId(), cafe.getName(), cafe.getStudyType(), contents);
+        return new MyCommentCafeResponse(cafe.getMapId(), cafe.getName(), cafe.getStudyType(), cafe.getRoadAddress(), contents);
     }
 }
diff --git a/src/main/java/mocacong/server/dto/response/MyFavoriteCafeResponse.java b/src/main/java/mocacong/server/dto/response/MyFavoriteCafeResponse.java
@@ -7,9 +7,9 @@
 @AllArgsConstructor
 @ToString
 public class MyFavoriteCafeResponse {
-
     private String mapId;
     private String name;
     private String studyType;
     private double score;
+    private String roadAddress;
 }
diff --git a/src/main/java/mocacong/server/dto/response/MyReviewCafeResponse.java b/src/main/java/mocacong/server/dto/response/MyReviewCafeResponse.java
@@ -1,6 +1,7 @@
 package mocacong.server.dto.response;
 
 import lombok.*;
+import mocacong.server.domain.CafeDetail;
 import mocacong.server.domain.cafedetail.StudyType;
 
 @Getter
@@ -12,11 +13,25 @@ public class MyReviewCafeResponse {
     private String name;
     private String myStudyType;
     private int myScore;
+    private String roadAddress;
+    private String wifi;
+    private String parking;
+    private String toilet;
+    private String power;
+    private String sound;
+    private String desk;
 
-    public MyReviewCafeResponse(String mapId, String name, StudyType myStudyType, int myScore) {
+    public MyReviewCafeResponse(String mapId, String name, StudyType myStudyType, int myScore, String roadAddress, CafeDetail cafeDetail) {
         this.mapId = mapId;
         this.name = name;
         this.myStudyType = myStudyType.getValue();
         this.myScore = myScore;
+        this.roadAddress = roadAddress;
+        this.wifi = cafeDetail.getWifiValue();
+        this.parking = cafeDetail.getParkingValue();
+        this.toilet = cafeDetail.getToiletValue();
+        this.power = cafeDetail.getPowerValue();
+        this.sound = cafeDetail.getSoundValue();
+        this.desk = cafeDetail.getDeskValue();
     }
 }
diff --git a/src/main/java/mocacong/server/dto/response/PreviewCafeResponse.java b/src/main/java/mocacong/server/dto/response/PreviewCafeResponse.java
@@ -8,6 +8,8 @@
 @ToString
 public class PreviewCafeResponse {
 
+    private String name;
+    private String roadAddress;
     private Boolean favorite;
     private double score;
     private String studyType;

diff --git a/src/main/java/mocacong/server/repository/CafeRepository.java b/src/main/java/mocacong/server/repository/CafeRepository.java
@@ -28,10 +28,10 @@ public interface CafeRepository extends JpaRepository<Cafe, Long> {
             "where m.id = :id")
     Slice<Cafe> findByMyFavoriteCafes(Long id, Pageable pageRequest);
 
-    @Query("select new mocacong.server.dto.response.MyReviewCafeResponse(c.mapId,c.name,r.cafeDetail.studyType,s.score) from Review r " +
+    @Query("select new mocacong.server.dto.response.MyReviewCafeResponse(c.mapId,c.name,r.cafeDetail.studyType,s.score,c.roadAddress, r.cafeDetail) from Review r " +
             "join r.cafe c " +
             "join r.member m " +
-            "join c.score s "+
+            "join c.score s " +
             "where m.id = :id and s.member.id = :id")
     Slice<MyReviewCafeResponse> findMyReviewCafesById(Long id, Pageable pageRequest);
 }
diff --git a/src/main/java/mocacong/server/service/CafeService.java b/src/main/java/mocacong/server/service/CafeService.java
@@ -31,6 +31,7 @@
 import javax.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -53,13 +54,21 @@ public class CafeService {
 
     @Transactional
     public void save(CafeRegisterRequest request) {
-        Cafe cafe = new Cafe(request.getId(), request.getName());
+        Cafe cafe = new Cafe(request.getId(), request.getName(), request.getRoadAddress(), request.getPhoneNumber());
+
+
+        Optional<Cafe> cafeOptional = cafeRepository.findByMapId(request.getId());
 
         try {
-            cafeRepository.save(cafe);
+            cafeRepository.findByMapId(request.getId())
+                    .ifPresentOrElse(
+                            existedCafe -> existedCafe.updateCafeRoadAddress(request.getRoadAddress()),
+                            () -> cafeRepository.save(cafe)
+                    );
         } catch (DataIntegrityViolationException e) {
             throw new DuplicateCafeException();
         }
+
     }
 
     @Transactional(readOnly = true)
@@ -78,6 +87,9 @@ public FindCafeResponse findCafeByMapId(Long memberId, String mapId) {
         return new FindCafeResponse(
                 favoriteId != null,
                 favoriteId,
+                cafe.getName(),
+                cafe.getRoadAddress(),
+                cafe.getPhoneNumber(),
                 cafe.findAverageScore(),
                 scoreByLoginUser != null ? scoreByLoginUser.getScore() : null,
                 cafeDetail.getStudyTypeValue(),
@@ -105,6 +117,8 @@ public PreviewCafeResponse previewCafeByMapId(Long memberId, String mapId) {
         Long favoriteId = favoriteRepository.findFavoriteIdByCafeIdAndMemberId(cafe.getId(), member.getId())
                 .orElse(null);
         return new PreviewCafeResponse(
+                cafe.getName(),
+                cafe.getRoadAddress(),
                 favoriteId != null,
                 cafe.findAverageScore(),
                 cafeDetail.getStudyTypeValue(),
@@ -149,7 +163,7 @@ public MyFavoriteCafesResponse findMyFavoriteCafes(Long memberId, Integer page,
         List<MyFavoriteCafeResponse> responses = myFavoriteCafes
                 .getContent()
                 .stream()
-                .map(cafe -> new MyFavoriteCafeResponse(cafe.getMapId(), cafe.getName(), cafe.getStudyType(), cafe.findAverageScore()))
+                .map(cafe -> new MyFavoriteCafeResponse(cafe.getMapId(), cafe.getName(), cafe.getStudyType(), cafe.findAverageScore(), cafe.getRoadAddress()))
                 .collect(Collectors.toList());
         return new MyFavoriteCafesResponse(myFavoriteCafes.isLast(), responses);
     }
@@ -172,6 +186,7 @@ public MyCommentCafesResponse findMyCommentCafes(Long memberId, int page, int co
         List<Comment> comments = commentRepository.findAllByMemberId(member.getId());
 
         List<MyCommentCafeResponse> responses = comments.stream()
+//                .map(MyCommentCafeResponse::from)
                 .collect(Collectors.groupingByConcurrent(Comment::getCafe))
                 .entrySet()
                 .stream()

diff --git a/src/test/java/mocacong/server/acceptance/CafeAcceptanceTest.java b/src/test/java/mocacong/server/acceptance/CafeAcceptanceTest.java
@@ -21,7 +21,7 @@ public class CafeAcceptanceTest extends AcceptanceTest {
     @Test
     @DisplayName("카페를 정상적으로 등록한다")
     void cafeSave() {
-        CafeRegisterRequest request = new CafeRegisterRequest("1", "메리네 카페");
+        CafeRegisterRequest request = new CafeRegisterRequest("1", "메리네 카페", "서울시 강남구", "010-1234-5678");
 
         RestAssured.given().log().all()
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
@@ -36,7 +36,7 @@ void cafeSave() {
     @DisplayName("특정 카페 정보를 조회한다")
     void findCafe() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "서울시 강남구", "010-1234-5678"));
 
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
@@ -55,7 +55,7 @@ void findCafe() {
     @DisplayName("카페에 대한 리뷰를 작성한다")
     void saveCafeReview() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "서울시 강남구", "010-1234-5678"));
 
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
@@ -83,7 +83,7 @@ void saveCafeReview() {
     @DisplayName("카페에 대해 내가 작성한 리뷰를 조회한다")
     void findMyCafeReview() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "서울시 강남구", "010-1234-5678"));
 
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
@@ -103,7 +103,7 @@ void findMyCafeReview() {
     @DisplayName("카페에 대한 리뷰를 다시 작성할 수 없다")
     void saveCafeReviewManyTimes() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "서울시 강남구", "010-1234-5678"));
 
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
@@ -126,7 +126,7 @@ void saveCafeReviewManyTimes() {
     @DisplayName("등록한 카페에 대한 리뷰를 수정한다")
     void updateCafeReview() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "서울시 강남구", "010-1234-5678"));
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
         String token = 로그인_토큰_발급(signUpRequest.getEmail(), signUpRequest.getPassword());
@@ -157,7 +157,7 @@ void updateCafeReview() {
     @DisplayName("등록하지 않은 카페에 대한 리뷰는 수정할 수 없다")
     void updateCafeReviewNotFoundReview() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "서울시 강남구", "010-1234-5678"));
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
         String token = 로그인_토큰_발급(signUpRequest.getEmail(), signUpRequest.getPassword());
@@ -178,7 +178,7 @@ void updateCafeReviewNotFoundReview() {
     @DisplayName("카페 정보를 미리보기한다")
     void previewCafe() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페", "100", "010-1234-5678"));
 
         MemberSignUpRequest signUpRequest1 = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         MemberSignUpRequest signUpRequest2 = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "메리");
@@ -206,9 +206,9 @@ void getCafesFilterStudyType() {
         String mapId1 = "12332312";
         String mapId2 = "12355412";
         String mapId3 = "18486512";
-        카페_등록(new CafeRegisterRequest(mapId1, "메리네 카페 본점"));
-        카페_등록(new CafeRegisterRequest(mapId2, "메리네 카페 2호점"));
-        카페_등록(new CafeRegisterRequest(mapId3, "메리네 카페 3호점"));
+        카페_등록(new CafeRegisterRequest(mapId1, "메리네 카페 본점", "서울시 강남구", "010-1234-5678"));
+        카페_등록(new CafeRegisterRequest(mapId2, "메리네 카페 2호점", "서울시 강남구", "010-1234-5678"));
+        카페_등록(new CafeRegisterRequest(mapId3, "메리네 카페 3호점", "서울시 강남구", "010-1234-5678"));
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
         String token = 로그인_토큰_발급(signUpRequest.getEmail(), signUpRequest.getPassword());
@@ -242,9 +242,9 @@ void getCafesFilterFavorites() {
         String mapId1 = "12332312";
         String mapId2 = "12355412";
         String mapId3 = "18486512";
-        카페_등록(new CafeRegisterRequest(mapId1, "메리네 카페 본점"));
-        카페_등록(new CafeRegisterRequest(mapId2, "메리네 카페 2호점"));
-        카페_등록(new CafeRegisterRequest(mapId3, "메리네 카페 3호점"));
+        카페_등록(new CafeRegisterRequest(mapId1, "메리네 카페 본점", "서울시 강남구", "010-1234-5678"));
+        카페_등록(new CafeRegisterRequest(mapId2, "메리네 카페 2호점", "서울시 강남구", "010-1234-5678"));
+        카페_등록(new CafeRegisterRequest(mapId3, "메리네 카페 3호점", "서울시 강남구", "010-1234-5678"));
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
         String token = 로그인_토큰_발급(signUpRequest.getEmail(), signUpRequest.getPassword());
@@ -270,7 +270,7 @@ void getCafesFilterFavorites() {
     @DisplayName("특정 카페 이미지들을 조회한다")
     void getCafeImages() {
         String mapId = "12332312";
-        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페 본점"));
+        카페_등록(new CafeRegisterRequest(mapId, "메리네 카페 본점", "서울시 강남구", "010-1234-5678"));
         MemberSignUpRequest signUpRequest = new MemberSignUpRequest("[email protected]", "a1b2c3d4", "케이");
         회원_가입(signUpRequest);
         String token = 로그인_토큰_발급(signUpRequest.getEmail(), signUpRequest.getPassword());