Feature #28 - waiting, review - controller 작성 (#40)

* Hotfix #34-스프링부트어드민 추가, 머지 후 실행안됨 (#35) * #23-스프링 액추에이터 추가, 어드민 클라이언트 추가 * #23-springboot admin 버전 명시 * Feature #21-QuingService (#24) * #21-변수명 변경 phone -> phoneNumber * #21-타입변경 Integer -> int * #21-안쓰는 파일 삭제 * #21-사용하지않는 필드 제거 * #21-QuingService 일부 구현 append getList countForward doneWaiting * #21-QuingService test 일부 구현 * #21-주석 삭제 * #21-append 중복 방지 로직 추가 * #21-waiting cancel 구현 * #21-exception 패키지 이동 * #21-test코드 작성 * Feature #22-waiting - 사용자에게 메시지 send 구현 (#27) * #21-cancel 리턴 타입 변경 * #22-message 전송 관련 부분 print로 임시 구현 * #22-message 전송 관련 부분 test 작성 * #22-test에 불필요한 공백 제거 * #22- test코드 logger 적용 * #22- test코드 given, when, then 분리 * #22- test코드 logger 적용 * #22-리뷰반영 - 테스트 공백, 주석 정리 - 테스트 이름 변경 appendExistThrowDuplicateException * # Conflicts: # src/main/java/flab/quing/user/User.java # src/main/java/flab/quing/user/UserRepository.java * #21-user response import * #37-storeManager가 관리하는 store 연결 (1:1) - response에서 password 삭제 * #28-QuingController 작성 - 로그인한 가게(storeManager-store)의 대기열 목록(get quing) - 로그인한 유저의 현재 대기순서(get quing/count-forward) - 대기 생성 (post quing) - WaitingRequest 생성자 추가(jackson에서 필요) * #39-quingservice import 경로 수정 (#41) - Rating OneToOne Cascade 삭제 * #28-리뷰반영 - 기본경로 의미없는 ("") 삭제 - method private로 변경 * #28-Waiting done, cancel 추가 * #28-getByuser 추가 - done, cancel을 하기위해 userid로 waiting을 가져오는게 필요해서 추가 * #28-append request 추가 * #28-storeId로 변경 * #28-QuingController test 작성 * #28-private 제거 - controller는 다른데서 호출될일이 없겠거니 하고 private를 달았는데 이것 때문에 테스트가 불가하여 Access Modifier를 defualt로 변경..
f-lab-edu · Nov 21, 2022 · ba97718 · ba97718
1 parent 7dd36d9
commit ba97718
Show file tree

Hide file tree

Showing 10 changed files with 307 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.springfox:springfox-boot-starter:3.0.0'
     implementation 'io.springfox:springfox-swagger-ui:3.0.0'
-    implementation 'de.codecentric:spring-boot-admin-starter-client'
+    implementation 'de.codecentric:spring-boot-admin-starter-client:2.7.2'
 
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'

diff --git a/src/main/java/flab/quing/review/Rating.java b/src/main/java/flab/quing/review/Rating.java
@@ -1,15 +1,14 @@
 package flab.quing.review;
 
-import flab.quing.store.Store;
 import flab.quing.entity.BaseEntity;
+import flab.quing.store.Store;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
 
