Skip to content

[배포] 조회 수 로직 관련 수정 #205

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
k9want merged 3 commits into from
Jan 21, 2025
Merged

[배포] 조회 수 로직 관련 수정 #205

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70a98af
Merge pull request #203 from TravelLaboratory/main
k9want Jan 21, 2025
cd108e6
fix: 내부 로직 수정
k9want Jan 21, 2025
e36975d
Merge branch 'dev' of https://github.com/TravelLaboratory/travel-labo…
k9want Jan 21, 2025
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
33 changes: 16 additions & 17 deletions ...avellaboratory/be/article/application/service/_schedule/ArticleScheduleReaderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import site.travellaboratory.be.review.domain.enums.ReviewStatus;
import site.travellaboratory.be.review.infrastructure.persistence.entity.ReviewEntity;
import site.travellaboratory.be.review.infrastructure.persistence.repository.ReviewJpaRepository;
import site.travellaboratory.be.user.infrastructure.persistence.entity.UserEntity;

@Service
@RequiredArgsConstructor
Expand All @@ -55,17 +56,30 @@ public ArticleScheduleReadDetailResponse readSchedulesDetail(Long userId, Long a
// 유효하지 않은 여행 계획을 조회할 경우
ArticleEntity articleEntity = getArticleEntityById(articleId);

UserEntity userEntity = articleEntity.getUserEntity();

// ReviewId 조회
Long reviewId = getReviewIdByArticleId(articleEntity.getId());

// 조회수 관련
recordViewCount(userId, articleId);
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
LocalDateTime endOfDay = LocalDate.now().atTime(LocalTime.MAX);

// 오늘 해당 사용자가 이미 조회했는지 확인
Optional<ArticleViewsEntity> optionalArticleViewsEntity = articleViewsJpaRepository.findByUserIdAndArticleIdAndCreatedAtBetween(
userId, articleId, startOfDay, endOfDay);

if (optionalArticleViewsEntity.isEmpty()) {
// 조회 기록이 없는 경우 새로 생성
ArticleViews articleViews = ArticleViews.create(userId, articleId);
articleViewsJpaRepository.save(ArticleViewsEntity.from(articleViews));
}

// 일정 리스트 조회
List<ArticleScheduleEntity> schedules = articleScheduleJpaRepository.findByArticleEntityAndStatusOrderBySortOrderAsc(
articleEntity, ArticleScheduleStatus.ACTIVE);

boolean isEditable = articleEntity.getUserEntity().getId().equals(userId);
boolean isEditable = userEntity.getId().equals(userId);

return ArticleScheduleReadDetailResponse.from(reviewId, isEditable, schedules);
}
Expand Down Expand Up @@ -149,21 +163,6 @@ private Stream<String> getPlaceNames(ArticleScheduleEntity schedule) {
return Stream.empty();
}

private void recordViewCount(Long userId, Long articleId) {
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
LocalDateTime endOfDay = LocalDate.now().atTime(LocalTime.MAX);

// 오늘 해당 사용자가 이미 조회했는지 확인
Optional<ArticleViewsEntity> optionalArticleViewsEntity = articleViewsJpaRepository.findByUserIdAndArticleIdAndCreatedAtBetween(
userId, articleId, startOfDay, endOfDay);

if (optionalArticleViewsEntity.isEmpty()) {
// 조회 기록이 없는 경우 새로 생성
ArticleViews articleViews = ArticleViews.create(userId, articleId);
articleViewsJpaRepository.save(ArticleViewsEntity.from(articleViews));
}
}

private ArticleEntity getArticleEntityById(Long articleId) {
return articleJpaRepository.findByIdAndStatus(articleId, ArticleStatus.ACTIVE)
.orElseThrow(
Expand Down
Loading