[feat & refactor] 폴더 조회시 객체 반환 API with h2 success #29

dsc-sookmyung · Mar 27, 2023 · 0bbc42f · 0bbc42f
1 parent 2a8d9f2
commit 0bbc42f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderController.java b/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderController.java
@@ -1,11 +1,11 @@
 package com.SollutionChallenge.HighLight.Folder;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 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.RestController;
 
 import com.SollutionChallenge.HighLight.common.ApiResponse;
@@ -25,8 +25,8 @@ private ApiResponse createFolder(@RequestBody FolderRequestDto folderRequestDto)
 	}
 
 	@GetMapping("/folder")
-	private ApiResponse <FolderViewResponseDto>getFolder(){
-		FolderViewResponseDto response = folderService.viewFolder();
+	private ApiResponse<List<FolderResponseDto>> getFolder(){
+		List<FolderResponseDto> response = folderService.viewFolder();
 		return ApiResponse.successCode(Success.GET_FOLDER_SUCCESS,response);
 	}
 

diff --git a/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderResponseDto.java b/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderResponseDto.java
@@ -1,9 +1,5 @@
 package com.SollutionChallenge.HighLight.Folder;
 
-import java.util.List;
-
-import com.SollutionChallenge.HighLight.User.User;
-
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,11 +10,18 @@ public class FolderResponseDto {
 	private Long id;
 	private String folderName;
 
+	public FolderResponseDto(Long id, String folderName) {
+		this.id = id;
+		this.folderName = folderName;
+	}
+
 	public static FolderResponseDto from(Long id, String folderName){
-		FolderResponseDto folderResponseDto  = new FolderResponseDto();
+		FolderResponseDto folderResponseDto  = new FolderResponseDto(id, folderName);
 		folderResponseDto.id = id;
 		folderResponseDto.folderName = folderName;
 		return folderResponseDto;
 	}
+
+
 }
 
diff --git a/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderService.java b/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderService.java
@@ -1,5 +1,6 @@
 package com.SollutionChallenge.HighLight.Folder;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -52,16 +53,16 @@ public FolderResponseDto save(FolderRequestDto folderRequestDto) {
 	}
 
 
-	public FolderViewResponseDto viewFolder() {
+	public List<FolderResponseDto> viewFolder() {
 		List<Folder> folders = folderRepository.findAll();
-		List<String> folderNames = Collections.emptyList();
+		List<FolderResponseDto> folderResponseDtos =new ArrayList<>();
 		if (folders != null && !folders.isEmpty()) {
-			folderNames = folders.stream()
+			folderResponseDtos = folders.stream()
 				.filter(f -> f.getName() != null)
-				.map(Folder::getName)
+				.map(f-> new FolderResponseDto(f.getId(),f.getName()))
 				.collect(Collectors.toList());
 		}
-		return FolderViewResponseDto.of(folderNames);
+		return folderResponseDtos;
 	}
 
 	public FolderResponseDto viewOneFolder(Long folder_id) {

diff --git a/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderViewResponseDto.java b/src/main/java/com/SollutionChallenge/HighLight/Folder/FolderViewResponseDto.java
@@ -9,11 +9,14 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class FolderViewResponseDto {
+	private List<Long> id;
 	private List<String> folderName;
 
-	public static FolderViewResponseDto of(List<String >folderName){
+	public static FolderViewResponseDto of(List <Long> id,List<String >folderName){
 		FolderViewResponseDto folderViewResponseDto = new FolderViewResponseDto();
+		folderViewResponseDto.id= id;
 		folderViewResponseDto.folderName = folderName;
+
 		return folderViewResponseDto;
 	}
 }