Skip to content

[feat/#434] 조회수 버그 fix 및 로직 변경 #439

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
PicturePark1101 merged 5 commits into from
Jul 12, 2025
Merged

[feat/#434] 조회수 버그 fix 및 로직 변경 #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1950557
feat : 조회수 관련 스케줄러 비활성화 #434
PicturePark1101 Jul 12, 2025
82baf4b
fix : error fix - 조회수 지급시 트랜잭션 새로 열리도록 구성 #434
PicturePark1101 Jul 12, 2025
e213dbf
feat : 조회수 읽어오는 것 RDB에서 수행하도록 변경 #434
PicturePark1101 Jul 12, 2025
0f7cbb3
feat : 조회수 증가 jpql로 변경 #434
PicturePark1101 Jul 12, 2025
7feface
refactor : 불필요한 메소드 제거 #434
PicturePark1101 Jul 12, 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
2 changes: 1 addition & 1 deletion src/main/java/umc/th/juinjang/JuinjangApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.springframework.scheduling.annotation.EnableScheduling;

@SpringBootApplication
@EnableAsync
// @EnableAsync
@ImportAutoConfiguration({FeignAutoConfiguration.class})
@EnableScheduling
@EnableRetry
Expand Down
21 changes: 3 additions & 18 deletions src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import umc.th.juinjang.domain.note.shared.model.SharedNote;
import umc.th.juinjang.domain.pencil.used.model.UsedPencil;
import umc.th.juinjang.domain.report.model.Report;
import umc.th.juinjang.event.publisher.ApplicationRewardViewCountPublisherAdapter;

@Service
@Slf4j
Expand All @@ -51,17 +50,16 @@ public class SharedNoteQueryService {
private final LikedNoteFinder likedNoteFinder;
private final ChecklistAnswerFinder checklistAnswerFinder;
private final ViewCountService viewCountService;
private final ApplicationRewardViewCountPublisherAdapter applicationRewardViewCountPublisherAdapter;
private final ReportFinder reportFinder;

@Transactional(readOnly = true)
@Transactional
public SharedNoteGetResponse findSharedNote(Member member, Long sharedNoteId) {
SharedNote sharedNote = sharedNoteFinder.findByIdWithNoteAndAddress(sharedNoteId);
Limjang limjang = sharedNote.getLimjang();

boolean isBuyerOrOwner = getIsBuyerOrOwner(member, sharedNote);

long viewCount = getViewCountAndCheckReward(member, sharedNoteId, sharedNote);
long viewCount = viewCountService.getViewCount(member, sharedNote);

Integer countBuyer = makeBuyerCount(usedPencilFinder.countBySharedNoteId(sharedNoteId));
boolean isLiked = likedNoteFinder.existsByMemberAndSharedNote(member, sharedNote);
Expand All @@ -80,19 +78,6 @@ private boolean getIsBuyerOrOwner(Member requestMember, SharedNote sharedNote) {
sharedNote.getMember().getMemberId().equals(requestMember.getMemberId());
}

private long getViewCountAndCheckReward(Member member, Long sharedNoteId, SharedNote sharedNote) {
long viewCount = viewCountService.getRedisViewCount(sharedNote.getSharedNoteId());
if (!viewCountService.isDuplicate(member.getMemberId(), sharedNoteId)) {
viewCountService.increaseViewCount(sharedNoteId);
viewCount++;
viewCountService.recordViewerHistory(member.getMemberId(), sharedNoteId);

applicationRewardViewCountPublisherAdapter.checkViewCountRewardPolicy(sharedNote.getMember(),
sharedNote.getSharedNoteId(), viewCount);
}
return viewCount;
}

private Integer makeBuyerCount(int count) {
if (count >= 100) {
return 100;
Expand Down Expand Up @@ -128,7 +113,7 @@ public SharedNoteExploreGetResponse findExploreSharedNote(Member member, List<St
private Map<Long, Long> mapIdsAndViewcount(List<SharedNote> sharedNotes) {
return sharedNotes.stream().collect(Collectors.toMap(
SharedNote::getSharedNoteId,
it -> viewCountService.getRedisViewCount(it.getSharedNoteId())
SharedNote::getViewCount
));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public class SharedNoteUpdater {

private final SharedNoteRepository sharedNoteRepository;

void updateViewCount(long sharedNoteId, long addAmount) {
sharedNoteRepository.incrementViewCount(sharedNoteId, addAmount);
public void updateViewCount(long sharedNoteId) {
sharedNoteRepository.incrementViewCount(sharedNoteId);
}

public void incrementLikedCountById(Long sharedNoteId) {
Expand Down
44 changes: 15 additions & 29 deletions src/main/java/umc/th/juinjang/api/note/shared/service/ViewCountService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import umc.th.juinjang.common.redis.RedisKeyFactory;
import umc.th.juinjang.domain.member.model.Member;
import umc.th.juinjang.domain.note.shared.model.SharedNote;
import umc.th.juinjang.event.publisher.ApplicationRewardViewCountPublisherAdapter;

@Component
@RequiredArgsConstructor
Expand All @@ -18,6 +21,8 @@ public class ViewCountService {

private final RedisTemplate<String, String> redisTemplate;
private final SharedNoteFinder sharedNoteFinder;
private final SharedNoteUpdater sharedNoteUpdater;
private final ApplicationRewardViewCountPublisherAdapter applicationRewardViewCountPublisherAdapter;

public void recordViewerHistory(long memberId, long sharedNoteId) {
try {
Expand All @@ -28,14 +33,6 @@ public void recordViewerHistory(long memberId, long sharedNoteId) {
}
}

public void increaseViewCount(long sharedNoteId) {
try {
redisTemplate.opsForValue().increment(RedisKeyFactory.viewCountKey(sharedNoteId));
} catch (RedisConnectionFailureException | RedisSystemException e) {
log.error("Redis 조회수 증가 실패, sharedNoteId={}", sharedNoteId, e);
}
}

public boolean isDuplicate(long memberId, long sharedNoteId) {
try {
return Boolean.TRUE.equals(redisTemplate.hasKey(RedisKeyFactory.viewHistoryKey(sharedNoteId, memberId)));
Expand All @@ -45,29 +42,18 @@ public boolean isDuplicate(long memberId, long sharedNoteId) {
}
}

public Long getRedisViewCount(long sharedNoteId) {
public long getViewCount(Member member, SharedNote sharedNote) {
long sharedNoteId = sharedNote.getSharedNoteId();
long viewCount = sharedNoteFinder.findViewCountById(sharedNoteId);

String key = RedisKeyFactory.viewCountKey(sharedNoteId);
if (!isDuplicate(member.getMemberId(), sharedNoteId) && sharedNote.getDeletedAt() == null) {
sharedNoteUpdater.updateViewCount(sharedNoteId);
viewCount++;
recordViewerHistory(member.getMemberId(), sharedNoteId);

try {
Object value = redisTemplate.opsForValue().get(key);

if (value == null) {
Long viewCountFromDb = sharedNoteFinder.findViewCountById(sharedNoteId);

if (viewCountFromDb == null) {
log.warn("DB의 sharedNote 조회수가 null sharedNoteId={}", sharedNoteId);
viewCountFromDb = 0L;
}

redisTemplate.opsForValue().set(key, viewCountFromDb.toString());
return viewCountFromDb;
}

return Long.parseLong(value.toString());
} catch (RedisConnectionFailureException | RedisSystemException e) {
log.error("Redis 장애 발생, 기본값 반환 sharedNoteID={}", sharedNoteId, e);
return 0L;
applicationRewardViewCountPublisherAdapter.checkViewCountRewardPolicy(sharedNote.getMember(),
sharedNote.getSharedNoteId(), viewCount);
}
return viewCount;
}
}
76 changes: 0 additions & 76 deletions src/main/java/umc/th/juinjang/api/note/shared/service/ViewCountSyncScheduler.java
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion src/main/java/umc/th/juinjang/api/reward/service/RewardService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package umc.th.juinjang.api.reward.service;

import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import umc.th.juinjang.api.pencil.service.AcquiredPencilUpdater;
import umc.th.juinjang.api.pencilAccount.service.PencilAccountFinder;
import umc.th.juinjang.domain.member.model.Member;
Expand All @@ -16,6 +18,7 @@

@Component
@RequiredArgsConstructor
@Slf4j
public class RewardService {

private final AcquiredPencilUpdater acquiredPencilUpdater;
Expand All @@ -24,7 +27,7 @@ public class RewardService {
private final RewardFinder rewardFinder;
private final RewardUpdater rewardUpdater;

@Transactional
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void giveViewCountReward(Member member, Long sharedNoteId, Long milestone, Long rewardPencil) {

if (alreadyViewCountRewardEarned(RewardType.VIEWCOUNT, sharedNoteId, milestone)) {
Expand All @@ -37,6 +40,9 @@ public void giveViewCountReward(Member member, Long sharedNoteId, Long milestone
acquiredPencilUpdater.save(
createAcquiredPencil(member, sharedNoteId, milestone, rewardPencil));
rewardUpdater.save(createReward(member, sharedNoteId, milestone, rewardPencil));

log.info("유저에게 조회수 리워드 지급 완료: memberId={}, sharedNoteId={}, milestone={}, rewardPencil={}",
member.getMemberId(), sharedNoteId, milestone, rewardPencil);
}

private AcquiredPencil createAcquiredPencil(Member member, Long sharedNoteId, Long milestone, Long rewardPencil) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/umc/th/juinjang/domain/note/shared/model/SharedNote.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ public void updateDeletedAt(Timestamp deletedAt) {
this.deletedAt = deletedAt;
}

// 23년 12월 초반 임장
public String getPullPeriod() {
String shortYear = String.valueOf(this.year).substring(2);
return shortYear + "년 " + this.month + "월 " + this.period + " 임장";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public interface SharedNoteRepository extends JpaRepository<SharedNote, Long>, S
Optional<SharedNote> findByIdWithNoteAndAddress(@Param("sharedNoteId") Long sharedNoteId);

@Modifying
@Query("UPDATE SharedNote s SET s.viewCount = :updateViewCount WHERE s.sharedNoteId = :sharedNoteId")
void incrementViewCount(@Param("sharedNoteId") Long sharedNoteId, @Param("updateViewCount") Long updateViewCount);
@Query("UPDATE SharedNote s SET s.viewCount = s.viewCount + 1 WHERE s.sharedNoteId = :sharedNoteId")
void incrementViewCount(@Param("sharedNoteId") Long sharedNoteId);

@Modifying
@Query("UPDATE SharedNote sn SET sn.likeCount = sn.likeCount + 1 WHERE sn.sharedNoteId = :sharedNoteId")
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/umc/th/juinjang/event/subscriber/RewardViewCountEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ public class RewardViewCountEventListener {
private final ViewCountPolicy viewCountPolicy;
private final RewardService rewardService;

@Async
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
@Async
public void handleRewardViewCountEvent(RewardViewCountEvent rewardViewCountEvent) {

Long reward = viewCountPolicy.getRewardForExactMilestone(
rewardViewCountEvent.viewCount());
Long reward = viewCountPolicy.getRewardForExactMilestone(rewardViewCountEvent.viewCount());

if (reward == null) {
return;
Expand Down