[FIX] progressBit 로직 수정 및 pickItem시 progressBit 변경

boham97 · Dec 19, 2023 · 8065fe9 · 8065fe9
1 parent 653aa99
commit 8065fe9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/worker-service/src/main/java/com/example/workerservice/service/WorkerService.java b/worker-service/src/main/java/com/example/workerservice/service/WorkerService.java
@@ -1,6 +1,6 @@
 package com.example.workerservice.service;
 
 public interface WorkerService {
-    String pickItem(String pickerId, long itemId);
+    String pickItem(String pickerId, long itemId) throws Exception;
     String changePosition(String pickerId);
 }
diff --git a/worker-service/src/main/java/com/example/workerservice/service/WorkerServiceImpl.java b/worker-service/src/main/java/com/example/workerservice/service/WorkerServiceImpl.java
@@ -24,10 +24,11 @@ public class WorkerServiceImpl implements WorkerService{
     private final RedisTemplate<String, Object> redisTemplate;
     private final ObjectMapper mapper;
     private final KafkaProducer kafkaProducer;
+    private final RedisService redisService;
 
     @Override
     @Transactional
-    public String pickItem(String workerId, long itemId) {
+    public String pickItem(String workerId, long itemId) throws Exception {
         ZSetOperations<String, Object> redisSortedSet = redisTemplate.opsForZSet();
         StringBuilder sb = new StringBuilder("worker");
 
@@ -64,7 +65,7 @@ public String changePosition(String workerId) {
         return "worker is NOT PRESENT";
     }
 
-    private String process(long itemId, Object target, Object nextTarget, String workerId){
+    private String process(long itemId, Object target, Object nextTarget, String workerId) throws Exception {
         WorkerRes targetPayload = mapper.convertValue(target, WorkerRes.class);
         WorkerRes nextTargetPayload = mapper.convertValue(nextTarget, WorkerRes.class);
 
@@ -81,6 +82,8 @@ private String process(long itemId, Object target, Object nextTarget, String wor
                     .responseItemList(itemList)
                     .build();
             kafkaProducer.pickedItem("PickerToRobot", pickedItem);
+            redisService.setProgressBit(Long.parseLong(workerId));
+
             return itemId + "is Picked";
         } // 다르다면 하나의 주문이 처리된 것 -> orderService로 complete 보냄
         else {
@@ -98,6 +101,7 @@ private String process(long itemId, Object target, Object nextTarget, String wor
                     .orderStatus(true)
                     .build();
             kafkaProducer.orderCompleted("PickerToOrder", orderCompleted);
+            redisService.setProgressBit(Long.parseLong(workerId));
             return itemId + "is Picked"
                     + "%n order no." + targetPayload.getOrderId() + "is Completed";
         }