Merge pull request #39 from AlongTheBlue/develop

[Feat] CustomPage 사용해서 category 정보 추가

build.gradle

@@ -60,6 +60,13 @@ dependencies {
 	implementation 'org.json:json:20240303'
 	testImplementation 'io.projectreactor:reactor-test'
 	implementation 'io.netty:netty-resolver-dns-native-macos:4.1.86.Final:osx-x86_64'
+
+	// Spring Boot Jackson 의존성 추가
+	implementation 'org.springframework.boot:spring-boot-starter-json'
+
+	implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+	implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
+	implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
 }
 
 tasks.named('test') {

src/main/java/org/alongtheblue/alongtheblue_server/global/config/JacksonConfig.java

@@ -0,0 +1,18 @@
+package org.alongtheblue.alongtheblue_server.global.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alongtheblue.alongtheblue_server.global.data.global.CustomPage;
+import org.alongtheblue.alongtheblue_server.global.data.global.CustomPageMixIn;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class JacksonConfig {
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        // MixIn 등록
+        mapper.addMixIn(CustomPage.class, CustomPageMixIn.class);
+        return mapper;
+    }
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/global/Category.java

@@ -0,0 +1,19 @@
+package org.alongtheblue.alongtheblue_server.global.data.global;
+
+public enum Category {
+    RESTAURANT("restaurant"),
+    CAFE("cafe"),
+    ACCOMMODATION("accommodation"),
+    TOURDATA("tourData");
+
+    private final String value;
+
+    Category(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/global/CustomPage.java

@@ -0,0 +1,30 @@
+package org.alongtheblue.alongtheblue_server.global.data.global;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CustomPage<T> extends PageImpl<T> {
+    @JsonProperty("category")
+    private String category;
+
+    public CustomPage() {
+        super(List.of());
+    }
+    public CustomPage(List<T> content, Pageable pageable, long total, String category) {
+        super(content, pageable, total);
+        this.category = category;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/global/CustomPageMixIn.java

@@ -0,0 +1,16 @@
+package org.alongtheblue.alongtheblue_server.global.data.global;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+public abstract class CustomPageMixIn<T> extends PageImpl<T> {
+    @JsonProperty("category")
+    private String category;
+
+    public CustomPageMixIn(List<T> content, Pageable pageable, long total) {
+        super(content, pageable, total);
+    }
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/restaurant/Restaurant.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.util.List;
 
@@ -26,6 +27,7 @@ public class Restaurant {
     private String yMap;
 
     @OneToMany(mappedBy = "restaurant", cascade = CascadeType.ALL)
+    @ToString.Exclude
     @JsonManagedReference
     List<RestaurantImage> images;
 

src/main/java/org/alongtheblue/alongtheblue_server/global/data/restaurant/RestaurantController.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.alongtheblue.alongtheblue_server.global.common.response.ApiResponse;
+import org.alongtheblue.alongtheblue_server.global.data.global.CustomPage;
 import org.alongtheblue.alongtheblue_server.global.data.global.dto.response.DetailResponseDto;
 import org.alongtheblue.alongtheblue_server.global.data.global.dto.response.HomeResponseDto;
 import org.alongtheblue.alongtheblue_server.global.data.restaurant.dto.response.PartRestaurantResponseDto;
@@ -44,8 +45,8 @@ public void saveRestaurantsImages() {
 
     // TODO 페이지네이션 구현 필요
     @GetMapping("/detail/all")
-    public ApiResponse<Page<RestaurantSimpleInformation>> retrieveAll(@RequestParam(defaultValue = "0") int page,
-                                                                      @RequestParam(defaultValue = "10") int size) {
+    public ApiResponse<CustomPage<RestaurantSimpleInformation>> retrieveAll(@RequestParam(defaultValue = "0") int page,
+                                                                            @RequestParam(defaultValue = "10") int size) {
         return restaurantService.retrieveAll(page, size);
     }
 //    public ApiResponse<List<RestaurantResponseDto>> getAll(){

src/main/java/org/alongtheblue/alongtheblue_server/global/data/restaurant/RestaurantImage.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Entity
 @Data
@@ -17,6 +18,7 @@ public class RestaurantImage {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "restaurant")
+    @ToString.Exclude
     @JsonBackReference
     private Restaurant restaurant;
 

src/main/java/org/alongtheblue/alongtheblue_server/global/data/restaurant/RestaurantService.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.alongtheblue.alongtheblue_server.global.common.response.ApiResponse;
+import org.alongtheblue.alongtheblue_server.global.data.global.Category;
+import org.alongtheblue.alongtheblue_server.global.data.global.CustomPage;
 import org.alongtheblue.alongtheblue_server.global.data.global.dto.response.DetailResponseDto;
 import org.alongtheblue.alongtheblue_server.global.data.global.dto.response.HomeResponseDto;
 import org.alongtheblue.alongtheblue_server.global.data.restaurant.dto.response.PartRestaurantResponseDto;
@@ -220,12 +222,23 @@ private Mono<Map<String, String>> restdayAndInfo(Restaurant restaurant) {
     }
 
 //    //딱 음식 눌렀을 때 식당 목록
-    public ApiResponse<Page<RestaurantSimpleInformation>> retrieveAll(int page, int size) {
+    public ApiResponse<CustomPage<RestaurantSimpleInformation>> retrieveAll(int page, int size) {
         Pageable pageable = PageRequest.of(page, size);
 
         // 1. Restaurant 기준으로 페이징 처리된 데이터를 조회
         Page<RestaurantSimpleInformation> restaurantPage = restaurantRepository.findAllSimple(pageable);
 
+        // CustomPage 객체로 변환 (기존 페이지네이션 정보와 category를 함께 담음)
+        CustomPage<RestaurantSimpleInformation> customPage = new CustomPage<>(
+                restaurantPage.getContent(), pageable, restaurantPage.getTotalElements(), Category.RESTAURANT.getValue());
+
+        // 로깅 추가: CustomPage의 상태 확인
+        System.out.println("CustomPage category: " + customPage.getCategory());
+
+        // ApiResponse로 반환
+        return ApiResponse.ok("음식점 목록을 성공적으로 조회했습니다.", customPage);
+    }
+
 //        Pageable pageable = PageRequest.of(page, size);
 //
 //        // 1. Restaurant 기준으로 페이징 처리된 데이터를 조회
@@ -259,7 +272,7 @@ public ApiResponse<Page<RestaurantSimpleInformation>> retrieveAll(int page, int
 //                groupedRestaurantList, pageable, restaurantPage.getTotalElements());
 
         // 4. 결과를 ApiResponse로 반환
-        return ApiResponse.ok("음식점 목록을 성공적으로 조회했습니다.", restaurantPage);
+//        return ApiResponse.ok("음식점 목록을 성공적으로 조회했습니다.", restaurantPage);
         // 1. 전체 데이터에서 이미지를 가지고 있는 데이터만 조회
 //        Page<RestaurantSimpleInformation> restaurantPage = restaurantRepository.findAllSimple(pageable);
 //
@@ -274,7 +287,7 @@ public ApiResponse<Page<RestaurantSimpleInformation>> retrieveAll(int page, int
 //
 //        // 4. 결과를 ApiResponse로 반환
 //        return ApiResponse.ok("이미지가 있는 음식점 목록을 성공적으로 조회했습니다.", pagedResult);
-    }
+//    }
 //    public List<RestaurantResponseDto> getAll() {
 //        List<Restaurant> restaurants = restaurantRepository.findAll();
 //        List<RestaurantResponseDto> dtos = new ArrayList<>();