Merge pull request #62 from JocketDan/refactor/tour-details-add-bookmark-boolean

Refactor/tour details add bookmark boolean

Author: 2SEONGA

tour/src/main/java/com/jocketdan/tour/controller/TourOpenApiController.java

@@ -7,6 +7,7 @@
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -211,8 +212,11 @@ public LocationBasedListResponseDTO getLocationBasedList(
     )
     @GetMapping("/details")
     public DetailsResponseDTO getDetails(
-            @Parameter(description = "관광 콘텐츠 ID", example = "1234567") @RequestParam String contentId
+            @Parameter(description = "관광 콘텐츠 ID", example = "1234567") @RequestParam String contentId,
+            Authentication authentication
     ) {
-        return tourOpenApiService.getDetails(contentId);
+        String userEmail = authentication.getName();
+
+        return tourOpenApiService.getDetailsWithBookmark(contentId, userEmail);
     }
 }

tour/src/main/java/com/jocketdan/tour/dto/openApi/DetailsResponseDTO.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.FieldDefaults;
 
 import java.util.List;
@@ -44,6 +45,7 @@ public static class Items {
     }
 
     @Getter
+    @Setter
     @FieldDefaults(level = AccessLevel.PRIVATE)
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Item {
@@ -75,5 +77,7 @@ public static class Item {
         String lclsSystm1;
         String lclsSystm2;
         String lclsSystm3;
+
+        boolean bookMark = false;
     }
 }

tour/src/main/java/com/jocketdan/tour/repository/BookmarkRepository.java

@@ -13,6 +13,8 @@
 
 public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
 
+    boolean existsByUserEmailAndContentId_ContentId(String userEmail, String contentId);
+
     boolean existsByUserEmailAndContentId(String userEmail, OpenApiPlaceDetail contentId);
 
     List<Bookmark> findByUserEmailAndContentId_ContentIdIn(String userEmail, List<String> contentIds);

tour/src/main/java/com/jocketdan/tour/service/TourOpenApiService.java

@@ -4,6 +4,7 @@
 import com.jocketdan.tour.entity.OpenApiPlaceDetail;
 import com.jocketdan.tour.exception.CustomException;
 import com.jocketdan.tour.exception.ExceptionType;
+import com.jocketdan.tour.repository.BookmarkRepository;
 import com.jocketdan.tour.repository.OpenApiPlaceDetailRepository;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@ public class TourOpenApiService {
 
     PublicDataApiClient publicDataApiClient;
     OpenApiPlaceDetailRepository openApiPlaceDetailRepository;
+    BookmarkRepository bookmarkRepository;
 
     public AreaBasedListResponseDTO getAreaBasedList(
             int numOfRows,
@@ -148,6 +150,32 @@ public DetailsResponseDTO getDetails(String contentId) {
         );
     }
 
+    public DetailsResponseDTO getDetailsWithBookmark(String contentId, String userEmail) {
+        DetailsResponseDTO response = publicDataApiClient.call(
+                "/detailCommon2",
+                Map.of("contentId", contentId),
+                DetailsResponseDTO.class
+        );
+
+        if (response != null
+                && response.getResponse() != null
+                && response.getResponse().getBody() != null
+                && response.getResponse().getBody().getItems() != null
+                && response.getResponse().getBody().getItems().getItem() != null
+                && !response.getResponse().getBody().getItems().getItem().isEmpty()) {
+
+            DetailsResponseDTO.Item item = response.getResponse().getBody().getItems().getItem().getFirst();
+
+            boolean isBookmarked = userEmail != null && item.getContentid() != null
+                    && bookmarkRepository.existsByUserEmailAndContentId_ContentId(userEmail, item.getContentid());
+
+            item.setBookMark(isBookmarked);
+        }
+
+        return response;
+    }
+
+
     @Transactional
     public OpenApiPlaceDetail getOrFetchPlaceDetail(String contentId) {
         return openApiPlaceDetailRepository.findByContentId(contentId)