[Weekly/11/Refactor/Test-TeatData] testdata 리팩터링 (#120)

kakao-tech-campus-2nd-step3 · Nov 12, 2024 · a14b33b · a14b33b
1 parent 354b5c7
commit a14b33b
Show file tree

Hide file tree

Showing 27 changed files with 1,050 additions and 538 deletions.
diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/Image/api/dto/ImageRequest.java b/src/main/java/org/ktc2/cokaen/wouldyouin/Image/api/dto/ImageRequest.java
@@ -7,13 +7,13 @@
 @Builder
 public class ImageRequest {
 
-    private String url;
+    private String name;
     private Long size;
     private String extension;
 
-    public static ImageRequest of(String url, Long size, String extension) {
+    public static ImageRequest of(String name, Long size, String extension) {
         return ImageRequest.builder()
-            .url(url)
+            .name(name)
             .size(size)
             .extension(extension)
             .build();

diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/AdvertisementImageService.java b/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/AdvertisementImageService.java
@@ -42,7 +42,7 @@ protected String getChildPath() {
     @Override
     protected AdvertisementImage toEntity(ImageRequest imageRequest) {
         return AdvertisementImage.builder()
-            .name(imageRequest.getUrl())
+            .name(imageRequest.getName())
             .size(imageRequest.getSize())
             .extension(imageRequest.getExtension())
             .build();

diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/CurationImageService.java b/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/CurationImageService.java
@@ -40,7 +40,7 @@ protected String getChildPath() {
     @Override
     protected CurationImage toEntity(ImageRequest imageRequest) {
         return CurationImage.builder()
-            .name(imageRequest.getUrl())
+            .name(imageRequest.getName())
             .size(imageRequest.getSize())
             .extension(imageRequest.getExtension())
             .build();

diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/EventImageService.java b/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/EventImageService.java
@@ -40,7 +40,7 @@ protected String getChildPath() {
     @Override
     protected EventImage toEntity(ImageRequest imageRequest) {
         return EventImage.builder()
-            .name(imageRequest.getUrl())
+            .name(imageRequest.getName())
             .size(imageRequest.getSize())
             .extension(imageRequest.getExtension())
             .build();

diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/MemberImageService.java b/src/main/java/org/ktc2/cokaen/wouldyouin/Image/application/MemberImageService.java
@@ -40,7 +40,7 @@ protected String getChildPath() {
     @Override
     protected MemberImage toEntity(ImageRequest imageRequest) {
         return MemberImage.builder()
-            .name(imageRequest.getUrl())
+            .name(imageRequest.getName())
             .size(imageRequest.getSize())
             .extension(imageRequest.getExtension())
             .build();

diff --git a/src/main/java/org/ktc2/cokaen/wouldyouin/_common/error/GlobalExceptionHandler.java b/src/main/java/org/ktc2/cokaen/wouldyouin/_common/error/GlobalExceptionHandler.java
@@ -33,6 +33,7 @@ public ResponseEntity<ApiResponseBody<Void>> handleMethodArgumentTypeMismatchExc
     public ResponseEntity<ApiResponseBody<Void>> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
         return ApiResponse.error(ErrorCode.INVALID_INPUT_VALUE, e.getBindingResult().getFieldErrors().stream()
             .map(DefaultMessageSourceResolvable::getDefaultMessage)
+//            .map((reslover) -> "필드명: " + reslover.getField() + reslover.getDefaultMessage())
             .collect(Collectors.joining(", ")));
     }
 }
diff --git a/src/test/java/org/ktc2/cokaen/wouldyouin/_global/TestData.java b/src/test/java/org/ktc2/cokaen/wouldyouin/_global/TestData.java
diff --git a/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockCurator.java b/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockCurator.java
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData;
+import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData.R.curator;
 import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 
 @Retention(RetentionPolicy.RUNTIME)
-@WithMockCustomUser(memberId = MemberData.validCuratorId, memberType = MemberType.curator)
+@WithMockCustomUser(memberId = curator.id, memberType = MemberType.curator)
 public @interface WithMockCurator {
 
 }
diff --git a/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockHost.java b/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockHost.java
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData;
+import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData.R.host;
 import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 
 @Retention(RetentionPolicy.RUNTIME)
-@WithMockCustomUser(memberId = MemberData.validHostId, memberType = MemberType.host)
+@WithMockCustomUser(memberId = host.id, memberType = MemberType.host)
 public @interface WithMockHost {
 
 }
diff --git a/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockMember.java b/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockMember.java
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData;
+import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData.R.normal;
 import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 
 @Retention(RetentionPolicy.RUNTIME)
-@WithMockCustomUser(memberId = MemberData.validMemberId, memberType = MemberType.normal)
+@WithMockCustomUser(memberId = normal.id, memberType = MemberType.normal)
 public @interface WithMockMember {
 
 }
diff --git a/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockWelcomeMember.java b/src/test/java/org/ktc2/cokaen/wouldyouin/_global/mockMember/WithMockWelcomeMember.java
@@ -2,11 +2,11 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData;
+import org.ktc2.cokaen.wouldyouin._global.testdata.MemberData.R.welcome;
 import org.ktc2.cokaen.wouldyouin.member.persist.MemberType;
 
 @Retention(RetentionPolicy.RUNTIME)
-@WithMockCustomUser(memberId = MemberData.validWelcomeMemberId, memberType = MemberType.welcome)
+@WithMockCustomUser(memberId = welcome.id, memberType = MemberType.welcome)
 public @interface WithMockWelcomeMember {
 
 }
diff --git a/src/test/java/org/ktc2/cokaen/wouldyouin/_global/testdata/CommonData.java b/src/test/java/org/ktc2/cokaen/wouldyouin/_global/testdata/CommonData.java
@@ -0,0 +1,17 @@
+package org.ktc2.cokaen.wouldyouin._global.testdata;
+
+import org.ktc2.cokaen.wouldyouin._common.api.SliceInfo;
+
+public class CommonData {
+
+    public static class sliceInfo {
+
+        public static SliceInfo get() {
+            return SliceInfo.builder()
+                .sliceSize(10)
+                .lastId(100L)
+                .build();
+        }
+    }
+
+}