fix: 공감 매장 공감하기 트랜젝션 오류 처리

Author: 82everywin

src/main/java/com/appcenter/marketplace/domain/cheer/controller/CheerController.java

@@ -1,5 +1,6 @@
 package com.appcenter.marketplace.domain.cheer.controller;
 
+import com.appcenter.marketplace.domain.cheer.dto.CheerCountRes;
 import com.appcenter.marketplace.domain.cheer.service.CheerService;
 import com.appcenter.marketplace.global.common.CommonResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,15 +21,23 @@ public class CheerController {
 
     private final CheerService cheerService;
 
-    @Operation(summary = "공감탭 매장 공감하기", description = "임시 매장을 공감합니다. <br>" +
-            "공감권은 매일 1개씩 충전됩니다. 따라서, 1개의 매장을 공감하게 되면, 더이상 공감할 수 없습니다.( 에러 처리 (409) : 공감권이 소진되었습니다)")
+    @Operation(summary = "공감탭 매장 공감하기",
+            description = "임시 매장을 공감합니다. <br><br>" +
+                    "**공감권 정책** <br>" +
+                    "- 공감권은 매일 3개씩 충전됩니다. (개발 상태 : 10개) <br>" +
+                    "- 3개의 매장을 공감하게 되면, 더이상 공감할 수 없습니다. <br><br>" +
+                    "**성공 응답 (200 OK)** <br>" +
+                    "- 공감 완료 후 해당 매장의 총 공감 수(cheerCount)를 반환합니다. <br><br>" +
+                    "**에러 응답** <br>" +
+                    "- 409 Conflict: 이미 공감한 매장입니다. <br>" +
+                    "- 409 Conflict: 공감권이 소진되었습니다. <br>" +
+                    "- 404 Not Found: 존재하지 않는 매장입니다.")
     @PostMapping
-    public ResponseEntity<CommonResponse<Object>> createCheer(
+    public ResponseEntity<CommonResponse<CheerCountRes>> createCheer(
             @AuthenticationPrincipal UserDetails userDetails,
             @RequestParam Long tempMarketId
     ){
         Long memberId = Long.parseLong(userDetails.getUsername());
-        cheerService.cheerTempMarket(memberId, tempMarketId);
-        return ResponseEntity.ok(CommonResponse.from(CHEER_SUCCESS.getMessage()));
+        return ResponseEntity.ok(CommonResponse.from(CHEER_SUCCESS.getMessage(), cheerService.cheerTempMarket(memberId, tempMarketId)));
     }
 }

src/main/java/com/appcenter/marketplace/domain/cheer/dto/CheerCountRes.java

@@ -0,0 +1,21 @@
+package com.appcenter.marketplace.domain.cheer.dto;
+
+import com.appcenter.marketplace.domain.tempMarket.TempMarket;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class CheerCountRes {
+    private final Integer cheerCount;
+
+    @Builder
+    private CheerCountRes(Integer cheerCount) {
+        this.cheerCount = cheerCount;
+    }
+
+    public static CheerCountRes toDto(TempMarket tempMarket) {
+        return CheerCountRes.builder()
+                .cheerCount(tempMarket.getCheerCount())
+                .build();
+    }
+}

src/main/java/com/appcenter/marketplace/domain/cheer/service/CheerService.java

@@ -1,5 +1,7 @@
 package com.appcenter.marketplace.domain.cheer.service;
 
+import com.appcenter.marketplace.domain.cheer.dto.CheerCountRes;
+
 public interface CheerService {
-    void cheerTempMarket(Long memberId, Long marketId);
+    CheerCountRes cheerTempMarket(Long memberId, Long marketId);
 }

src/main/java/com/appcenter/marketplace/domain/cheer/service/impl/CheerServiceImpl.java

@@ -2,6 +2,7 @@
 
 import com.appcenter.marketplace.domain.cheer.Cheer;
 import com.appcenter.marketplace.domain.cheer.CheerRepository;
+import com.appcenter.marketplace.domain.cheer.dto.CheerCountRes;
 import com.appcenter.marketplace.domain.cheer.service.CheerService;
 import com.appcenter.marketplace.domain.member.Member;
 import com.appcenter.marketplace.domain.member.repository.MemberRepository;
@@ -26,26 +27,32 @@ public class CheerServiceImpl implements CheerService {
 
     @Override
     @Transactional
-    public void cheerTempMarket(Long memberId, Long marketId) {
+    public CheerCountRes cheerTempMarket(Long memberId, Long marketId) {
         TempMarket tempMarket = tempMarketRepository.findById(marketId).orElseThrow(()-> new CustomException(MARKET_NOT_EXIST));
         Member member = memberRepository.findById(memberId).orElseThrow(()-> new CustomException(MEMBER_NOT_EXIST));
 
+        // 1. 공감권 체크
         if(member.getCheerTicket() == 0){
             throw new CustomException(TICKET_SOLD_OUT);
         }
 
+        // 2. 이미 공감했는지 체크
         Optional<Cheer> isCheer = cheerRepository.findByMemberIdAndTempMarketId(memberId, marketId);
+        if(isCheer.isPresent()){
+            throw new CustomException(ALREADY_CHEERED);
+        }
 
-        if(!isCheer.isPresent()){
-            Cheer cheer = Cheer.builder()
-                    .member(member)
-                    .tempMarket(tempMarket)
-                    .build();
+        // 3. 공감 처리
+        Cheer cheer = Cheer.builder()
+                .member(member)
+                .tempMarket(tempMarket)
+                .build();
 
-            cheerRepository.save(cheer);
+        cheerRepository.save(cheer);
 
-            tempMarket.increaseCheerCount();
-            member.reduceTicket();
-        }
+        tempMarket.increaseCheerCount();
+        member.reduceTicket();
+
+        return CheerCountRes.toDto(tempMarket);
     }
 }

src/main/java/com/appcenter/marketplace/domain/member/dto/req/MemberLoginReq.java

@@ -20,7 +20,7 @@ public class MemberLoginReq {
     public Member toEntity(Long studentId) {
         return Member.builder()
                 .id(studentId)
-                .cheerTicket(1000) // 1로 수정 예정
+                .cheerTicket(3) // 3으로 최종 수정.
                 .role(Role.ROLE_USER)
                 .build();
     }

src/main/java/com/appcenter/marketplace/domain/member/repository/MemberRepositoryImpl.java

@@ -20,7 +20,7 @@ public class MemberRepositoryImpl implements MemberRepositoryCustom {
     public long resetCheerTickets() {
         return jpaQueryFactory
                 .update(member)
-                .set(member.cheerTicket, 1000) //1로 수정 예정
+                .set(member.cheerTicket, 10) // 공감권 10개로 수정
                 .execute();
     }
 

src/main/java/com/appcenter/marketplace/global/common/StatusCode.java

@@ -92,6 +92,7 @@ public enum StatusCode {
     COUPON_ALREADY_USED(CONFLICT, "쿠폰이 이미 사용되었습니댜."),
     COUPON_SOLD_OUT(CONFLICT, "쿠폰이 모두 소진되었습니다."),
     TICKET_SOLD_OUT(CONFLICT, "공감권이 소진되었습니다."),
+    ALREADY_CHEERED(CONFLICT, "이미 공감한 매장입니다."),
     /* 503 UNAVAILABLE : 서비스 이용 불가  */
     FCM_UNAVAILABLE(SERVICE_UNAVAILABLE, "알림 기능을 이용할 수 없습니다.");