[fix] 코스 조회 로직 수정 / 장소 상세조회 response 수정 (#243)

* fix: 장소 검색 시 사진이 없으면 null 처리

* fix: isVisited 필드명 변경

* fix: 코스 조회 API 로직 수정

* fix: 장소 상세보기 response 값 수정

* fix: 장소 상세보기 response 값 수정

* fix: 코스 조회 로직 수정

* fix: 카테고리 FetchType 수정

Author: StoneCAU

src/main/java/umc/catchy/domain/mapping/memberCourse/dao/MemberCourseRepositoryImpl.java

@@ -10,6 +10,7 @@
 
 import umc.catchy.domain.category.domain.BigCategory;
 import umc.catchy.domain.course.domain.CourseType;
+import umc.catchy.domain.course.util.LocationUtils;
 import umc.catchy.domain.mapping.memberCourse.dto.response.MemberCourseResponse;
 
 
@@ -67,7 +68,7 @@ public Slice<MemberCourseResponse> findCourseByBookmarks(Long memberId, int page
     @Override
     public Slice<MemberCourseResponse> findCourseByFilters(CourseType courseType, String upperLocation,
                                                            String lowerLocation, Long memberId, Long lastCourseId) {
-        List<MemberCourseResponse> results = queryFactory.select(Projections.constructor(MemberCourseResponse.class,
+        List<MemberCourseResponse> results = queryFactory.selectDistinct(Projections.constructor(MemberCourseResponse.class,
                         course.id,
                         course.courseType,
                         course.courseImage,
@@ -76,6 +77,8 @@ public Slice<MemberCourseResponse> findCourseByFilters(CourseType courseType, St
                 .from(memberCourse)
                 .leftJoin(memberCourse.course,course).on(memberCourse.course.id.eq(course.id))
                 .leftJoin(memberCourse.member,member).on(memberCourse.member.id.eq(member.id))
+                .leftJoin(placeCourse).on(course.id.eq(placeCourse.course.id))
+                .leftJoin(place).on(placeCourse.place.id.eq(place.id))
                 .where(
                         memberCourse.member.id.eq(memberId),
                         course.courseType.eq(courseType),
@@ -126,7 +129,7 @@ private BooleanExpression upperLocationFilter(String upperLocation) {
         if ("all".equals(upperLocation)) {
             return null;
         }
-        return place.roadAddress.startsWith(upperLocation + " ");
+        return place.roadAddress.startsWith(LocationUtils.normalizeLocation(upperLocation) + " ");
     }
 
     private BooleanExpression lowerLocationFilter(String lowerLocation) {

src/main/java/umc/catchy/domain/place/converter/PlaceConverter.java

@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import umc.catchy.domain.category.domain.BigCategory;
 import umc.catchy.domain.course.dto.response.CourseInfoResponse;
 import umc.catchy.domain.mapping.placeCourse.dto.response.PlaceInfoDetail;
 import umc.catchy.domain.mapping.placeCourse.dto.response.PlaceInfoPreview;
@@ -55,22 +56,27 @@ public static PlaceInfoPreview toPlaceInfoPreview(Place place, Long reviewCount,
     }
 
     public static PlaceInfoDetail toPlaceInfoDetail (Place place, Long reviewCount, Boolean isVisited, Boolean isLiked) {
-        String categoryName = null;
+        BigCategory categoryName = null;
         Double rating = 0.0;
 
         if (place.getCategory() != null) {
-            categoryName = place.getCategory().getName();
+            categoryName = place.getCategory().getBigCategory();
         }
 
         if (place.getRating() != null) {
             rating = place.getRating();
         }
 
+        String category;
+
+        if (categoryName == null) category = null;
+        else category = categoryName.toString();
+
         return PlaceInfoDetail.builder()
                 .placeId(place.getId())
                 .imageUrl(place.getImageUrl())
                 .placeName(place.getPlaceName())
-                .categoryName(categoryName)
+                .categoryName(category)
                 .roadAddress(place.getRoadAddress())
                 .activeTime(place.getActiveTime())
                 .placeSite(place.getPlaceSite())

src/main/java/umc/catchy/domain/place/domain/Place.java

@@ -51,7 +51,7 @@ public class Place extends BaseTimeEntity {
     private Double rating; // 장소 총 평점 : 처음에 0으로 초기화해주세요
 
     @Setter
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "category_id")
     private Category category;