Refctor/299 event domain security

src/main/java/com/soongsil/CoffeeChat/domain/assignedcoupon/service/AssignedCouponService.java

@@ -71,7 +71,7 @@ public AssignedCouponRegisterResult registerTargets(List<AssignedCouponTargetReq
             }
 
             String phoneNum = normalizePhoneNum(target.phoneNum());
-            String name = target.name();
+            String name = target.name() != null ? target.name().trim() : null;
 
             // name, phoneNum blank 검증
             if (phoneNum == null
@@ -96,7 +96,7 @@ public AssignedCouponRegisterResult registerTargets(List<AssignedCouponTargetReq
                         .putAll(
                                 targetKey,
                                 Map.of(
-                                        "name", target.name(),
+                                        "name", name,
                                         "status", "TARGETED",
                                         "registeredAt", LocalDateTime.now().toString()));
                 newCount++;

src/main/java/com/soongsil/CoffeeChat/domain/event/controller/EventController.java

@@ -2,6 +2,9 @@
 
 import java.util.Map;
 
+import com.soongsil.CoffeeChat.domain.event.dto.EventCouponIssueRequest;
+import com.soongsil.CoffeeChat.domain.event.dto.EventVerifyQrRequest;
+import jakarta.validation.Valid;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
@@ -82,8 +85,9 @@ public ResponseEntity<byte[]> generateQr(
                     "EVENT_403_2: 멘티가 아님 | EVENT_403_3: 타인 커피챗 스캔 | EVENT_403_4: 참여 횟수 초과(2회)",
             content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     public ResponseEntity<ApiResponse<Void>> verifyQr(
-            @RequestParam String qrToken, Authentication authentication) {
-        couponService.verifyQrToken(authentication.getName(), qrToken);
+            @Valid @RequestBody EventVerifyQrRequest request,
+            Authentication authentication) {
+        couponService.verifyQrToken(authentication.getName(), request.qrToken());
         return ResponseEntity.ok(ApiResponse.onSuccessOK(null));
     }
 
@@ -112,11 +116,10 @@ public ResponseEntity<ApiResponse<Void>> verifyQr(
             description = "EVENT_503: 동시성 처리 오류",
             content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     public ResponseEntity<ApiResponse<Map<String, String>>> issueCoupon(
-            @RequestParam String qrToken,
-            @RequestParam String storePin,
+            @Valid @RequestBody EventCouponIssueRequest request,
             Authentication authentication) {
         String couponNumber =
-                couponService.verifyPinAndIssueCoupon(authentication.getName(), qrToken, storePin);
+                couponService.verifyPinAndIssueCoupon(authentication.getName(), request.qrToken(), request.storePin());
         return ResponseEntity.ok(ApiResponse.onSuccessOK(Map.of("couponNumber", couponNumber)));
     }
 

src/main/java/com/soongsil/CoffeeChat/domain/event/dto/EventCouponIssueRequest.java

@@ -0,0 +1,9 @@
+package com.soongsil.CoffeeChat.domain.event.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record EventCouponIssueRequest (
+        @NotBlank String qrToken,
+        @NotBlank String storePin
+){
+}

src/main/java/com/soongsil/CoffeeChat/domain/event/dto/EventVerifyQrRequest.java

@@ -0,0 +1,8 @@
+package com.soongsil.CoffeeChat.domain.event.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record EventVerifyQrRequest(
+        @NotBlank String qrToken
+) {
+}

src/main/java/com/soongsil/CoffeeChat/domain/event/service/CouponService.java

@@ -190,7 +190,7 @@ public String verifyPinAndIssueCoupon(String username, String qrToken, String in
         RLock lock = redissonClient.getLock(lockKey);
 
         try {
-            if (!lock.tryLock(3, 3, TimeUnit.SECONDS)) {
+            if (!lock.tryLock(3, TimeUnit.SECONDS)) {
                 throw new GlobalException(GlobalErrorCode.EVENT_CONCURRENCY_ERROR);
             }
 
@@ -229,7 +229,7 @@ public String verifyPinAndIssueCoupon(String username, String qrToken, String in
 
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            throw new IllegalStateException("동시성 처리 중 인터럽트가 발생했습니다.");
+            throw new GlobalException(GlobalErrorCode.EVENT_CONCURRENCY_ERROR);
         } finally {
             if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                 lock.unlock();