Merge pull request #439 from Juinjang/feat/#434

PicturePark1101 · web-flow · commit e48226f4091c · 2025-07-13T00:20:08.000+09:00
[feat/#434] 조회수 버그 fix 및 로직 변경
diff --git a/src/main/java/umc/th/juinjang/JuinjangApplication.java b/src/main/java/umc/th/juinjang/JuinjangApplication.java
@@ -9,7 +9,7 @@
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-@EnableAsync
+// @EnableAsync
 @ImportAutoConfiguration({FeignAutoConfiguration.class})
 @EnableScheduling
 @EnableRetry
diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java b/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java
@@ -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
@@ -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);
@@ -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;
@@ -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
 		));
 	}
 
diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteUpdater.java b/src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteUpdater.java
@@ -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) {
diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/ViewCountService.java b/src/main/java/umc/th/juinjang/api/note/shared/service/ViewCountService.java
@@ -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
@@ -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 {
@@ -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)));
@@ -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;
 	}
 }
diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/ViewCountSyncScheduler.java b/src/main/java/umc/th/juinjang/api/note/shared/service/ViewCountSyncScheduler.java
diff --git a/src/main/java/umc/th/juinjang/api/reward/service/RewardService.java b/src/main/java/umc/th/juinjang/api/reward/service/RewardService.java
@@ -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;
@@ -16,6 +18,7 @@
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class RewardService {
 
 	private final AcquiredPencilUpdater acquiredPencilUpdater;
@@ -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)) {
@@ -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) {
diff --git a/src/main/java/umc/th/juinjang/domain/note/shared/model/SharedNote.java b/src/main/java/umc/th/juinjang/domain/note/shared/model/SharedNote.java
@@ -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 + " 임장";
diff --git a/src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteRepository.java b/src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteRepository.java
@@ -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")
diff --git a/src/main/java/umc/th/juinjang/event/subscriber/RewardViewCountEventListener.java b/src/main/java/umc/th/juinjang/event/subscriber/RewardViewCountEventListener.java
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class SharedNoteUpdater {`
`12`	`12`
`13`	`13`	`private final SharedNoteRepository sharedNoteRepository;`
`14`	`14`
`15`		`- void updateViewCount(long sharedNoteId, long addAmount) {`
`16`		`- sharedNoteRepository.incrementViewCount(sharedNoteId, addAmount);`
	`15`	`+ public void updateViewCount(long sharedNoteId) {`
	`16`	`+ sharedNoteRepository.incrementViewCount(sharedNoteId);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void incrementLikedCountById(Long sharedNoteId) {`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ public void updateDeletedAt(Timestamp deletedAt) {`
`97`	`97`	`this.deletedAt = deletedAt;`
`98`	`98`	`}`
`99`	`99`
`100`		`- // 23년 12월 초반 임장`
`101`	`100`	`public String getPullPeriod() {`
`102`	`101`	`String shortYear = String.valueOf(this.year).substring(2);`
`103`	`102`	`return shortYear + "년 " + this.month + "월 " + this.period + " 임장";`