[BE] 상품과 판매 상품 간 엔티티 관계 오류 수정 및 상품 리펙토링

backend/JiShop/build.gradle

@@ -46,7 +46,7 @@ dependencies {
 
 	// Querydsl
 	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
-	annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
+	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
@@ -80,6 +80,9 @@ dependencies {
 	implementation 'org.springframework.session:spring-session-data-redis'
 	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 
+	// Apple Silicon native DNS resolver
+	implementation 'io.netty:netty-resolver-dns-native-macos:4.1.100.Final:osx-aarch_64'
+
 	// Logstash를 위한 logstash-logback-encoder
 //	implementation 'net.logstash.logback:logstash-logback-encoder:7.2'
 
@@ -97,3 +100,13 @@ dependencyManagement {
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+def generated = 'build/generated/sources/annotationProcessor/java/main'
+
+tasks.withType(JavaCompile).configureEach {
+	options.getGeneratedSourceOutputDirectory().set(file(generated))
+}
+
+clean {
+	delete file(generated)
+}

backend/JiShop/src/main/java/com/jishop/cart/dto/CartDetailResponse.java

@@ -29,37 +29,37 @@ public static CartDetailResponse from(
         return new CartDetailResponse(
                 cartId,
                 product.getId(),
-                product.getProduct().getName(),
+                product.getProduct().getProductInfo().getName(),
                 product.getOption() != null ? product.getOption().getOptionValue() : "기본옵션",
                 paymentPrice,
                 orderPrice,
                 discountPrice,
                 quantity,
                 paymentPrice * quantity,
-                product.getProduct().getMainImage(),
-                product.getProduct().getBrand(),
+                product.getProduct().getImage().getMainImage(),
+                product.getProduct().getProductInfo().getBrand(),
                 isExisted
         );
     }
 
     public static CartDetailResponse of(Cart cart, boolean isExisted) {
         SaleProduct saleProduct = cart.getSaleProduct();
-        int paymentPrice = saleProduct.getProduct().getDiscountPrice();
-        int orderPrice = saleProduct.getProduct().getOriginPrice();
+        int paymentPrice = saleProduct.getProduct().getProductInfo().getDiscountPrice();
+        int orderPrice = saleProduct.getProduct().getProductInfo().getOriginPrice();
         int discountPrice = orderPrice - paymentPrice;
 
         return new CartDetailResponse(
                 cart.getId(),
                 saleProduct.getId(),
-                saleProduct.getProduct().getName(),
+                saleProduct.getProduct().getProductInfo().getName(),
                 saleProduct.getOption() != null ? saleProduct.getOption().getOptionValue() : "기본옵션",
                 paymentPrice,
                 orderPrice,
                 discountPrice,
                 cart.getQuantity(),
                 paymentPrice * cart.getQuantity(),
-                saleProduct.getProduct().getMainImage(),
-                saleProduct.getProduct().getBrand(),
+                saleProduct.getProduct().getImage().getMainImage(),
+                saleProduct.getProduct().getProductInfo().getBrand(),
                 isExisted
         );
     }

backend/JiShop/src/main/java/com/jishop/cart/service/Impl/CartServiceImpl.java

@@ -133,15 +133,16 @@ public CartResponse getGuestCart(List<GuestCartRequest> guestCartRequests) {
                     return new CartDetailResponse(
                             null, //장바구니 ID는 null (비회원이니까)
                             saleProduct.getId(),
-                            saleProduct.getProduct().getName(),
+                            saleProduct.getProduct().getProductInfo().getName(),
                             saleProduct.getOption() != null ? saleProduct.getOption().getOptionValue() : "기본옵션",
-                            saleProduct.getProduct().getDiscountPrice(),
-                            saleProduct.getProduct().getOriginPrice(),
-                            saleProduct.getProduct().getOriginPrice() - saleProduct.getProduct().getDiscountPrice(),
+                            saleProduct.getProduct().getProductInfo().getDiscountPrice(),
+                            saleProduct.getProduct().getProductInfo().getOriginPrice(),
+                            saleProduct.getProduct().getProductInfo().getOriginPrice() -
+                                    saleProduct.getProduct().getProductInfo().getDiscountPrice(),
                             quantity,
-                            saleProduct.getProduct().getDiscountPrice() * quantity,
-                            saleProduct.getProduct().getMainImage(),
-                            saleProduct.getProduct().getBrand(),
+                            saleProduct.getProduct().getProductInfo().getDiscountPrice() * quantity,
+                            saleProduct.getProduct().getImage().getMainImage(),
+                            saleProduct.getProduct().getProductInfo().getBrand(),
                             false
                     );
                 })

backend/JiShop/src/main/java/com/jishop/category/controller/CategoryController.java

@@ -1,18 +1,17 @@
 package com.jishop.category.controller;
 
 import com.jishop.category.dto.CategoryResponse;
-import com.jishop.product.dto.response.ProductResponse;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.data.web.PagedModel;
 
 import java.util.List;
 
 @Tag(name = "카테고리 API")
 public interface CategoryController {
 
-    PagedModel<ProductResponse> getProductListByCategory(Long CategoryId, int page);
-
+    @Operation(summary = "최상위 카테고리의 ID와 이름 조회")
     List<CategoryResponse> getCategoryFilterInfo();
 
+    @Operation(summary = "해당 카테고리의 한단계 하위카테고리 ID 조회")
     List<CategoryResponse> getSubcategoriesByParentId(Long categoryId);
 }

backend/JiShop/src/main/java/com/jishop/category/controller/CategoryControllerImpl.java

@@ -2,9 +2,7 @@
 
 import com.jishop.category.dto.CategoryResponse;
 import com.jishop.category.service.CategoryService;
-import com.jishop.product.dto.response.ProductResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.web.PagedModel;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,17 +17,6 @@ public class CategoryControllerImpl implements CategoryController {
 
     private final CategoryService categoryService;
 
-    @Override
-    @GetMapping("/products")
-    public PagedModel<ProductResponse> getProductListByCategory(
-            @RequestParam(defaultValue = "50000000L") Long categoryId,
-            @RequestParam(defaultValue = "0") int page) {
-        if (page < 0 || page > 100) {page = 0;}
-
-        return categoryService.getProductsByCategory(categoryId, page);
-    }
-
-    // 진입 시점에 부르면 내려감 헤더용
     @Override
     @GetMapping("/root")
     public List<CategoryResponse> getCategoryFilterInfo() {

backend/JiShop/src/main/java/com/jishop/category/repository/CategoryRepository.java

@@ -17,21 +17,21 @@ public interface CategoryRepository extends JpaRepository<Category, String> {
 
     /**
      * 상위(1뎁스) 카테고리 ID로 그 하위(2,3뎁스) 카테고리 상품 목록 모두 조회
-     * @param CategoryId 1뎁스 카테고리 ID
+     * @param categoryId 1뎁스 카테고리 ID
      * @return 해당 카테고리에 속한 상품 페이지
      */
     @Query(value = "SELECT p FROM Product p " +
             "LEFT JOIN p.category c1 " +
             "LEFT JOIN Category c2 ON c1.parent = c2 " +
-            "WHERE c1.parent.currentId = :CategoryId OR " +
-            "c2.parent.currentId = :CategoryId",
+            "WHERE c1.parent.currentId = :categoryId OR " +
+            "c2.parent.currentId = :categoryId",
             countQuery = "SELECT COUNT(p) FROM Product p " +
                     "LEFT JOIN p.category c1 " +
                     "LEFT JOIN Category c2 ON c1.parent = c2 " +
-                    "WHERE c1.parent.currentId = :CategoryId OR " +
-                    "c2.parent.currentId = :CategoryId")
+                    "WHERE c1.parent.currentId = :categoryId OR " +
+                    "c2.parent.currentId = :categoryId")
     Page<Product> findProductsByCategoryWithAllDescendants(
-            @Param("CategoryId") Long CategoryId, Pageable pageable);
+            @Param("categoryId") Long categoryId, Pageable pageable);
 
     /**
      * 특정 카테고리의 모든 하위 카테고리 ID를 재귀적으로 조회

backend/JiShop/src/main/java/com/jishop/category/service/CategoryService.java

@@ -1,15 +1,11 @@
 package com.jishop.category.service;
 
 import com.jishop.category.dto.CategoryResponse;
-import com.jishop.product.dto.response.ProductResponse;
-import org.springframework.data.web.PagedModel;
 
 import java.util.List;
 
 public interface CategoryService {
 
-    PagedModel<ProductResponse> getProductsByCategory(Long categoryId, int page);
-
     List<CategoryResponse> getCategoryFilterInfo();
 
     List<CategoryResponse> getSubcategoriesByParentId(Long categoryId);

backend/JiShop/src/main/java/com/jishop/category/service/Impl/CategoryServiceImpl.java

@@ -4,42 +4,20 @@
 import com.jishop.category.dto.CategoryResponse;
 import com.jishop.category.repository.CategoryRepository;
 import com.jishop.category.service.CategoryService;
-import com.jishop.product.domain.Product;
-import com.jishop.product.dto.response.ProductResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.*;
-import org.springframework.data.web.PagedModel;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Slf4j
 @Service
-@Transactional
+@Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class CategoryServiceImpl implements CategoryService {
 
     private final CategoryRepository categoryRepository;
-//    private final CategoryRedisService categoryRedisService;
-
-    @Override
-    public PagedModel<ProductResponse> getProductsByCategory(Long categoryId, int page) {
-
-        Pageable pageable = PageRequest.of(page, 12, Sort.by(Sort.Direction.DESC, "wishListCount"));
-        Page<Product> productPage = categoryRepository.findProductsByCategoryWithAllDescendants(categoryId, pageable);
-
-        List<ProductResponse> productsResponse = productPage.getContent().stream()
-                .map(ProductResponse::from)
-                .toList();
-
-        return new PagedModel<>(new PageImpl<>(
-                productsResponse,
-                pageable,
-                productPage.getTotalElements()
-        ));
-    }
 
     @Override
     public List<CategoryResponse> getCategoryFilterInfo() {

backend/JiShop/src/main/java/com/jishop/logshop/dto/RecentProductResponse.java

@@ -39,14 +39,14 @@ public static class ProductResponse {
         public static ProductResponse from(Product product) {
             return new ProductResponse(
                     product.getId(),
-                    product.getName(),
-                    product.getMallSeq(),
-                    product.getBrand(),
-                    product.getDescription(),
-                    product.getOriginPrice(),
-                    product.getDiscountPrice(),
-                    product.getDiscountRate(),
-                    product.getMainImage()
+                    product.getProductInfo().getName(),
+                    product.getProductInfo().getMallSeq(),
+                    product.getProductInfo().getBrand(),
+                    product.getProductInfo().getDescription(),
+                    product.getProductInfo().getOriginPrice(),
+                    product.getProductInfo().getDiscountPrice(),
+                    product.getProductInfo().getDiscountRate(),
+                    product.getImage().getMainImage()
             );
         }
     }

backend/JiShop/src/main/java/com/jishop/option/dto/FashionClothesOptionResponse.java

@@ -8,29 +8,22 @@
 public record FashionClothesOptionResponse(
         List<ColorSizeOption> option
 ) {
-    public static FashionClothesOptionResponse from(List<Map<String, Object>> productOptions) {
+    public static FashionClothesOptionResponse from(List<SizeOption> productOptions) {
         if (productOptions == null || productOptions.isEmpty()) {
             return new FashionClothesOptionResponse(List.of());
         }
 
         Map<String, List<SizeOption>> fashionClothesOptions = new HashMap<>();
 
-        for (Map<String, Object> option : productOptions) {
-            String optionValue = (String) option.get("optionValue");
-            String[] colorAndSize = optionValue.split("/");
-
-            if (colorAndSize.length == 2) {
-                String color = colorAndSize[0];
-                String size = colorAndSize[1];
+        for (SizeOption option : productOptions) {
+            if (option.isValidOption()) {
+                String color = option.extractColor();
 
                 if (!fashionClothesOptions.containsKey(color)) {
                     fashionClothesOptions.put(color, new ArrayList<>());
                 }
-                SizeOption sizeOption = new SizeOption(
-                        (Long) option.get("saleProductId"),
-                        size,
-                        (int) option.get("optionExtra")
-                );
+
+                SizeOption sizeOption = option.withSize();
                 fashionClothesOptions.get(color).add(sizeOption);
             }
         }

backend/JiShop/src/main/java/com/jishop/option/dto/GeneralOptionResponse.java

@@ -2,19 +2,18 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public record GeneralOptionResponse(
         List<ProductOption> options
 ) {
-    public static GeneralOptionResponse from(final List<Map<String, Object>> productOptions) {
+    public static GeneralOptionResponse from(final List<SizeOption> productOptions) {
         final List<ProductOption> generalOptions = new ArrayList<>();
 
-        for (final Map<String, Object> option : productOptions) {
+        for (final SizeOption option : productOptions) {
             ProductOption productOption = new ProductOption(
-                    (Long) option.get("saleProductId"),
-                    (String) option.get("optionValue"),
-                    (int) option.get("optionExtra")
+                    option.saleProductId(),
+                    option.optionValue(),
+                    option.optionExtra()
             );
             generalOptions.add(productOption);
         }

backend/JiShop/src/main/java/com/jishop/option/dto/SizeOption.java

@@ -5,4 +5,25 @@ public record SizeOption(
         String optionValue,
         int optionExtra
 ) {
+    public boolean isValidOption() {
+        return (optionValue != null) && optionValue.split("/").length == 2;
+    }
+
+    public String extractColor() {
+        String[] colorAndSize = optionValue.split("/");
+        return colorAndSize[0];
+    }
+
+    public String extractSize() {
+        String[] colorAndSize = optionValue.split("/");
+        return colorAndSize[1];
+    }
+
+    public SizeOption withSize() {
+        return new SizeOption(
+                saleProductId(),
+                extractSize(),
+                optionExtra()
+        );
+    }
 }

backend/JiShop/src/main/java/com/jishop/order/domain/OrderDetail.java

@@ -53,8 +53,8 @@ public OrderDetail(Order order, String orderNumber, SaleProduct saleProduct, int
     }
 
     public static OrderDetail from(Order order, SaleProduct saleProduct, int quantity){
-        int orderPrice = saleProduct.getProduct().getOriginPrice();
-        int paymentPrice = saleProduct.getProduct().getDiscountPrice();
+        int orderPrice = saleProduct.getProduct().getProductInfo().getOriginPrice();
+        int paymentPrice = saleProduct.getProduct().getProductInfo().getDiscountPrice();
         int discountPrice = orderPrice - paymentPrice;
 
         if(saleProduct.getOption() != null){

backend/JiShop/src/main/java/com/jishop/order/dto/OrderProductResponse.java

@@ -20,7 +20,7 @@ public static OrderProductResponse from(OrderDetail detail, boolean canReview) {
         return new OrderProductResponse(
                 detail.getId(),
                 detail.getSaleProduct().getId(),
-                detail.getSaleProduct().getProduct().getMainImage(),
+                detail.getSaleProduct().getProduct().getImage().getMainImage(),
                 detail.getSaleProduct().getName(),
                 detail.getSaleProduct().getOption() != null ? detail.getSaleProduct().getOption().getOptionValue() : null,
                 detail.getPaymentPrice(),
@@ -29,7 +29,7 @@ public static OrderProductResponse from(OrderDetail detail, boolean canReview) {
                 detail.getQuantity(),
                 detail.getPaymentPrice() * detail.getQuantity(),
                 canReview,
-                detail.getSaleProduct().getProduct().getBrand()
+                detail.getSaleProduct().getProduct().getProductInfo().getBrand()
         );
     }
 }

backend/JiShop/src/main/java/com/jishop/order/service/impl/OrderGetServiceImpl.java

@@ -146,8 +146,8 @@ public CartResponse getCheckout(User user, List<OrderDetailRequest> orderDetailR
                             .map(OrderDetailRequest::quantity)
                             .orElseThrow(() -> new DomainException(ErrorType.INVALID_QUANTITY)); // 기본값은 1로 설정
 
-                    int paymentPrice = product.getProduct().getDiscountPrice();
-                    int orderPrice = product.getProduct().getOriginPrice();
+                    int paymentPrice = product.getProduct().getProductInfo().getDiscountPrice();
+                    int orderPrice = product.getProduct().getProductInfo().getOriginPrice();
                     int discountPrice = orderPrice - paymentPrice;
 
                     return CartDetailResponse.from(