feat: #400 큐레이션 API 프론트 피드백 반영

src/main/java/com/umc/linkyou/converter/CurationConverter.java

@@ -1,21 +1,90 @@
 package com.umc.linkyou.converter;
 
+import com.umc.linkyou.domain.Curation;
+import com.umc.linkyou.domain.CurationSectionInfo;
+import com.umc.linkyou.domain.Linku;
+import com.umc.linkyou.domain.classification.Category;
 import com.umc.linkyou.domain.classification.Domain;
+import com.umc.linkyou.domain.enums.CurationLinkuType;
 import com.umc.linkyou.domain.mapping.CurationLinku;
+import com.umc.linkyou.domain.mapping.UsersLinku;
+import com.umc.linkyou.web.dto.curation.CurationDetailResponse;
+import com.umc.linkyou.web.dto.curation.CurationLatestResponse;
+import com.umc.linkyou.web.dto.curation.CurationListResponse;
+import com.umc.linkyou.web.dto.curation.CurationSectionResponse;
 import com.umc.linkyou.web.dto.curation.RecommendedLinkResponse;
 
+import java.util.List;
+
 public class CurationConverter {
 
     public static RecommendedLinkResponse toRecommendedLinkResponse(CurationLinku entity) {
-        Domain domain = entity.getUsersLinku() != null
-                ? entity.getUsersLinku().getLinku().getDomain()
-                : null;
+        UsersLinku usersLinku = entity.getUsersLinku();
+        Linku linku = usersLinku != null ? usersLinku.getLinku() : null;
+        Domain domain = linku != null ? linku.getDomain() : null;
+        Category category = linku != null ? linku.getCategory() : null;
         return RecommendedLinkResponse.builder()
+                .userLinkuId(usersLinku != null ? usersLinku.getUserLinkuId() : null)
                 .url(entity.getUrl())
                 .title(entity.getTitle())
                 .domain(domain != null ? domain.getName() : null)
                 .domainImageUrl(domain != null ? domain.getImageUrl() : null)
                 .imageUrl(entity.getImageUrl())
+                .categories(category != null ? List.of(category.getCategoryName()) : null)
+                .type(CurationLinkuType.INTERNAL)
+                .build();
+    }
+
+    // 외부 추천: 도메인 브랜딩(Domain)이 URL 기반 별도 조회로 해석된 경우
+    public static RecommendedLinkResponse toRecommendedLinkResponse(
+            String url, String title, String imageUrl, Domain domain) {
+        return RecommendedLinkResponse.builder()
+                .url(url)
+                .title(title)
+                .imageUrl(imageUrl)
+                .domain(domain != null ? domain.getName() : null)
+                .domainImageUrl(domain != null ? domain.getImageUrl() : null)
+                .type(CurationLinkuType.EXTERNAL)
+                .build();
+    }
+
+    // 연도별 히스토리 항목 변환 (해당 월에 큐레이션이 없으면 month만 채운다)
+    public static CurationListResponse toCurationListResponse(Curation curation, String month, String thumbnailUrl) {
+        if (curation == null) {
+            return CurationListResponse.builder().month(month).build();
+        }
+        return CurationListResponse.builder()
+                .curationId(curation.getCurationId())
+                .month(month)
+                .thumbnailUrl(thumbnailUrl)
+                .build();
+    }
+
+    public static CurationLatestResponse toCurationLatestResponse(Curation curation, String thumbnailUrl) {
+        return CurationLatestResponse.builder()
+                .curationId(curation.getCurationId())
+                .month(curation.getBaseMonth())
+                .thumbnailUrl(thumbnailUrl)
+                .build();
+    }
+
+    public static CurationSectionResponse toCurationSectionResponse(CurationSectionInfo info) {
+        return CurationSectionResponse.builder()
+                .section(info.getSectionNumber())
+                .title(info.getTitle())
+                .description(info.getDescription())
+                .imageUrl(info.getImageUrl())
+                .build();
+    }
+
+    public static CurationDetailResponse toCurationDetailResponse(Curation curation) {
+        return CurationDetailResponse.builder()
+                .curationId(curation.getCurationId())
+                .month(curation.getBaseMonth())
+                .headerMent(curation.getHeaderMent())
+                .footerMent(curation.getFooterMent())
+                .mentReady(curation.getHeaderMent() != null && !curation.getHeaderMent().isBlank()
+                        && curation.getFooterMent() != null && !curation.getFooterMent().isBlank())
                 .build();
     }
 }

src/main/java/com/umc/linkyou/domain/enums/CurationLinkuType.java

