[Refactor] move feedback package (#109)

* refactor(Feedback): Feedback 페키지를 User 하부로 이동 * refactor(Content): Feedback의 본문 내용인 Content 를 값객체로 리팩토링 * test(Feedback): 피드백 도메인 테스트 작성 * test(FeedbackTest): 피드백 동등성 테스트 작성 * test(FeedbackTest): 접근제어자 제거 * test(FeedbackTest):clear_all_feedback 에서 사이즈를 확인하는 단언문을 hasSize를 사용하도록 변경
ku-ring · Jan 9, 2024 · fd554a0 · fd554a0
1 parent ead1bf8
commit fd554a0
Show file tree

Hide file tree

Showing 18 changed files with 155 additions and 285 deletions.
diff --git a/src/main/java/com/kustacks/kuring/admin/common/dto/FeedbackDto.java b/src/main/java/com/kustacks/kuring/admin/common/dto/FeedbackDto.java
@@ -1,6 +1,6 @@
 package com.kustacks.kuring.admin.common.dto;
 
-import com.kustacks.kuring.feedback.domain.Feedback;
+import com.kustacks.kuring.user.domain.Feedback;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/src/main/java/com/kustacks/kuring/feedback/common/dto/SaveFeedbackV1Request.java b/src/main/java/com/kustacks/kuring/feedback/common/dto/SaveFeedbackV1Request.java
diff --git a/src/main/java/com/kustacks/kuring/feedback/presentation/FeedbackControllerV1.java b/src/main/java/com/kustacks/kuring/feedback/presentation/FeedbackControllerV1.java
diff --git a/...ng/feedback/business/FeedbackService.java → ...kuring/user/business/FeedbackService.java b/...ng/feedback/business/FeedbackService.java → ...kuring/user/business/FeedbackService.java
@@ -1,9 +1,9 @@
-package com.kustacks.kuring.feedback.business;
+package com.kustacks.kuring.user.business;
 
 import com.kustacks.kuring.admin.common.dto.FeedbackDto;
 import com.kustacks.kuring.common.exception.code.ErrorCode;
 import com.kustacks.kuring.common.exception.NotFoundException;
-import com.kustacks.kuring.feedback.domain.FeedbackRepository;
+import com.kustacks.kuring.user.domain.FeedbackRepository;
 import com.kustacks.kuring.message.firebase.FirebaseService;
 import com.kustacks.kuring.message.firebase.ServerProperties;
 import com.kustacks.kuring.user.domain.User;

diff --git a/...back/common/dto/SaveFeedbackResponse.java → ...user/common/dto/SaveFeedbackResponse.java b/...back/common/dto/SaveFeedbackResponse.java → ...user/common/dto/SaveFeedbackResponse.java
@@ -1,4 +1,4 @@
-package com.kustacks.kuring.feedback.common.dto;
+package com.kustacks.kuring.user.common.dto;
 
 import com.kustacks.kuring.common.dto.ResponseDto;
 import lombok.Getter;

diff --git a/src/main/java/com/kustacks/kuring/user/domain/Content.java b/src/main/java/com/kustacks/kuring/user/domain/Content.java
@@ -0,0 +1,31 @@
+package com.kustacks.kuring.user.domain;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+@Embeddable
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Content {
+
+    private static final int MAX_LENGTH = 256;
+
+    @Column(name = "content", length = 256, nullable = false)
+    private String value;
+
+    public Content(String content) {
+        validate(content);
+        this.value = content;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    private void validate(String content) {
+        if (content.length() > MAX_LENGTH) throw new IllegalArgumentException("본문 내용은 " + MAX_LENGTH + "자 이하여야 합니다");
+        if (content.isBlank()) throw new IllegalArgumentException("본문은 공백일 수 없습니다");
+    }
+}
diff --git a/...acks/kuring/feedback/domain/Feedback.java → ...kustacks/kuring/user/domain/Feedback.java b/...acks/kuring/feedback/domain/Feedback.java → ...kustacks/kuring/user/domain/Feedback.java
@@ -1,19 +1,11 @@
-package com.kustacks.kuring.feedback.domain;
+package com.kustacks.kuring.user.domain;
 
 import com.kustacks.kuring.common.domain.BaseTimeEntity;
-import com.kustacks.kuring.user.domain.User;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 import java.util.Objects;
 
 @Entity
@@ -26,20 +18,20 @@ public class Feedback extends BaseTimeEntity {
     @Column(name = "id", unique = true, nullable = false)
     private Long id;
 
-    @Column(name = "content", length = 256, nullable = false)
-    private String content;
+    @Embedded
+    private Content content;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
 
     public Feedback(String content, User user) {
-        this.content = content;
+        this.content = new Content(content);
         this.user = user;
     }
 
     public String getContent() {
-        return content;
+        return content.getValue();
     }
 
     public Long getUserId() {

diff --git a/...g/feedback/domain/FeedbackRepository.java → ...uring/user/domain/FeedbackRepository.java b/...g/feedback/domain/FeedbackRepository.java → ...uring/user/domain/FeedbackRepository.java
@@ -1,4 +1,4 @@
-package com.kustacks.kuring.feedback.domain;
+package com.kustacks.kuring.user.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

diff --git a/src/main/java/com/kustacks/kuring/user/domain/Feedbacks.java b/src/main/java/com/kustacks/kuring/user/domain/Feedbacks.java
@@ -1,6 +1,5 @@
 package com.kustacks.kuring.user.domain;
 
-import com.kustacks.kuring.feedback.domain.Feedback;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.CascadeType;

diff --git a/src/main/java/com/kustacks/kuring/user/domain/User.java b/src/main/java/com/kustacks/kuring/user/domain/User.java
@@ -1,7 +1,6 @@
 package com.kustacks.kuring.user.domain;
 
 import com.kustacks.kuring.notice.domain.CategoryName;
-import com.kustacks.kuring.feedback.domain.Feedback;
 import com.kustacks.kuring.notice.domain.DepartmentName;
 import lombok.AccessLevel;
 import lombok.Getter;

diff --git a/src/main/java/com/kustacks/kuring/user/facade/UserCommandFacade.java b/src/main/java/com/kustacks/kuring/user/facade/UserCommandFacade.java
@@ -1,6 +1,6 @@
 package com.kustacks.kuring.user.facade;
 
-import com.kustacks.kuring.feedback.business.FeedbackService;
+import com.kustacks.kuring.user.business.FeedbackService;
 import com.kustacks.kuring.message.firebase.FirebaseService;
 import com.kustacks.kuring.message.firebase.exception.FirebaseSubscribeException;
 import com.kustacks.kuring.message.firebase.exception.FirebaseUnSubscribeException;

diff --git a/src/main/java/com/kustacks/kuring/user/facade/UserQueryFacade.java b/src/main/java/com/kustacks/kuring/user/facade/UserQueryFacade.java
@@ -1,7 +1,7 @@
 package com.kustacks.kuring.user.facade;
 
 import com.kustacks.kuring.admin.common.dto.FeedbackDto;
-import com.kustacks.kuring.feedback.business.FeedbackService;
+import com.kustacks.kuring.user.business.FeedbackService;
 import com.kustacks.kuring.notice.domain.CategoryName;
 import com.kustacks.kuring.message.firebase.FirebaseService;
 import com.kustacks.kuring.notice.common.dto.CategoryNameDto;

diff --git a/src/test/java/com/kustacks/kuring/acceptance/FeedbackStep.java b/src/test/java/com/kustacks/kuring/acceptance/FeedbackStep.java
@@ -1,9 +1,10 @@
 package com.kustacks.kuring.acceptance;
 
-import com.kustacks.kuring.feedback.common.dto.SaveFeedbackV1Request;
+import com.kustacks.kuring.user.common.dto.SaveFeedbackRequest;
 import io.restassured.RestAssured;
 import io.restassured.response.ExtractableResponse;
 import io.restassured.response.Response;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -13,18 +14,19 @@ public class FeedbackStep {
 
     public static void 피드백_요청_응답_확인(ExtractableResponse<Response> response) {
         assertAll(
-                () -> assertThat(response.jsonPath().getBoolean("isSuccess")).isTrue(),
-                () -> assertThat(response.jsonPath().getString("resultMsg")).isEqualTo("성공"),
-                () -> assertThat(response.jsonPath().getInt("resultCode")).isEqualTo(201)
+                () -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value()),
+                () -> assertThat(response.jsonPath().getInt("code")).isEqualTo(200),
+                () -> assertThat(response.jsonPath().getString("message")).isEqualTo("피드백 저장에 성공하였습니다")
         );
     }
 
     public static ExtractableResponse<Response> 피드백_요청(String fcmToken, String feedback) {
         return RestAssured
                 .given().log().all()
+                .header("User-Token", fcmToken)
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
-                .body(new SaveFeedbackV1Request(fcmToken, feedback))
-                .when().post("/api/v1/feedback")
+                .body(new SaveFeedbackRequest(feedback))
+                .when().post("/api/v2/users/feedbacks")
                 .then().log().all()
                 .extract();
     }

diff --git a/src/test/java/com/kustacks/kuring/admin/domain/AdminTest.java b/src/test/java/com/kustacks/kuring/admin/domain/AdminTest.java
@@ -6,6 +6,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
+@DisplayName("도메인 : Admin")
 class AdminTest {
 
     @DisplayName("Admin 생성 테스트")