[Refactor#216

src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java

@@ -1,5 +1,9 @@
 package com.back.domain.cocktail.dto;
 
+import com.back.domain.cocktail.service.CocktailService;
+
+import java.util.List;
+
 public record CocktailDetailResponseDto(
         Long cocktailId,
         String cocktailName,
@@ -9,7 +13,7 @@ public record CocktailDetailResponseDto(
         String alcoholBaseType,
         String cocktailImgUrl,
         String cocktailStory,
-        String ingredient,
+        List<CocktailService.IngredientDto> ingredient,
         String recipe
 ) {
 }

src/main/java/com/back/domain/cocktail/service/CocktailService.java

@@ -17,9 +17,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
@@ -33,93 +33,92 @@ public class CocktailService {
     @Transactional(readOnly = true)
     public Cocktail getCocktailById(Long id) {
 
-            return cocktailRepository.findById(id)
-                    .orElseThrow(() -> new IllegalArgumentException("User not found. id=" + id));
+        return cocktailRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Cocktail not found. id=" + id));
     }
 
-        // 칵테일 무한스크롤 조회
-        @Transactional(readOnly = true)
-        public List<CocktailSummaryResponseDto> getCocktails (Long lastId, Integer size)
-        { // 무한스크롤 조회, 클라이언트 쪽에서 lastId와 size 정보를 받음.(스크롤 이벤트)
-            int fetchSize = (size != null) ? size : DEFAULT_SIZE;
-
-            List<Cocktail> cocktails;
-            if (lastId == null) {
-                // 첫 요청 → 최신 데이터부터
-                cocktails = cocktailRepository.findAllByOrderByIdDesc(PageRequest.of(0, fetchSize));
-            } else {
-                // 무한스크롤 → 마지막 ID보다 작은 데이터 조회
-                cocktails = cocktailRepository.findByIdLessThanOrderByIdDesc(lastId, PageRequest.of(0, fetchSize));
-            }
-            return cocktails.stream()
-                    .map(c -> new CocktailSummaryResponseDto(c.getId(), c.getCocktailName(), c.getCocktailNameKo(), c.getCocktailImgUrl(), c.getAlcoholStrength().getDescription()))
-                    .collect(Collectors.toList());
+    // 칵테일 무한스크롤 조회
+    @Transactional(readOnly = true)
+    public List<CocktailSummaryResponseDto> getCocktails(Long lastId, Integer size) { // 무한스크롤 조회, 클라이언트 쪽에서 lastId와 size 정보를 받음.(스크롤 이벤트)
+        int fetchSize = (size != null) ? size : DEFAULT_SIZE;
+
+        List<Cocktail> cocktails;
+        if (lastId == null) {
+            // 첫 요청 → 최신 데이터부터
+            cocktails = cocktailRepository.findAllByOrderByIdDesc(PageRequest.of(0, fetchSize));
+        } else {
+            // 무한스크롤 → 마지막 ID보다 작은 데이터 조회
+            cocktails = cocktailRepository.findByIdLessThanOrderByIdDesc(lastId, PageRequest.of(0, fetchSize));
         }
+        return cocktails.stream()
+                .map(c -> new CocktailSummaryResponseDto(c.getId(), c.getCocktailName(), c.getCocktailNameKo(), c.getCocktailImgUrl(), c.getAlcoholStrength().getDescription()))
+                .collect(Collectors.toList());
+    }
 
-        // 칵테일 검색기능
-        @Transactional(readOnly = true)
-        public List<Cocktail> cocktailSearch (String keyword){
-            // cockTailName, ingredient이 하나만 있을 수도 있고 둘 다 있을 수도 있음
-            if (keyword == null || keyword.trim().isEmpty()) {
-                // 아무 검색어 없으면 전체 반환 처리
-                return cocktailRepository.findAll();
-            } else {
-                // 이름 또는 재료 둘 중 하나라도 매칭되면 결과 반환
-                return cocktailRepository.findByCocktailNameContainingIgnoreCaseOrIngredientContainingIgnoreCase(keyword, keyword);
-            }
+    // 칵테일 검색기능
+    @Transactional(readOnly = true)
+    public List<Cocktail> cocktailSearch(String keyword) {
+        // cockTailName, ingredient이 하나만 있을 수도 있고 둘 다 있을 수도 있음
+        if (keyword == null || keyword.trim().isEmpty()) {
+            // 아무 검색어 없으면 전체 반환 처리
+            return cocktailRepository.findAll();
+        } else {
+            // 이름 또는 재료 둘 중 하나라도 매칭되면 결과 반환
+            return cocktailRepository.findByCocktailNameContainingIgnoreCaseOrIngredientContainingIgnoreCase(keyword, keyword);
         }
+    }
 
-        // 칵테일 검색,필터기능
-        @Transactional(readOnly = true)
-        public List<CocktailSearchResponseDto> searchAndFilter (CocktailSearchRequestDto cocktailSearchRequestDto){
-            // 기본값 페이지/사이즈 정하기(PAGE 기본값 0, 사이즈 10)
-            int page = cocktailSearchRequestDto.getPage() != null && cocktailSearchRequestDto.getPage() >= 0
-                    ? cocktailSearchRequestDto.getPage() : 0;
-
-            int size = cocktailSearchRequestDto.getSize() != null && cocktailSearchRequestDto.getSize() > 0
-                    ? cocktailSearchRequestDto.getSize() : DEFAULT_SIZE;
-
-            // searchAndFilters에서 조회한 결과값을 pageResult에 저장.
-            Pageable pageable = PageRequest.of(page, size);
-
-            // 빈 리스트(null 또는 [])는 null로 변환
-            List<AlcoholStrength> strengths = CollectionUtils.isEmpty(cocktailSearchRequestDto.getAlcoholStrengths())
-                    ? null
-                    : cocktailSearchRequestDto.getAlcoholStrengths();
-
-            List<CocktailType> types = CollectionUtils.isEmpty(cocktailSearchRequestDto.getCocktailTypes())
-                    ? null
-                    : cocktailSearchRequestDto.getCocktailTypes();
-
-            List<AlcoholBaseType> bases = CollectionUtils.isEmpty(cocktailSearchRequestDto.getAlcoholBaseTypes())
-                    ? null
-                    : cocktailSearchRequestDto.getAlcoholBaseTypes();
-
-            // Repository 호출
-            Page<Cocktail> pageResult = cocktailRepository.searchWithFilters(
-                    cocktailSearchRequestDto.getKeyword(),
-                    strengths, // List<AlcoholStrength>
-                    types, // List<CocktailType>
-                    bases, // List<AlcoholBaseType>
-                    pageable
-            );
+    // 칵테일 검색,필터기능
+    @Transactional(readOnly = true)
+    public List<CocktailSearchResponseDto> searchAndFilter(CocktailSearchRequestDto cocktailSearchRequestDto) {
+        // 기본값 페이지/사이즈 정하기(PAGE 기본값 0, 사이즈 10)
+        int page = cocktailSearchRequestDto.getPage() != null && cocktailSearchRequestDto.getPage() >= 0
+                ? cocktailSearchRequestDto.getPage() : 0;
+
+        int size = cocktailSearchRequestDto.getSize() != null && cocktailSearchRequestDto.getSize() > 0
+                ? cocktailSearchRequestDto.getSize() : DEFAULT_SIZE;
+
+        // searchAndFilters에서 조회한 결과값을 pageResult에 저장.
+        Pageable pageable = PageRequest.of(page, size);
+
+        // 빈 리스트(null 또는 [])는 null로 변환
+        List<AlcoholStrength> strengths = CollectionUtils.isEmpty(cocktailSearchRequestDto.getAlcoholStrengths())
+                ? null
+                : cocktailSearchRequestDto.getAlcoholStrengths();
+
+        List<CocktailType> types = CollectionUtils.isEmpty(cocktailSearchRequestDto.getCocktailTypes())
+                ? null
+                : cocktailSearchRequestDto.getCocktailTypes();
+
+        List<AlcoholBaseType> bases = CollectionUtils.isEmpty(cocktailSearchRequestDto.getAlcoholBaseTypes())
+                ? null
+                : cocktailSearchRequestDto.getAlcoholBaseTypes();
+
+        // Repository 호출
+        Page<Cocktail> pageResult = cocktailRepository.searchWithFilters(
+                cocktailSearchRequestDto.getKeyword(),
+                strengths, // List<AlcoholStrength>
+                types, // List<CocktailType>
+                bases, // List<AlcoholBaseType>
+                pageable
+        );
 
-            //Cocktail 엔티티 → CocktailResponseDto 응답 DTO로 바꿔주는 과정
-            List<CocktailSearchResponseDto> resultDtos = pageResult.stream()
-                    .map(c -> new CocktailSearchResponseDto(
-                            c.getId(),
-                            c.getCocktailName(),
-                            c.getCocktailNameKo(),
-                            c.getAlcoholStrength().getDescription(),
-                            c.getCocktailType().getDescription(),
-                            c.getAlcoholBaseType().getDescription(),
-                            c.getCocktailImgUrl(),
-                            c.getCocktailStory()
-                    ))
-                    .collect(Collectors.toList());
-
-            return resultDtos;
-        }
+        //Cocktail 엔티티 → CocktailResponseDto 응답 DTO로 바꿔주는 과정
+        List<CocktailSearchResponseDto> resultDtos = pageResult.stream()
+                .map(c -> new CocktailSearchResponseDto(
+                        c.getId(),
+                        c.getCocktailName(),
+                        c.getCocktailNameKo(),
+                        c.getAlcoholStrength().getDescription(),
+                        c.getCocktailType().getDescription(),
+                        c.getAlcoholBaseType().getDescription(),
+                        c.getCocktailImgUrl(),
+                        c.getCocktailStory()
+                ))
+                .collect(Collectors.toList());
+
+        return resultDtos;
+    }
 
 //    private <T> List<T> nullIfEmpty(List<T> list) {
 //        return CollectionUtils.isEmpty(list) ? null : list;
@@ -132,7 +131,7 @@ public CocktailDetailResponseDto getCocktailDetailById(Long cocktailId) {
                 .orElseThrow(() -> new NoSuchElementException("칵테일을 찾을 수 없습니다. id: " + cocktailId));
 
         // ingredient 분수 변환
-        String formattedIngredient = convertFractions(cocktail.getIngredient());
+        List<IngredientDto> formattedIngredient = parseIngredients(convertFractions(cocktail.getIngredient()));
 
         return new CocktailDetailResponseDto(
                 cocktail.getId(),
@@ -171,4 +170,46 @@ private String convertFractions(String ingredient) {
 
         return ingredient;
     }
+
+    // Ingredient DTO
+    public record IngredientDto(
+            String ingredientName,
+            String amount,
+            String unit
+    ) {
+    }
+
+    private List<IngredientDto> parseIngredients(String ingredientStr) {
+        if (ingredientStr == null || ingredientStr.isBlank()) return Collections.emptyList();
+
+        List<IngredientDto> result = new ArrayList<>();
+        String[] items = ingredientStr.split(",\\s*");
+
+        for (String item : items) {
+            String[] parts = item.split(":");
+            if (parts.length != 2) continue;
+
+            String name = parts[0].trim();
+            String amountUnit = parts[1].trim();
+
+            // (숫자 + 선택적 분수) + (공백) + (단위)
+            Pattern pattern = Pattern.compile(
+                    "^([0-9]*\\s*[½⅓⅔¼¾⅛⅜⅝⅞]?)\\s*(.*)$",
+                    Pattern.UNICODE_CHARACTER_CLASS
+            );
+            Matcher matcher = pattern.matcher(amountUnit);
+
+            if (matcher.matches()) {
+                String amount = matcher.group(1).trim();
+                String unit = matcher.group(2).trim();
+
+                result.add(new IngredientDto(name, amount, unit));
+            } else {
+                // 패턴 매치 실패 시 전체를 amount로 처리
+                result.add(new IngredientDto(name, amountUnit, ""));
+            }
+        }
+
+        return result;
+    }
 }