Refactor : User 웨이팅 등록 및 삭제 기능 리팩토링 #349
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package com.nowait.applicationuser.waiting.controller; | ||
|
|
||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.security.core.annotation.AuthenticationPrincipal; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| import com.nowait.applicationuser.waiting.dto.CancelWaitingRequest; | ||
| import com.nowait.applicationuser.waiting.dto.CancelWaitingResponse; | ||
| import com.nowait.applicationuser.waiting.dto.RegisterWaitingRequest; | ||
| import com.nowait.applicationuser.waiting.dto.RegisterWaitingResponse; | ||
| import com.nowait.applicationuser.waiting.service.WaitingService; | ||
| import com.nowait.common.api.ApiUtils; | ||
| import com.nowait.domainuserrdb.oauth.dto.CustomOAuth2User; | ||
|
|
||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @Tag(name = "Waiting API", description = "예약 API -리팩토링 중-") | ||
| @RestController | ||
| @RequestMapping("/v2/users/me/waitings") | ||
| @RequiredArgsConstructor | ||
| public class WaitingController { | ||
| private final WaitingService waitingService; | ||
|
|
||
| /** | ||
| * 대기열 리팩토링용 API | ||
| */ | ||
| @PostMapping("/{publicCode}") | ||
| @Operation(summary = "대기열 리팩토링용 API", description = "대기열 리팩토링용 API") | ||
| public ResponseEntity<?> registerWaiting( | ||
| @AuthenticationPrincipal CustomOAuth2User customOAuth2User, | ||
| @PathVariable String publicCode, | ||
| @RequestBody RegisterWaitingRequest request, | ||
| HttpServletRequest httpServletRequest | ||
| ) { | ||
| RegisterWaitingResponse registerWaitingResponse = waitingService.registerWaiting( | ||
| customOAuth2User, | ||
| publicCode, | ||
| request, | ||
| httpServletRequest | ||
| ); | ||
|
|
||
| return ResponseEntity | ||
| .ok() | ||
| .body( | ||
| ApiUtils.success( | ||
| registerWaitingResponse | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @DeleteMapping("/{publicCode}") | ||
| @Operation(summary = "대기열 리팩토링용 API", description = "대기 취소") | ||
| public ResponseEntity<?> cancelWaiting( | ||
| @AuthenticationPrincipal CustomOAuth2User customOAuth2User, | ||
| @PathVariable String publicCode, | ||
| @RequestBody CancelWaitingRequest request | ||
| ) { | ||
| CancelWaitingResponse cancelWaitingResponse = waitingService.cancelWaiting( | ||
| customOAuth2User, | ||
| publicCode, | ||
| request | ||
| ); | ||
|
|
||
| return ResponseEntity | ||
| .ok() | ||
| .body( | ||
| ApiUtils.success( | ||
| cancelWaitingResponse | ||
| ) | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.nowait.applicationuser.waiting.dto; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class CancelWaitingRequest { | ||
| private String waitingNumber; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.nowait.applicationuser.waiting.dto; | ||
|
|
||
| import java.time.LocalDateTime; | ||
|
|
||
| import com.nowait.common.enums.ReservationStatus; | ||
|
|
||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
|
|
||
| @Getter | ||
| @Builder | ||
| public class CancelWaitingResponse { | ||
| private String waitingNumber; | ||
| private Long storeId; | ||
| private ReservationStatus reservationStatus; | ||
| private LocalDateTime canceledAt; | ||
| private String message; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.nowait.applicationuser.waiting.dto; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class RegisterWaitingRequest { | ||
| private Integer partySize; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package com.nowait.applicationuser.waiting.dto; | ||
|
|
||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
|
|
||
| @Getter | ||
| @Builder | ||
| public class RegisterWaitingResponse { | ||
| private final String waitingNumber; | ||
| private final int partySize; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.nowait.applicationuser.waiting.dto; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class WaitingIdempotencyValue { | ||
| private String state; | ||
| private RegisterWaitingResponse response; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.nowait.applicationuser.waiting.event; | ||
|
|
||
| import java.time.LocalDateTime; | ||
|
|
||
| import jakarta.validation.constraints.NotNull; | ||
| import lombok.Getter; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @Getter | ||
| @RequiredArgsConstructor | ||
| public class AddWaitingRegisterEvent { | ||
| @NotNull | ||
| private final Long storeId; | ||
| @NotNull | ||
| private final Long userId; | ||
| @NotNull | ||
| private final LocalDateTime timestamp; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.nowait.applicationuser.waiting.event.listener; | ||
|
|
||
| import org.springframework.scheduling.annotation.Async; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.transaction.event.TransactionPhase; | ||
| import org.springframework.transaction.event.TransactionalEventListener; | ||
|
|
||
| import com.nowait.applicationuser.waiting.event.AddWaitingRegisterEvent; | ||
| import com.nowait.domaincoreredis.reservation.repository.WaitingRedisRepository; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class AddWaitingRegisterListener { | ||
|
|
||
| private final WaitingRedisRepository waitingRedisRepository; | ||
|
|
||
| @Async | ||
| @TransactionalEventListener( | ||
| classes = AddWaitingRegisterEvent.class, | ||
| phase = TransactionPhase.AFTER_COMMIT | ||
| ) | ||
| public void onAddWaitingRegister(AddWaitingRegisterEvent event) { | ||
| waitingRedisRepository.addWaiting(event.getStoreId(), event.getUserId(), event.getTimestamp()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package com.nowait.applicationuser.waiting.redis; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.Optional; | ||
|
|
||
| import org.springframework.data.redis.core.RedisTemplate; | ||
| import org.springframework.stereotype.Repository; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.nowait.applicationuser.waiting.dto.RegisterWaitingResponse; | ||
| import com.nowait.applicationuser.waiting.dto.WaitingIdempotencyValue; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @Repository | ||
| @RequiredArgsConstructor | ||
| public class WaitingIdempotencyRepository { | ||
|
|
||
| private final RedisTemplate<String, String> redisTemplate; | ||
| private final ObjectMapper objectMapper; | ||
|
|
||
| private static final Duration TTL = Duration.ofMinutes(10); | ||
|
|
||
| public Optional<WaitingIdempotencyValue> findByKey(String key) { | ||
| String value = redisTemplate.opsForValue().get(key); | ||
|
|
||
| if (value == null) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| try { | ||
| return Optional.of( | ||
| objectMapper.readValue(value, WaitingIdempotencyValue.class) | ||
| ); | ||
| } catch (Exception e) { | ||
| throw new IllegalArgumentException("Failed to deserialize value from Redis", e); | ||
| } | ||
| } | ||
|
|
||
| public void saveIdempotencyValue(String key, RegisterWaitingResponse response) { | ||
| WaitingIdempotencyValue waitingIdempotencyValue = new WaitingIdempotencyValue( | ||
| "COMPLETED", | ||
| response | ||
| ); | ||
|
|
||
| try { | ||
| String jsonValue = objectMapper.writeValueAsString(waitingIdempotencyValue); | ||
| redisTemplate.opsForValue().set(key, jsonValue, TTL); | ||
| } catch (Exception e) { | ||
| throw new IllegalArgumentException("Failed to serialize value for Redis", e); | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+15
to
+53
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Search for usage patterns of findByKey and saveIdempotencyValue
rg -n -A 10 "findByKey|saveIdempotencyValue" --type javaRepository: GTable/NoWait_BE_MultiModule Length of output: 7881 🏁 Script executed: #!/bin/bash
# Check for distributed lock usage or synchronization around idempotency handling
rg -n -B 5 "saveIdempotencyValue" --type java | head -50
# Check if there are any `@Lock` or synchronization mechanisms
rg -n "@Lock|@Transactional|synchronized" --type java -A 3 | grep -A 3 "registerWaiting"Repository: GTable/NoWait_BE_MultiModule Length of output: 2276
WaitingService의
🤖 Prompt for AI AgentsThere was a problem hiding this comment. 🧩 Analysis chain
🏁 Script executed: Length of output: 58
Issue
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.