Refactor/response variable unification #162

src/main/java/com/adoonge/seedzip/global/config/SwaggerConfig.java

@@ -14,8 +14,9 @@
 
 @Configuration
 public class SwaggerConfig {
-    @Value("${server.url}")
-    private String serverUrl;
+    @Value("${swagger.server.url}")
+    private String swaggerServerUrl;
+
     @Bean
     public OpenAPI openAPI() {
         String jwt = "JWT";
@@ -28,8 +29,11 @@ public OpenAPI openAPI() {
         );
 
         ArrayList<Server> servers = new ArrayList<>();
-        servers.add(new Server().url("https://"+serverUrl).description("AdoongE Server"));
-        servers.add(new Server().url("http://localhost:8080").description("Local Server"));
+        if(swaggerServerUrl.contains("localhost")){
+            servers.add(new Server().url(swaggerServerUrl).description("Local Server"));
+        }else{
+            servers.add(new Server().url("https://"+swaggerServerUrl).description("AdoongE Server"));
+        }
 
         return new OpenAPI()
                 .components(new Components())

src/main/java/com/adoonge/seedzip/seed/dto/request/SeedRequest.java

@@ -10,10 +10,10 @@
 public record SeedRequest(
 	@NotNull SeedType seedType,
 	String seedName,    // 없으면 null
-	String[] boardCategories,
+	String[] categoryName, // 없으면 null
 	Long thumbnailImage,    // 없으면 null
 	String seedLink, // link만 해당, 나머지 null
-	@NotNull @Size(min = 2, message = "태그는 2개 이상 선택해야합니다.") String[] tags,
+	@NotNull @Size(min = 2, message = "태그는 2개 이상 선택해야합니다.") String[] tagName,
 	LocalDate dDay,    // 없으면 null
 	String seedDetail    // 없으면 null
 ) {

src/main/java/com/adoonge/seedzip/seed/dto/request/SeedUpdateRequest.java

@@ -10,10 +10,10 @@
 public record SeedUpdateRequest(
 	@NotNull SeedType seedType,
 	String seedName,    // 없으면 null
-	@NotNull String[] boardCategories,
+	@NotNull String[] categoryName, // 없으면 null
 	Long thumbnailImage,    // 없으면 null
 	String seedLink, // link만 해당, 나머지 null
-	@NotNull @Size(min = 2, message = "태그는 최소 2개 이상 입력해야 합니다.") String[] tags,
+	@NotNull @Size(min = 2, message = "태그는 최소 2개 이상 입력해야 합니다.") String[] tagName,
 	LocalDate dDay,    // 없으면 null
 	String seedDetail    // 없으면 null
 ) {

src/main/java/com/adoonge/seedzip/seed/dto/response/SeedResponse.java

@@ -1,46 +1,55 @@
 package com.adoonge.seedzip.seed.dto.response;
+
 import com.adoonge.seedzip.seed.domain.SeedType;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+
 import lombok.Builder;
 
 public class SeedResponse {
 
-    @Builder
-    public record PageInfo(int page, int size, int totalPages, long totalElements, boolean isLast) {}
-
-    @Builder
-    public record SeedInfo(Long seedId, String seedName, List<Long> categoryId, List<String> categoryName,
-                           SeedType seedType, String thumbnailImage, LocalDateTime updatedDt,
-                           List<Long> tagId, List<String> tagName, int dDay, Boolean isSaved) {}
-
-    @Builder
-    public record GetAllSeeds(String nickname, List<SeedInfo> seedInfoList, PageInfo pageInfo) {}
-
-    @Builder
-    public record SeedInfoSimple(Long seedId, String seedName){}
-
-    @Builder
-    public record SeedDetail(Long seedId,
-            SeedType seedType,
-            String seedName,
-            String seedLink,
-            List<String> fileLinks,
-            List<String> titles,
-            Long thumbnailImage,
-            List<String> categoryNames,
-            List<String> tagNames,
-            LocalDate dDay,
-            String seedDetail){}
-
-    @Builder
-    public record SeedInfoWithSeedDetail(
-            Long seedId, String seedName, List<Long> categoryId, List<String> categoryName,
-            SeedType seedType, String thumbnailImage, LocalDateTime updatedDt,
-            List<Long> tagId, List<String> tagName, int dDay, String seedDetail, Boolean isSaved
-    ){}
-
-    @Builder
-    public record GetFilteredSeeds(String nickname, List<SeedInfoWithSeedDetail> seedInfoList, PageInfo pageInfo){}
+	@Builder
+	public record PageInfo(int page, int size, int totalPages, long totalElements, boolean isLast) {
+	}
+
+	@Builder
+	public record SeedInfo(Long seedId, String seedName, List<Long> categoryId, List<String> categoryName,
+						   SeedType seedType, String thumbnailImage, LocalDateTime updatedDt,
+						   List<Long> tagId, List<String> tagName, int dDay, Boolean isSaved) {
+	}
+
+	@Builder
+	public record GetAllSeeds(String nickname, List<SeedInfo> seedInfoList, PageInfo pageInfo) {
+	}
+
+	@Builder
+	public record SeedInfoSimple(Long seedId, String seedName) {
+	}
+
+	@Builder
+	public record SeedDetail(Long seedId,
+							 SeedType seedType,
+							 String seedName,
+							 String seedLink,
+							 List<String> fileLinks,
+							 List<String> titles,
+							 Long thumbnailImage,
+							 List<String> categoryName,
+							 List<String> tagName,
+							 LocalDate dDay,
+							 String seedDetail) {
+	}
+
+	@Builder
+	public record SeedInfoWithSeedDetail(
+		Long seedId, String seedName, List<Long> categoryId, List<String> categoryName,
+		SeedType seedType, String thumbnailImage, LocalDateTime updatedDt,
+		List<Long> tagId, List<String> tagName, int dDay, String seedDetail, Boolean isSaved) {
+	}
+
+	@Builder
+	public record GetFilteredSeeds(String nickname, List<SeedInfoWithSeedDetail> seedInfoList, PageInfo pageInfo) {
+	}
 }

src/main/java/com/adoonge/seedzip/seed/service/SeedService.java

@@ -145,11 +145,11 @@ public SeedResponse.SeedInfoSimple uploadSeed(SeedRequest seedRequest, Member me
 		Seed seed = saveSeed(seedRequest, member);
 
 		// 태그 및 카테고리 저장
-		saveSeedTags(seedRequest.tags(), member, seed);
-		if(seedRequest.boardCategories() == null) {
+		saveSeedTags(seedRequest.tagName(), member, seed);
+		if(seedRequest.categoryName() == null) {
 			saveSeedDefaultCategory(member, seed);
 		} else {
-			saveSeedCategories(seedRequest.boardCategories(), member, seed);
+			saveSeedCategories(seedRequest.categoryName(), member, seed);
 		}
 
 		if (seedRequest.seedType() == SeedType.LINK) {
@@ -215,8 +215,8 @@ public SeedResponse.SeedDetail getSeedDetail(Long seedId) {
 				.fileLinks(fileLinks)
 				.titles(titles)
 				.thumbnailImage(thumbnailImage)
-				.categoryNames(categoryNames)
-				.tagNames(tagNames)
+				.categoryName(categoryNames)
+				.tagName(tagNames)
 				.dDay(seed.getDDay())
 				.seedDetail(seed.getSeedDetail())
 				.build();
@@ -374,11 +374,11 @@ public SeedResponse.SeedInfoSimple updateSeed(SeedUpdateRequest request,
 
 		// 태그
 		seedTagRepository.deleteAllBySeedId(seedId);
-		saveSeedTags(request.tags(), member, seed);
+		saveSeedTags(request.tagName(), member, seed);
 
 		// 카테고리
 		categorySeedRepository.deleteAllBySeedId(seedId);
-		saveSeedCategories(request.boardCategories(), member, seed);
+		saveSeedCategories(request.categoryName(), member, seed);
 
 		if (seed.getSeedType().equals(SeedType.LINK)) {
 			File file = fileRepository.findBySeed(seed).orElseThrow(

src/main/java/com/adoonge/seedzip/simplification/controller/SimplificationControllerV2.java

@@ -23,10 +23,10 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
-@RestController
-@RequestMapping("/api/v2/simplification")
+//@RestController
+//@RequestMapping("/api/v2/simplification")
 @RequiredArgsConstructor
-@Tag(name = "SimplificationController V2", description = "제목, 요약, 태그 간략화 관련 API V2")
+//@Tag(name = "SimplificationController V2", description = "제목, 요약, 태그 간략화 관련 API V2")
 public class SimplificationControllerV2 {
 
 	private final SimplificationService simplificationService;

src/main/resources/application.yml

@@ -66,9 +66,16 @@ springdoc:
   show-login-endpoint: true
   swagger-ui:
     path: /swagger-ui.html
+    groups-order: desc
+    tags_sorter: alpha
+    operations_sorter: method # delete - get - patch - post - put 정렬
   api-docs:
     path: /v1/api-docs
 
+swagger:
+  server:
+    url: ${SWAGGER_URL}
+
 kakao:
   api:
     key: ${KAKAO_API_KEY}