Queue join timestamp

simplq/src/main/java/me/simplq/controller/TokenController.java

@@ -3,13 +3,15 @@
 import lombok.RequiredArgsConstructor;
 import me.simplq.controller.model.token.CreateTokenRequest;
 import me.simplq.controller.model.token.MyTokensResponse;
+import me.simplq.controller.model.token.PatchTokenRequest;
 import me.simplq.controller.model.token.TokenDeleteResponse;
 import me.simplq.controller.model.token.TokenDetailResponse;
 import me.simplq.controller.model.token.TokenNotifyResponse;
 import me.simplq.service.TokenService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -57,4 +59,10 @@ public ResponseEntity<TokenDeleteResponse> deleteToken(@PathVariable("tokenId")
   public ResponseEntity<TokenNotifyResponse> notifyToken(@PathVariable("tokenId") String tokenId) {
     return ResponseEntity.ok(tokenService.notifyToken(tokenId));
   }
+
+  @PatchMapping(path = "/token/{tokenId}")
+  public ResponseEntity<TokenDetailResponse> patchToken(
+      @PathVariable("tokenId") String tokenId, @RequestBody PatchTokenRequest patchTokenRequest) {
+    return ResponseEntity.ok(tokenService.patchToken(tokenId, patchTokenRequest));
+  }
 }

simplq/src/main/java/me/simplq/controller/model/token/PatchTokenRequest.java

@@ -0,0 +1,8 @@
+package me.simplq.controller.model.token;
+
+import lombok.Data;
+
+@Data
+public class PatchTokenRequest {
+  String queueId;
+}

simplq/src/main/java/me/simplq/service/TokenService.java

@@ -1,13 +1,15 @@
 package me.simplq.service;
 
 import java.util.Comparator;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import me.simplq.constants.QueueStatus;
 import me.simplq.constants.TokenStatus;
 import me.simplq.controller.advices.LoggedInUserInfo;
 import me.simplq.controller.model.token.CreateTokenRequest;
 import me.simplq.controller.model.token.MyTokensResponse;
+import me.simplq.controller.model.token.PatchTokenRequest;
 import me.simplq.controller.model.token.TokenDeleteResponse;
 import me.simplq.controller.model.token.TokenDetailResponse;
 import me.simplq.controller.model.token.TokenNotifyResponse;
@@ -35,10 +37,7 @@ public class TokenService {
 
   @Transactional
   public TokenDetailResponse getToken(String tokenId) {
-    return TokenDetailResponse.fromEntity(
-        tokenRepository
-            .findById(tokenId)
-            .orElseThrow(SQInvalidRequestException::tokenNotFoundException));
+    return getTokenDetailInternal(tokenId);
   }
 
   /** Get token by queueId and the contact number */
@@ -142,4 +141,35 @@ public MyTokensResponse getMyTokens() {
                         token.getTokenCreationTimestamp()))
             .collect(Collectors.toList()));
   }
+
+  @Transactional
+  public TokenDetailResponse patchToken(String tokenId, PatchTokenRequest patchTokenRequest) {
+    Optional.ofNullable(patchTokenRequest.getQueueId())
+        .ifPresent(newQueueId -> addTokenToQueue(tokenId, newQueueId));
+    return getTokenDetailInternal(tokenId);
+  }
+
+  private void addTokenToQueue(String tokenId, String newQueueId) {
+    queueRepository
+        .findById(newQueueId)
+        .map(
+            newQueue ->
+                tokenRepository
+                    .findById(tokenId)
+                    .map(
+                        token -> {
+                          token.setQueue(newQueue);
+                          tokenRepository.save(token);
+                          return token;
+                        })
+                    .orElseThrow(SQInvalidRequestException::tokenNotFoundException))
+        .orElseThrow(SQInvalidRequestException::queueNotFoundException);
+  }
+
+  private TokenDetailResponse getTokenDetailInternal(String tokenId) {
+    return TokenDetailResponse.fromEntity(
+        tokenRepository
+            .findById(tokenId)
+            .orElseThrow(SQInvalidRequestException::tokenNotFoundException));
+  }
 }