feat/ #35 코드 리뷰 반영

Author: warcat12

src/main/java/com/closetnangam/be/domain/catalog/entity/Style.java

@@ -7,7 +7,9 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
 
+@BatchSize(size = 100)
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/com/closetnangam/be/domain/clothes/entity/Clothes.java

@@ -15,6 +15,7 @@
 import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
 import jakarta.persistence.Version;
+import org.hibernate.annotations.BatchSize;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -75,10 +76,12 @@ public class Clothes extends BaseEntity {
     @Column(nullable = false)
     private Long version;
 
+    @BatchSize(size = 100)
     @OrderBy("sortOrder ASC")
     @OneToMany(mappedBy = "clothes", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
     private List<ClothingColor> colorTags = new ArrayList<>();
 
+    @BatchSize(size = 100)
     @OrderBy("sortOrder ASC")
     @OneToMany(mappedBy = "clothes", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
     private List<ClothesStyleTag> styleTags = new ArrayList<>();

src/main/java/com/closetnangam/be/domain/clothes/repository/ClothesRepository.java

@@ -2,19 +2,6 @@
 
 import com.closetnangam.be.domain.clothes.entity.Clothes;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.Optional;
 
 public interface ClothesRepository extends JpaRepository<Clothes, Long> {
-
-    @Query("""
-            select c from Clothes c
-            left join fetch c.colorTags
-            left join fetch c.styleTags st
-            left join fetch st.style
-            where c.id = :clothesId
-            """)
-    Optional<Clothes> findByIdWithDetails(@Param("clothesId") Long clothesId);
 }

src/main/java/com/closetnangam/be/domain/clothes/repository/WardrobeClothesRepository.java

@@ -1,7 +1,7 @@
 package com.closetnangam.be.domain.clothes.repository;
 
 import com.closetnangam.be.domain.clothes.entity.WardrobeClothes;
-import com.closetnangam.be.domain.clothes.enums.SourceType;
+import com.closetnangam.be.domain.clothes.enums.OwnershipStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -14,44 +14,35 @@ public interface WardrobeClothesRepository extends JpaRepository<WardrobeClothes
     @Query("""
             select distinct wc from WardrobeClothes wc
             join fetch wc.clothes c
-            left join fetch c.colorTags
-            left join fetch c.styleTags st
-            left join fetch st.style
             join fetch wc.wardrobe w
             join fetch w.user
             where w.user.id = :userId
-              and c.sourceType = :sourceType
+              and wc.ownershipStatus = :ownershipStatus
             order by c.createdAt desc
             """)
-    List<WardrobeClothes> findAllByUserIdAndSourceType(
+    List<WardrobeClothes> findAllByUserIdAndOwnershipStatus(
             @Param("userId") Long userId,
-            @Param("sourceType") SourceType sourceType
+            @Param("ownershipStatus") OwnershipStatus ownershipStatus
     );
 
     @Query("""
             select distinct wc from WardrobeClothes wc
             join fetch wc.clothes c
-            left join fetch c.colorTags
-            left join fetch c.styleTags st
-            left join fetch st.style
             join fetch wc.wardrobe w
             join fetch w.user
             where w.user.id = :userId
-              and c.sourceType = :sourceType
+              and wc.ownershipStatus = :ownershipStatus
               and wc.favorite = true
             order by wc.updatedAt desc
             """)
-    List<WardrobeClothes> findFavoritesByUserIdAndSourceType(
+    List<WardrobeClothes> findFavoritesByUserIdAndOwnershipStatus(
             @Param("userId") Long userId,
-            @Param("sourceType") SourceType sourceType
+            @Param("ownershipStatus") OwnershipStatus ownershipStatus
     );
 
     @Query("""
             select wc from WardrobeClothes wc
             join fetch wc.clothes c
-            left join fetch c.colorTags
-            left join fetch c.styleTags st
-            left join fetch st.style
             join fetch wc.wardrobe w
             join fetch w.user
             where c.id = :clothesId

src/main/java/com/closetnangam/be/domain/clothes/service/ClothesService.java

@@ -47,25 +47,25 @@ public class ClothesService {
     private final WardrobeService wardrobeService;
 
     public List<ClothesResponse> getOwnedClothes(Long userId) {
-        return wardrobeClothesRepository.findAllByUserIdAndSourceType(userId, SourceType.OWNED).stream()
+        return wardrobeClothesRepository.findAllByUserIdAndOwnershipStatus(userId, OwnershipStatus.OWNED).stream()
                 .map(entry -> ClothesResponse.from(entry.getClothes(), entry))
                 .toList();
     }
 
     public List<ClothesResponse> getFavoriteOwnedClothes(Long userId) {
-        return wardrobeClothesRepository.findFavoritesByUserIdAndSourceType(userId, SourceType.OWNED).stream()
+        return wardrobeClothesRepository.findFavoritesByUserIdAndOwnershipStatus(userId, OwnershipStatus.OWNED).stream()
                 .map(entry -> ClothesResponse.from(entry.getClothes(), entry))
                 .toList();
     }
 
     public List<ClothesResponse> getWishlistClothes(Long userId) {
-        return wardrobeClothesRepository.findAllByUserIdAndSourceType(userId, SourceType.WISHLIST).stream()
+        return wardrobeClothesRepository.findAllByUserIdAndOwnershipStatus(userId, OwnershipStatus.WISHLIST).stream()
                 .map(entry -> ClothesResponse.from(entry.getClothes(), entry))
                 .toList();
     }
 
     public List<ClothesResponse> getFavoriteWishlistClothes(Long userId) {
-        return wardrobeClothesRepository.findFavoritesByUserIdAndSourceType(userId, SourceType.WISHLIST).stream()
+        return wardrobeClothesRepository.findFavoritesByUserIdAndOwnershipStatus(userId, OwnershipStatus.WISHLIST).stream()
                 .map(entry -> ClothesResponse.from(entry.getClothes(), entry))
                 .toList();
     }
@@ -226,7 +226,7 @@ public void deleteClothes(Long clothesId) {
     }
 
     private Clothes getClothesWithDetails(Long clothesId) {
-        return clothesRepository.findByIdWithDetails(clothesId)
+        return clothesRepository.findById(clothesId)
                 .orElseThrow(() -> new IllegalArgumentException("옷을 찾을 수 없습니다."));
     }
 

src/main/resources/db/migration.sql

@@ -0,0 +1,40 @@
+-- =====================================================================
+-- 마이그레이션: clothes 테이블 분리 (color, wardrobe 관계 테이블 이전)
+-- 실행 전 반드시 백업 후 진행하세요.
+-- =====================================================================
+
+-- 1. version 컬럼 추가 (낙관적 락)
+ALTER TABLE `clothes`
+    ADD COLUMN `version` BIGINT NOT NULL DEFAULT 0;
+
+-- 2. 기존 clothes.color → clothing_colors 백필
+--    (기존 테이블에 color VARCHAR 컬럼이 있었던 경우)
+-- INSERT INTO `clothing_colors` (clothes_id, color_code, color_role, sort_order, created_at, updated_at)
+-- SELECT id, color, 'PRIMARY', 0, NOW(), NOW()
+-- FROM `clothes`
+-- WHERE color IS NOT NULL;
+
+-- 3. 기존 clothes.wardrobe_id → wardrobe_clothes 백필
+--    (기존 테이블에 wardrobe_id, is_favorite 컬럼이 있었던 경우)
+-- INSERT INTO `wardrobe_clothes`
+--     (wardrobe_id, clothes_id, ownership_status, size, season, favorite,
+--      registration_source, user_image_url, created_at, updated_at)
+-- SELECT
+--     wardrobe_id,
+--     id,
+--     source_type,         -- 'OWNED' or 'WISHLIST'
+--     'FREE',              -- size 기본값 (실제 값으로 교체)
+--     NULL,                -- season
+--     COALESCE(is_favorite, 0),
+--     'MANUAL',
+--     image_url,
+--     NOW(),
+--     NOW()
+-- FROM `clothes`
+-- WHERE wardrobe_id IS NOT NULL;
+
+-- 4. 이전 완료 후 기존 컬럼 제거
+--    (데이터 검증 후 실행)
+-- ALTER TABLE `clothes` DROP COLUMN `color`;
+-- ALTER TABLE `clothes` DROP COLUMN `wardrobe_id`;
+-- ALTER TABLE `clothes` DROP COLUMN `is_favorite`;