@@ -1,6 +1,6 @@
 package com.umc.linkyou.domain.enums;
 
 public enum CurationLinkuType {
-    RECOMMENDED,
+    INTERNAL,
     EXTERNAL
 }

src/main/java/com/umc/linkyou/domain/mapping/CurationLinku.java

@@ -2,6 +2,7 @@
 
 import com.umc.linkyou.domain.Curation;
 import com.umc.linkyou.domain.enums.CurationLinkuType;
+import com.umc.linkyou.utils.UrlUtils;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
@@ -31,7 +32,7 @@ public class CurationLinku {
 
     @Column(name = "type", nullable = false)
     @Enumerated(EnumType.STRING)
-    private CurationLinkuType type; // RECOMMENDED / EXTERNAL
+    private CurationLinkuType type; // INTERNAL / EXTERNAL
 
     // 외부추천용 최소 컬럼
     @Column(name = "url", columnDefinition = "TEXT")
@@ -43,15 +44,12 @@ public class CurationLinku {
     @Column(name = "image_url", length = 1024)
     private String imageUrl;
 
-    @Column(name = "url_normalized", length = 2048, insertable = false, updatable = false)
-    private String urlNormalized;
-
     // 팩토리 메서드
     public static CurationLinku ofExternal(Curation curation, String url, String title, String imageUrl) {
         return CurationLinku.builder()
                 .curation(curation)
                 .type(CurationLinkuType.EXTERNAL)
-                .url(url)
+                .url(UrlUtils.normalizeUrl(url))
                 .title(title)
                 .imageUrl(imageUrl)
                 .build();
@@ -61,7 +59,7 @@ public static CurationLinku ofInternal(Curation curation, UsersLinku usersLinku,
         return CurationLinku.builder()
                 .curation(curation)
                 .usersLinku(usersLinku)
-                .type(CurationLinkuType.RECOMMENDED)
+                .type(CurationLinkuType.INTERNAL)
                 .url(usersLinku.getLinku().getLinkuUrl())
                 .title(usersLinku.getLinku().getTitle())
                 .imageUrl(imageUrl)

src/main/java/com/umc/linkyou/repository/UserLinkuRepository/UsersLinkuRepository.java

@@ -43,6 +43,14 @@ List<UsersLinku> findAllByUserIdAndCreatedAtBetween(
 
     List<UsersLinku> findByUser_IdAndLastViewedAtIsNull(Long userId);
 
+    // 후보 URL 중 사용자가 이미 저장한 것을 찾는다 (외부 추천에 userLinkuId를 채워주기 위함)
+    @Query("""
+            SELECT ul FROM UsersLinku ul
+            JOIN FETCH ul.linku l
+            WHERE ul.user.id = :userId AND l.linkuUrl IN :urls
+            """)
+    List<UsersLinku> findByUserIdAndLinkuUrlIn(@Param("userId") Long userId, @Param("urls") List<String> urls);
+
     // 해당 기간 유저가 저장한 링크의 감정별 저장 횟수
     @Query("""
             SELECT new com.umc.linkyou.repository.dto.TagCountRow(ul.emotion.emotionId, COUNT(ul))

src/main/java/com/umc/linkyou/repository/curationRepository/CurationLinkuRepository.java

@@ -24,6 +24,7 @@ List<CurationLinku> findByCurationIdAndType(
             JOIN FETCH cl.usersLinku ul
             JOIN FETCH ul.linku l
             LEFT JOIN FETCH l.domain
+            LEFT JOIN FETCH l.category
             WHERE cl.curation.curationId = :curationId AND cl.type = :type
             """)
     List<CurationLinku> findWithDomainByCurationIdAndType(

src/main/java/com/umc/linkyou/repository/curationRepository/CurationSectionInfoRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface CurationSectionInfoRepository extends JpaRepository<CurationSectionInfo, Long> {
 
@@ -15,4 +16,6 @@ public interface CurationSectionInfoRepository extends JpaRepository<CurationSec
             ORDER BY cs.sectionNumber ASC
             """)
     List<CurationSectionInfo> findAllByMonth(@Param("month") String month);
+
+    Optional<CurationSectionInfo> findByMonthAndSectionNumber(String month, int sectionNumber);
 }

src/main/java/com/umc/linkyou/service/curation/CurationServiceImpl.java

@@ -2,10 +2,11 @@
 
 import com.umc.linkyou.apiPayload.code.status.user.UserErrorStatus;
 import com.umc.linkyou.apiPayload.exception.GeneralException;
+import com.umc.linkyou.converter.CurationConverter;
 import com.umc.linkyou.domain.Curation;
+import com.umc.linkyou.domain.CurationSectionInfo;
 import com.umc.linkyou.domain.Users;
 import com.umc.linkyou.service.curation.ment.CurationMentMaterializer;
-import com.umc.linkyou.service.curation.utils.ThumbnailUrlProvider;
 import com.umc.linkyou.service.curation.recommend.external.ExternalRecommendMaterializer;
 import com.umc.linkyou.service.curation.recommend.internal.InternalRecommendMaterializer;
 import com.umc.linkyou.apiPayload.code.status.curation.CurationErrorStatus;
@@ -38,7 +39,6 @@ public class CurationServiceImpl implements CurationService {
     private final UserRepository userRepository;
     private final CurationRepository curationRepository;
     private final CurationSectionInfoRepository curationSectionInfoRepository;
-    private final ThumbnailUrlProvider thumbnailUrlProvider;
     private final ExternalRecommendMaterializer externalRecommendMaterializer;
     private final InternalRecommendMaterializer internalRecommendMaterializer;
     private final CurationMentMaterializer curationMentMaterializer;
@@ -90,17 +90,8 @@ public List<CurationListResponse> getCurationList(Long userId, int year) {
         for (int m = 1; m <= 12; m++) {
             String month = String.format("%d-%02d", year, m);
             Curation c = existing.get(month);
-            if (c != null) {
-                result.add(CurationListResponse.builder()
-                        .curationId(c.getCurationId())
-                        .month(month)
-                        .thumbnailUrl(thumbnailUrlProvider.getUrlForMonth(month))
-                        .build());
-            } else {
-                result.add(CurationListResponse.builder()
-                        .month(month)
-                        .build());
-            }
+            String thumbnailUrl = c != null ? getSection1ImageUrl(month) : null;
+            result.add(CurationConverter.toCurationListResponse(c, month, thumbnailUrl));
         }
         return result;
     }
@@ -110,11 +101,14 @@ public List<CurationListResponse> getCurationList(Long userId, int year) {
     @Transactional(readOnly = true)
     public Optional<CurationLatestResponse> getLatestCuration(Long userId) {
         return curationRepository.findLatestByUserId(userId)
-                .map(curation -> CurationLatestResponse.builder()
-                        .curationId(curation.getCurationId())
-                        .month(curation.getBaseMonth())
-                        .thumbnailUrl(thumbnailUrlProvider.getUrlForMonth(curation.getBaseMonth()))
-                        .build());
+                .map(curation -> CurationConverter.toCurationLatestResponse(
+                        curation, getSection1ImageUrl(curation.getBaseMonth())));
+    }
+
+    private String getSection1ImageUrl(String month) {
+        return curationSectionInfoRepository.findByMonthAndSectionNumber(month, 1)
+                .map(CurationSectionInfo::getImageUrl)
+                .orElse(null);
     }
 
     // 월별 섹션 정보 조회 (제목, 설명, 대표 이미지)
@@ -124,12 +118,7 @@ public List<CurationSectionResponse> getCurationSections(String month) {
         return curationSectionInfoRepository
                 .findAllByMonth(month)
                 .stream()
-                .map(s -> CurationSectionResponse.builder()
-                        .section(s.getSectionNumber())
-                        .title(s.getTitle())
-                        .description(s.getDescription())
-                        .imageUrl(s.getImageUrl())
-                        .build())
+                .map(CurationConverter::toCurationSectionResponse)
                 .toList();
     }
 
@@ -147,13 +136,6 @@ public CurationDetailResponse getCurationDetail(Long userId, Long curationId) {
             throw new GeneralException(CurationErrorStatus._CURATION_FORBIDDEN);
         }
 
-        return CurationDetailResponse.builder()
-                .curationId(curation.getCurationId())
-                .month(curation.getBaseMonth())
-                .headerMent(curation.getHeaderMent())
-                .footerMent(curation.getFooterMent())
-                .mentReady(curation.getHeaderMent() != null && !curation.getHeaderMent().isBlank()
-                        && curation.getFooterMent() != null && !curation.getFooterMent().isBlank())
-                .build();
+        return CurationConverter.toCurationDetailResponse(curation);
     }
 }

src/main/java/com/umc/linkyou/service/curation/recommend/CurationRecommendBuilderServiceImpl.java

@@ -5,6 +5,8 @@
 import com.umc.linkyou.converter.CurationConverter;
 import com.umc.linkyou.domain.Curation;
 import com.umc.linkyou.domain.enums.CurationLinkuType;
+import com.umc.linkyou.domain.mapping.UsersLinku;
+import com.umc.linkyou.repository.UserLinkuRepository.UsersLinkuRepository;
 import com.umc.linkyou.repository.curationRepository.CurationLinkuRepository;
 import com.umc.linkyou.repository.curationRepository.CurationRepository;
 import com.umc.linkyou.service.curation.recommend.external.ExternalRecommendMaterializer;
@@ -17,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -29,6 +32,7 @@ public class CurationRecommendBuilderServiceImpl implements CurationRecommendBui
 
     private final CurationRepository curationRepository;
     private final CurationLinkuRepository curationLinkuRepository;
+    private final UsersLinkuRepository usersLinkuRepository;
     private final ExternalRecommendReader externalRecommendReader;
     private final InternalRecommendMaterializer internalRecommendMaterializer;
     private final ExternalRecommendMaterializer externalRecommendMaterializer;
@@ -43,7 +47,7 @@ public List<RecommendedLinkResponse> buildRecommendedLinks(Long userId, Long cur
         }
 
         List<RecommendedLinkResponse> internal = curationLinkuRepository
-                .findWithDomainByCurationIdAndType(curationId, CurationLinkuType.RECOMMENDED)
+                .findWithDomainByCurationIdAndType(curationId, CurationLinkuType.INTERNAL)
                 .stream()
                 .map(CurationConverter::toRecommendedLinkResponse)
                 .limit(INTERNAL_LIMIT)
@@ -59,6 +63,21 @@ public List<RecommendedLinkResponse> buildRecommendedLinks(Long userId, Long cur
             externalRecommendMaterializer.generateExternalAsync(curationId);
         }
 
+        // 외부 추천이 이미 저장된 링크와 같은 URL이면, 외부 추천인 채로 유지하되 userLinkuId만 채워준다
+        if (!external.isEmpty()) {
+            List<UsersLinku> savedMatches = usersLinkuRepository.findByUserIdAndLinkuUrlIn(
+                    userId, external.stream().map(RecommendedLinkResponse::getUrl).toList());
+            if (!savedMatches.isEmpty()) {
+                Map<String, Long> urlToUserLinkuId = savedMatches.stream()
+                        .collect(Collectors.toMap(ul -> ul.getLinku().getLinkuUrl(), UsersLinku::getUserLinkuId));
+                external = external.stream()
+                        .map(ex -> urlToUserLinkuId.containsKey(ex.getUrl())
+                                ? ex.toBuilder().userLinkuId(urlToUserLinkuId.get(ex.getUrl())).build()
+                                : ex)
+                        .toList();
+            }
+        }
+
         List<RecommendedLinkResponse> result = new ArrayList<>(INTERNAL_LIMIT + EXTERNAL_LIMIT);
         result.addAll(internal);
 

src/main/java/com/umc/linkyou/service/curation/recommend/external/ExternalRecommendReader.java

@@ -1,5 +1,6 @@
 package com.umc.linkyou.service.curation.recommend.external;
 
+import com.umc.linkyou.converter.CurationConverter;
 import com.umc.linkyou.domain.classification.Domain;
 import com.umc.linkyou.domain.enums.CurationLinkuType;
 import com.umc.linkyou.domain.mapping.CurationLinku;
@@ -47,11 +48,8 @@ public List<RecommendedLinkResponse> read(Long curationId) {
 
         if (tails.isEmpty()) {
             return items.stream()
-                    .map(item -> RecommendedLinkResponse.builder()
-                            .url(item.url())
-                            .title(item.title())
-                            .imageUrl(item.imageUrl())
-                            .build())
+                    .map(item -> CurationConverter.toRecommendedLinkResponse(
+                            item.url(), item.title(), item.imageUrl(), null))
                     .toList();
         }
 
@@ -65,13 +63,8 @@ public List<RecommendedLinkResponse> read(Long curationId) {
                             .filter(Objects::nonNull)
                             .findFirst()
                             .orElse(null);
-                    return RecommendedLinkResponse.builder()
-                            .url(item.url())
-                            .title(item.title())
-                            .domain(domain != null ? domain.getName() : null)
-                            .domainImageUrl(domain != null ? domain.getImageUrl() : null)
-                            .imageUrl(item.imageUrl())
-                            .build();
+                    return CurationConverter.toRecommendedLinkResponse(
+                            item.url(), item.title(), item.imageUrl(), domain);
                 })
                 .toList();
     }