Merge pull request #198 from marinesnow34/sync

Fix: 쿠폰 발급 synchronized 삭제
readyvery · Mar 12, 2024 · 837d5e6 · 837d5e6
2 parents 49e3dd3 + 0332921
commit 837d5e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/repository/CouponRepository.java b/src/main/java/com/readyvery/readyverydemo/domain/repository/CouponRepository.java
@@ -6,12 +6,14 @@
 import org.springframework.data.jpa.repository.Lock;
 
 import com.readyvery.readyverydemo.domain.Coupon;
+import com.readyvery.readyverydemo.domain.CouponDetail;
+import com.readyvery.readyverydemo.domain.UserInfo;
 
 import jakarta.persistence.LockModeType;
 
 public interface CouponRepository extends JpaRepository<Coupon, Long> {
 	@Lock(LockModeType.OPTIMISTIC)
 	Optional<Coupon> findById(Long id);
 
-	Long countByCouponDetailIdAndUserInfoId(Long couponDetailId, Long userInfoId);
+	Optional<Coupon> findByUserInfoAndCouponDetail(UserInfo userInfo, CouponDetail couponDetail);
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/src/coupon/CouponServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/coupon/CouponServiceImpl.java
@@ -19,6 +19,7 @@
 import com.readyvery.readyverydemo.src.coupon.dto.CouponMapper;
 import com.readyvery.readyverydemo.src.coupon.dto.CouponsRes;
 
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -36,7 +37,8 @@ public CouponsRes getCoupon(CustomUserDetails userDetails) {
 	}
 
 	@Override
-	public synchronized CouponIssueRes issueCoupon(CustomUserDetails userDetails, CouponIssueReq couponIssueReq) {
+	@Transactional
+	public CouponIssueRes issueCoupon(CustomUserDetails userDetails, CouponIssueReq couponIssueReq) {
 		CouponDetail couponDetail = getCouponDetail(couponIssueReq);
 		verifyCouponDetail(couponDetail, couponIssueReq);
 
@@ -52,7 +54,9 @@ public synchronized CouponIssueRes issueCoupon(CustomUserDetails userDetails, Co
 	}
 
 	private Long getIssuedCouponCount(UserInfo userInfo, CouponDetail couponDetail) {
-		return couponRepository.countByCouponDetailIdAndUserInfoId(couponDetail.getId(), userInfo.getId());
+		Coupon coupon = couponRepository.findByUserInfoAndCouponDetail(userInfo, couponDetail)
+			.orElseThrow(() -> new BusinessLogicException(ExceptionCode.COUPON_NOT_FOUND));
+		return coupon.getIssueCount() - coupon.getUseCount();
 	}
 
 	private void verifyCouponDetail(CouponDetail couponDetail, CouponIssueReq couponIssueReq) {