Skip to content

fix: 추천 콘텐츠 DB 저장 로직 추가 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tjdtn0219 merged 2 commits into from
Nov 20, 2024
Merged

fix: 추천 콘텐츠 DB 저장 로직 추가 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b78f89
fix: 추천 콘텐츠 DB 저장 로직 추가
junseokkim Nov 20, 2024
63439c4
refactor: Style Check
tjdtn0219 Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/swm/betterlife/antifragile/domain/content/service/ContentQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import swm.betterlife.antifragile.common.entity.BaseTimeEntity;
import swm.betterlife.antifragile.common.exception.RecommendedContentNotFoundException;
import swm.betterlife.antifragile.domain.content.dto.response.ContentDetailResponse;
import swm.betterlife.antifragile.domain.content.dto.response.ContentListResponse;
Expand Down Expand Up @@ -35,7 +36,10 @@ public ContentListResponse getRecommendContents(String memberId, LocalDate date)
.map(RecommendContent::getContentUrl)
.toList();

List<Content> recommendContents = contentRepository.findByUrlIn(recommendContentUrls);
List<Content> recommendContents
= contentRepository.findByUrlIn(recommendContentUrls).stream()
.sorted(Comparator.comparing(BaseTimeEntity::getModifiedAt))
.toList();

return ContentListResponse.from(
recommendContents.stream()
Expand Down
29 changes: 27 additions & 2 deletions src/main/java/swm/betterlife/antifragile/domain/content/service/ContentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ public ContentListResponse saveRecommendContents(String memberId, LocalDate date
List<Content> recommendedContents
= getRecommendContentsByAnalysis(analysis, member, prompt);

List<Content> savedContents = saveOrUpdateContents(recommendedContents);
diaryAnalysisService.saveRecommendContents(analysis, savedContents);

return ContentListResponse.from(
recommendedContents.stream()
savedContents.stream()
.map(content -> ContentListResponse.ContentResponse.from(
content,
contentQueryService.getContentLikeNumber(content),
Expand Down Expand Up @@ -86,8 +89,12 @@ public ContentListResponse saveReRecommendContents(
= getRecommendContentsByAnalysis(analysis, member, prompt);
// TODO: 추후에 feedback을 통해서 재추천 컨텐츠를 가져와야 함

List<Content> savedContents = saveOrUpdateContents(recommendedContents);
diaryAnalysisService.saveRecommendContents(analysis, savedContents);


return ContentListResponse.from(
recommendedContents.stream()
savedContents.stream()
.map(content -> ContentListResponse.ContentResponse.from(
content,
contentQueryService.getContentLikeNumber(content),
Expand Down Expand Up @@ -143,7 +150,25 @@ private List<Content> getRecommendContentsByAnalysis(
}
}

private List<Content> saveOrUpdateContents(List<Content> recommendedContents) {
List<String> urls = recommendedContents.stream().map(Content::getUrl).toList();
Map<String, Content> existingContents = contentRepository.findByUrlIn(urls).stream()
.collect(Collectors.toMap(Content::getUrl, Function.identity()));
List<Content> toSaveContents = new ArrayList<>();
for (Content content : recommendedContents) {
Content existingContent = existingContents.get(content.getUrl());
if (existingContent != null) {
existingContent.updateContent(content);
toSaveContents.add(existingContent);
} else {
toSaveContents.add(content);
}
}
return contentRepository.saveAll(toSaveContents);
}

private void validateRecommendLimit(String memberId) {
memberService.decrementRemainRecommendNumber(memberId);
}

}
Loading