@@ -21,7 +20,7 @@
 @Entity
 public class Rating extends BaseEntity {
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne
     private Store store;
 
     private float rating;

diff --git a/src/main/java/flab/quing/user/StoreManager.java b/src/main/java/flab/quing/user/StoreManager.java
@@ -1,6 +1,7 @@
 package flab.quing.user;
 
 import flab.quing.entity.BaseEntity;
+import flab.quing.store.Store;
 import flab.quing.user.dto.StoreManagerResponse;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -10,6 +11,7 @@
 import lombok.Setter;
 
 import javax.persistence.Entity;
+import javax.persistence.OneToOne;
 
 
 @Data
@@ -28,12 +30,15 @@ public class StoreManager extends BaseEntity {
 
     private String name;
 
+    @OneToOne
+    private Store store;
+
     public StoreManagerResponse toResponse() {
         StoreManagerResponse storeManagerResponse = StoreManagerResponse.builder()
                 .loginId(loginId)
-                .password(encryptedPassword)
                 .phoneNumber(phoneNumber)
                 .name(name)
+                .storeId(store.getId())
                 .build();
         return storeManagerResponse;
     }

diff --git a/src/main/java/flab/quing/user/dto/StoreManagerResponse.java b/src/main/java/flab/quing/user/dto/StoreManagerResponse.java
@@ -11,8 +11,8 @@
 public class StoreManagerResponse {
 
     private String loginId;
-    private String password;
     private String phoneNumber;
     private String name;
+    private long storeId;
 
 }
diff --git a/src/main/java/flab/quing/waiting/QuingController.java b/src/main/java/flab/quing/waiting/QuingController.java
@@ -0,0 +1,86 @@
+package flab.quing.waiting;
+
+import flab.quing.user.dto.StoreManagerResponse;
+import flab.quing.user.dto.UserResponse;
+import flab.quing.waiting.dto.WaitingAppendRequest;
+import flab.quing.waiting.dto.WaitingRequest;
+import flab.quing.waiting.dto.WaitingResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.SessionAttribute;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/v1/quing")
+public class QuingController {
+
+    private final QuingService quingService;
+
+
+    @GetMapping
+    List<WaitingResponse> list(
+            @SessionAttribute(name = "AUTH_STORE")
+            StoreManagerResponse storeManagerResponse
+    ) {
+        long storeId = storeManagerResponse.getStoreId();
+
+        return quingService.getList(storeId);
+    }
+
+    @GetMapping("count-forward")
+    long countForward(@SessionAttribute(name = "AUTH_USER")
+                             UserResponse userResponse
+    ) {
+        return quingService.countForward(userResponse.getUserId());
+    }
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    WaitingResponse append(
+            @SessionAttribute(name = "AUTH_USER")
+            UserResponse userResponse,
+            @RequestBody WaitingAppendRequest waitingAppendRequest
+    ) {
+        WaitingRequest waitingRequest = WaitingRequest.builder()
+                .userId(userResponse.getUserId())
+                .storeId(waitingAppendRequest.getStoreId())
+                .build();
+
+        WaitingResponse waitingResponse = quingService.append(waitingRequest);
+
+        quingService.sendRegisterMessage(waitingResponse.getId());
+
+        return waitingResponse;
+    }
+
+    @PatchMapping
+    WaitingResponse doneWaiting(
+            @SessionAttribute(name = "AUTH_USER")
+            UserResponse userResponse
+    ) {
+        WaitingResponse waitingResponseByUserId = quingService.getByUserId(userResponse.getUserId());
+
+        return quingService.doneWaiting(waitingResponseByUserId.getId());
+    }
+
+    @DeleteMapping
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    void cancelWaiting(
+            @SessionAttribute(name = "AUTH_USER")
+            UserResponse userResponse
+    ) {
+        WaitingResponse waitingResponseByUserId = quingService.getByUserId(userResponse.getUserId());
+
+        quingService.cancelWaiting(waitingResponseByUserId.getId());
+    }
+}
diff --git a/src/main/java/flab/quing/waiting/QuingService.java b/src/main/java/flab/quing/waiting/QuingService.java
@@ -7,6 +7,8 @@
 
 public interface QuingService {
 
+    WaitingResponse getByUserId(long userId);
+
     WaitingResponse append(WaitingRequest waitingRequest);
 
     List<WaitingResponse> getList(long storeId);

diff --git a/src/main/java/flab/quing/waiting/QuingServiceImpl.java b/src/main/java/flab/quing/waiting/QuingServiceImpl.java
@@ -1,6 +1,6 @@
 package flab.quing.waiting;
 
-import flab.quing.store.NoSuchStoreException;
+import flab.quing.store.exception.NoSuchStoreException;
 import flab.quing.store.Store;
 import flab.quing.store.StoreRepository;
 import flab.quing.store.exception.NoSuchUserException;
@@ -28,6 +28,14 @@ public class QuingServiceImpl implements QuingService {
     private final UserRepository userRepository;
     private final StoreRepository storeRepository;
 
+    @Override
+    @Transactional
+    public WaitingResponse getByUserId(long userId) {
+        return waitingRepository.findByUserIdAndWaitingQueueStatusIs(userId, WaitingQueueStatus.WAITING)
+                .orElseThrow(NoSuchWaitingException::new)
+                .toResponse();
+    }
+
     @Override
     @Transactional
     public WaitingResponse append(WaitingRequest waitingRequest) {

diff --git a/src/main/java/flab/quing/waiting/dto/WaitingAppendRequest.java b/src/main/java/flab/quing/waiting/dto/WaitingAppendRequest.java
@@ -0,0 +1,18 @@
+package flab.quing.waiting.dto;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Data
+@Setter(AccessLevel.NONE)
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class WaitingAppendRequest {
+
+    long storeId;
+}
diff --git a/src/main/java/flab/quing/waiting/dto/WaitingRequest.java b/src/main/java/flab/quing/waiting/dto/WaitingRequest.java
@@ -2,13 +2,17 @@
 
 
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Data
 @Setter(AccessLevel.NONE)
 @Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
 public class WaitingRequest {
 
     private long userId;