From 87e692bdbb3125b9744c2d3fa705d24b291c296e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=95=98=EC=9D=80?= Date: Sat, 2 Mar 2024 05:23:46 +0900 Subject: [PATCH] =?UTF-8?q?[#151]=20Fix:=20PinOrderUpdate=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=EA=B0=92=20LexoRank=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pcb/audy/domain/pin/controller/PinController.java | 2 +- .../pcb/audy/domain/pin/controller/PinHttpController.java | 2 +- .../audy/domain/pin/dto/response/PinOrderUpdateRes.java | 6 +++--- .../java/com/pcb/audy/domain/pin/service/PinService.java | 7 +++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/pcb/audy/domain/pin/controller/PinController.java b/src/main/java/com/pcb/audy/domain/pin/controller/PinController.java index 1e6d018..ad6d8ce 100644 --- a/src/main/java/com/pcb/audy/domain/pin/controller/PinController.java +++ b/src/main/java/com/pcb/audy/domain/pin/controller/PinController.java @@ -35,7 +35,7 @@ public BasicResponse savePin( @SendTo("/sub/{courseId}/pin/modification/sequence") public BasicResponse updateOrder( @DestinationVariable Long courseId, @RequestBody PinOrderUpdateReq pinOrderUpdateReq) { - return BasicResponse.success(pinService.updatePinOrder(courseId, pinOrderUpdateReq)); + return BasicResponse.success(pinService.updatePinSequence(courseId, pinOrderUpdateReq)); } @MessageMapping("/{courseId}/pin/modification/name") diff --git a/src/main/java/com/pcb/audy/domain/pin/controller/PinHttpController.java b/src/main/java/com/pcb/audy/domain/pin/controller/PinHttpController.java index 362f957..c92d021 100644 --- a/src/main/java/com/pcb/audy/domain/pin/controller/PinHttpController.java +++ b/src/main/java/com/pcb/audy/domain/pin/controller/PinHttpController.java @@ -28,7 +28,7 @@ public BasicResponse savePin( @PatchMapping("/{courseId}/order") public BasicResponse updatePinOrder( @PathVariable("courseId") Long courseId, @RequestBody PinOrderUpdateReq pinOrderUpdateReq) { - return BasicResponse.success(pinService.updatePinOrder(courseId, pinOrderUpdateReq)); + return BasicResponse.success(pinService.updatePinSequence(courseId, pinOrderUpdateReq)); } @PatchMapping("/{courseId}/name") diff --git a/src/main/java/com/pcb/audy/domain/pin/dto/response/PinOrderUpdateRes.java b/src/main/java/com/pcb/audy/domain/pin/dto/response/PinOrderUpdateRes.java index 99d5cfb..ca7b2cc 100644 --- a/src/main/java/com/pcb/audy/domain/pin/dto/response/PinOrderUpdateRes.java +++ b/src/main/java/com/pcb/audy/domain/pin/dto/response/PinOrderUpdateRes.java @@ -10,11 +10,11 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class PinOrderUpdateRes { private UUID pinId; - private int order; + private String sequence; @Builder - private PinOrderUpdateRes(UUID pinId, int order) { + private PinOrderUpdateRes(UUID pinId, String sequence) { this.pinId = pinId; - this.order = order; + this.sequence = sequence; } } diff --git a/src/main/java/com/pcb/audy/domain/pin/service/PinService.java b/src/main/java/com/pcb/audy/domain/pin/service/PinService.java index 057cd2f..da2cc19 100644 --- a/src/main/java/com/pcb/audy/domain/pin/service/PinService.java +++ b/src/main/java/com/pcb/audy/domain/pin/service/PinService.java @@ -39,7 +39,7 @@ public PinSaveRes savePin(Long courseId, PinSaveReq pinSaveReq) { return PinServiceMapper.INSTANCE.toPinSaveRes(pinRedisRes); } - public PinOrderUpdateRes updatePinOrder(Long courseId, PinOrderUpdateReq pinOrderUpdateReq) { + public PinOrderUpdateRes updatePinSequence(Long courseId, PinOrderUpdateReq pinOrderUpdateReq) { String key = getKey(courseId, pinOrderUpdateReq.getPinId()); String sequence = lexoRankUtil.getLexoRank(courseId, pinOrderUpdateReq.getOrder()); @@ -57,7 +57,10 @@ public PinOrderUpdateRes updatePinOrder(Long courseId, PinOrderUpdateReq pinOrde .build(); redisProvider.setPin(key, updatedPinRedisRes, PIN_EXPIRE_TIME); - return PinServiceMapper.INSTANCE.toPinOrderUpdateRes(pinOrderUpdateReq); + return PinOrderUpdateRes.builder() + .pinId(updatedPinRedisRes.getPinId()) + .sequence(updatedPinRedisRes.getSequence()) + .build(); } public PinNameUpdateRes updatePinName(Long courseId, PinNameUpdateReq pinNameUpdateReq) {