[feat] 특정 페이지 조회 API #41, merge 오류 수정

src/main/java/com/SollutionChallenge/HighLight/Folder/Folder.java

@@ -11,9 +11,7 @@
 import javax.persistence.Table;
 
 
-import com.SollutionChallenge.HighLight.User.User;
-
-
+import com.SollutionChallenge.HighLight.User.Entity.User;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/SollutionChallenge/HighLight/Folder/FolderRequestDto.java

@@ -1,7 +1,5 @@
 package com.SollutionChallenge.HighLight.Folder;
 
-import com.SollutionChallenge.HighLight.User.User;
-
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/SollutionChallenge/HighLight/Folder/FolderService.java

@@ -8,12 +8,13 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.SollutionChallenge.HighLight.User.Entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.SollutionChallenge.HighLight.User.User;
+
 import com.SollutionChallenge.HighLight.User.UserRepository;
 import com.SollutionChallenge.HighLight.auth.ConfigUtils;
 

src/main/java/com/SollutionChallenge/HighLight/Page/PageService.java

@@ -30,7 +30,6 @@ public class PageService {
     @Transactional
     public SendPageResDto getPageContents(Long userId, Long fileId, Long pageId) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
-//        User user = userRepository.findById(1L).get(); // api 테스트용 파일생성 코드 - 유저 정보 임의로 가져옴
         User user = userRepository.findById(userId).get();
         System.out.println("userid: "+userId);
 //        File testfile = File.createFile(1L, user, "StallingsOS8e-Chap04", "파일링크"); // api 테스트용 파일 생성 코드

src/main/java/com/SollutionChallenge/HighLight/common/Success.java

@@ -12,8 +12,8 @@ public enum Success {
 
 	CREATE_FOLDER_SUCCESS(OK,"폴더 생성 성공"),
 	GET_FOLDER_SUCCESS(OK,"폴더 조회 성공"),
-	DELETE_FOLDER_SUCCESS(OK,"폴더 삭제 성공");
-  CREATE_USER_SUCCESS(OK, "유저 생성 성공");
+	DELETE_FOLDER_SUCCESS(OK,"폴더 삭제 성공"),
+  	CREATE_USER_SUCCESS(OK, "유저 생성 성공");
 
 	private final HttpStatus status;
 	private final String message;