[REFACTOR] UserService 구현 포함, 전체 코드 리팩토링

backend/src/main/java/kernel360/techpick/core/model/folder/StructureJson.java

@@ -1,5 +1,8 @@
 package kernel360.techpick.core.model.folder;
 
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -11,6 +14,8 @@
 import jakarta.persistence.Table;
 import kernel360.techpick.core.model.common.TimeTracking;
 import kernel360.techpick.core.model.user.User;
+import kernel360.techpick.feature.structure.service.Structure;
+import kernel360.techpick.feature.structure.service.node.server.ServerNode;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -23,26 +28,28 @@ public class StructureJson extends TimeTracking {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
 	private Long id;
 
+	@JdbcTypeCode(SqlTypes.JSON)
 	@Column(columnDefinition = "longblob", nullable = false)
-	private String structure;
+	private Structure<ServerNode> structure;
 
 	@OneToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "user_id")
 	private User user;
 
-	private StructureJson(String structure, User user) {
+	private StructureJson(Structure<ServerNode> structure, User user) {
 		this.structure = structure;
 		this.user = user;
 	}
 
-	public void updateStructure(String structure) {
+	public void updateStructure(Structure<ServerNode> structure) {
 		this.structure = structure;
 	}
 
 	// TODO: 엔티티 사용자가 정적 팩토리 메소드로 필요한 함수를 구현 하세요
-	public static StructureJson create(String structure, User user) {
+	public static StructureJson create(Structure<ServerNode> structure, User user) {
 		return new StructureJson(structure, user);
 	}
 }

backend/src/main/java/kernel360/techpick/feature/structure/controller/StructureApi.java

@@ -23,7 +23,7 @@ public interface StructureApi {
 			description = "구조 json을 정상적으로 조회했습니다."
 		)
 	)
-	public ResponseEntity<String> getStructureByUserId(Authentication auth);
+	ResponseEntity<String> getStructure();
 
 	@Operation(
 		summary = "폴더 이동",
@@ -43,7 +43,7 @@ public interface StructureApi {
 			description = "접근할 수 없는 폴더입니다."
 		)
 	})
-	public ResponseEntity<Void> moveFolder(Authentication auth, Long folderId, StructureMoveRequest request);
+	ResponseEntity<Void> moveFolder(StructureMoveRequest request);
 
 	@Operation(
 		summary = "휴지통에 있는 폴더 삭제",
@@ -63,7 +63,7 @@ public interface StructureApi {
 			description = "접근할 수 없는 폴더입니다."
 		)
 	})
-	public ResponseEntity<Void> deleteFolder(Authentication auth, Long folderId, StructureDeleteRequest request);
+	ResponseEntity<Void> deleteFolder(StructureDeleteRequest request);
 
 	@Operation(
 		summary = "픽 이동",
@@ -83,7 +83,7 @@ public interface StructureApi {
 			description = "접근할 수 없는 폴더입니다."
 		)
 	})
-	public ResponseEntity<Void> movePick(Authentication auth, Long pickId, StructureMoveRequest request);
+	ResponseEntity<Void> movePick(StructureMoveRequest request);
 
 	@Operation(
 		summary = "휴지통에 있는 픽 삭제",
@@ -103,5 +103,5 @@ public interface StructureApi {
 			description = "접근할 수 없는 폴더입니다."
 		)
 	})
-	public ResponseEntity<Void> deletePick(Authentication auth, Long pickId, StructureDeleteRequest request);
+	ResponseEntity<Void> deletePick(StructureDeleteRequest request);
 }

backend/src/main/java/kernel360/techpick/feature/structure/controller/StructureController.java

@@ -1,73 +1,76 @@
 package kernel360.techpick.feature.structure.controller;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import kernel360.techpick.feature.structure.service.Structure;
 import kernel360.techpick.feature.structure.service.StructureService;
 import kernel360.techpick.feature.structure.service.dto.StructureDeleteRequest;
 import kernel360.techpick.feature.structure.service.dto.StructureMoveRequest;
+import kernel360.techpick.feature.structure.service.node.client.ClientNode;
+import kernel360.techpick.feature.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/structures")
 public class StructureController implements StructureApi {
 
+	private final UserService userService;
 	private final StructureService structureService;
 
 	@Override
 	@GetMapping
-	public ResponseEntity<String> getStructureByUserId(Authentication auth) {
+	public ResponseEntity<String> getStructure() {
+		Structure<ClientNode> structure
+			= structureService.getClientStructure(userService.getCurrentUser());
 
-		return ResponseEntity.ok(structureService.getStructureByUserId((Long)auth.getPrincipal()));
+		return ResponseEntity.ok(structure.serialize());
 	}
 
 	@Override
-	@PutMapping("/folders/{folderId}")
-	public ResponseEntity<Void> moveFolder(Authentication auth, @PathVariable Long folderId,
-		@RequestBody StructureMoveRequest request) {
-
-		request.updateUserIdAndTargetId(auth, folderId);
-		structureService.moveFolder(request);
+	@PutMapping("/folders")
+	public ResponseEntity<Void> moveFolder(
+		@RequestBody StructureMoveRequest request
+	) {
+		structureService.moveFolder(userService.getCurrentUser(), request);
 
 		return ResponseEntity.noContent().build();
 	}
 
 	@Override
-	@DeleteMapping("/folders/{folderId}")
-	public ResponseEntity<Void> deleteFolder(Authentication auth, @PathVariable Long folderId,
-		@RequestBody StructureDeleteRequest request) {
-
-		request.updateUserIdAndTargetId(auth, folderId);
-		structureService.deleteFolder(request);
+	@DeleteMapping("/folders")
+	public ResponseEntity<Void> deleteFolder(
+		@RequestBody StructureDeleteRequest request
+	) {
+		structureService.deleteFolder(userService.getCurrentUser(), request);
 
 		return ResponseEntity.noContent().build();
 	}
 
 	@Override
-	@PutMapping("/picks/{pickId}")
-	public ResponseEntity<Void> movePick(Authentication auth, @PathVariable Long pickId,
-		@RequestBody StructureMoveRequest request) {
+	@PutMapping("/picks")
+	public ResponseEntity<Void> movePick(
+		@RequestBody StructureMoveRequest request
+	) {
+		structureService.movePick(userService.getCurrentUser(), request);
 
-		request.updateUserIdAndTargetId(auth, pickId);
-		structureService.movePick(request);
 		return ResponseEntity.noContent().build();
 	}
 
 	@Override
-	@DeleteMapping("/picks/{pickId}")
-	public ResponseEntity<Void> deletePick(Authentication auth, @PathVariable Long pickId,
-		@RequestBody StructureDeleteRequest request) {
+	@DeleteMapping("/picks")
+	public ResponseEntity<Void> deletePick(
+		@RequestBody StructureDeleteRequest request
+	) {
+		structureService.deletePick(userService.getCurrentUser(), request);
 
-		request.updateUserIdAndTargetId(auth, pickId);
-		structureService.deletePick(request);
 		return ResponseEntity.noContent().build();
 	}
 }

backend/src/main/java/kernel360/techpick/feature/structure/model/StructureDataProxy.java

@@ -0,0 +1,63 @@
+package kernel360.techpick.feature.structure.model;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import kernel360.techpick.core.model.folder.Folder;
+import kernel360.techpick.core.model.pick.Pick;
+import kernel360.techpick.core.model.user.User;
+import kernel360.techpick.feature.folder.service.FolderStructureService;
+import kernel360.techpick.feature.pick.service.PickStructureService;
+
+public class StructureDataProxy {
+
+    private final Map<Long, Pick> pickMap;
+    private final Map<Long, Folder> folderMap;
+
+    private StructureDataProxy(Map<Long, Pick> pickMap, Map<Long, Folder> folderMap) {
+        this.pickMap = pickMap;
+        this.folderMap = folderMap;
+    }
+
+    private StructureDataProxy(List<Pick> pickList, List<Folder> folderList) {
+        this.pickMap = pickList.stream().collect(Collectors.toMap(Pick::getId, Function.identity()));
+        this.folderMap = folderList.stream().collect(Collectors.toMap(Folder::getId, Function.identity()));
+    }
+
+    public static StructureDataProxy fromStructureService(
+        User user,
+        PickStructureService pickStructureService,
+        FolderStructureService folderStructureService
+    ) {
+        return new StructureDataProxy(
+            pickStructureService.getPickListByUser(user),
+            folderStructureService.getFolderListByUserAndParentFolderIsNotNull(user)
+        );
+    }
+
+    public Pick findPickById(Long pickId) {
+        return this.pickMap.get(pickId);
+    }
+
+    public Folder findFolderById(Long folderId) {
+        return this.folderMap.get(folderId);
+    }
+
+    public boolean containsPick(Long pickId) {
+        return this.pickMap.containsKey(pickId);
+    }
+
+    public boolean containsFolder(Long folderId) {
+        return this.folderMap.containsKey(folderId);
+    }
+
+    public int pickListSize() {
+        return this.pickMap.size();
+    }
+
+    public int folderListSize() {
+        return this.folderMap.size();
+    }
+}

backend/src/main/java/kernel360/techpick/feature/structure/model/StructureJsonProvider.java

@@ -3,6 +3,7 @@
 import org.springframework.stereotype.Component;
 
 import kernel360.techpick.core.model.folder.StructureJson;
+import kernel360.techpick.core.model.user.User;
 import kernel360.techpick.feature.structure.exception.ApiStructureException;
 import kernel360.techpick.feature.structure.repository.StructureJsonRepository;
 import kernel360.techpick.feature.structure.service.Structure;
@@ -15,18 +16,15 @@ public class StructureJsonProvider {
 
 	private final StructureJsonRepository structureJsonRepository;
 
-	public StructureJson save(StructureJson structureJson) {
-		return structureJsonRepository.save(structureJson);
-	}
-
-	public StructureJson findByUserId(Long userId) {
-		return structureJsonRepository.findByUserId(userId)
+	public StructureJson findStructure(User user) {
+		return structureJsonRepository
+			.findByUserId(user.getId())
 			.orElseThrow(ApiStructureException::USER_STRUCTURE_JSON_NOT_FOUND);
 	}
 
-	public void updateStructureJsonByUserIdAndStructure(Long userId, Structure<ServerNode> structure) {
-		StructureJson structureJson = this.findByUserId(userId);
-		structureJson.updateStructure(structure.serialize());
-		this.save(structureJson);
+	public StructureJson updateStructureByUser(User user, Structure<ServerNode> structure) {
+		StructureJson structureJson = this.findStructure(user);
+		structureJson.updateStructure(structure);
+		return structureJsonRepository.save(structureJson);
 	}
 }

backend/src/main/java/kernel360/techpick/feature/structure/model/StructureMapper.java

@@ -1,9 +1,5 @@
 package kernel360.techpick.feature.structure.model;
 
-import org.springframework.stereotype.Component;
-
-import kernel360.techpick.core.model.folder.StructureJson;
-import kernel360.techpick.core.model.user.User;
 import kernel360.techpick.feature.folder.service.dto.FolderDeleteDto;
 import kernel360.techpick.feature.folder.service.dto.FolderMoveDto;
 import kernel360.techpick.feature.pick.service.dto.PickDeleteDto;
@@ -13,55 +9,38 @@
 import kernel360.techpick.feature.structure.service.dto.StructureMoveRequest;
 import kernel360.techpick.feature.structure.service.node.client.ClientNode;
 import kernel360.techpick.feature.structure.service.node.server.ServerNode;
-import kernel360.techpick.feature.user.UserRepository;
-import lombok.RequiredArgsConstructor;
 
-@Component
-@RequiredArgsConstructor
 public class StructureMapper {
 
-	/**
-	 * toClientNode 변환 과정에서 name이 설정됩니다.
-	 */
-	private final NameProvider nameProvider;
-	private final UserRepository userRepository;
-
-	public Structure<ClientNode> toClientStructure(Structure<ServerNode> serverStructure) {
+	public static Structure<ClientNode> toClientStructure(
+		Structure<ServerNode> serverStructure,
+		StructureDataProxy structureDataProxy
+	) {
 		return new Structure<>(
-
 			serverStructure.getRootFolder()
 				.stream()
-				.map(node -> node.toClientNode(nameProvider))
+				.map(node -> node.toClientNode(structureDataProxy))
 				.toList(),
-
 			serverStructure.getRecycleBinFolder()
 				.stream()
-				.map(node -> node.toClientNode(nameProvider))
+				.map(node -> node.toClientNode(structureDataProxy))
 				.toList()
 		);
 	}
 
-	public FolderMoveDto toFolderMoveDto(StructureMoveRequest request) {
-		return new FolderMoveDto(request.getUserId(), request.getTargetId(), request.getParentFolderId());
+	public static FolderMoveDto toFolderMoveDto(StructureMoveRequest request) {
+		return new FolderMoveDto(request.targetId(), request.parentFolderId());
 	}
 
-	public FolderDeleteDto toFolderDeleteDto(StructureDeleteRequest request) {
-		return new FolderDeleteDto(request.getUserId(), request.getTargetId());
+	public static FolderDeleteDto toFolderDeleteDto(StructureDeleteRequest request) {
+		return new FolderDeleteDto(request.targetId());
 	}
 
-	public PickMoveDto toPickMoveDto(StructureMoveRequest request) {
-		return new PickMoveDto(request.getTargetId(), request.getUserId(), request.getParentFolderId());
+	public static PickMoveDto toPickMoveDto(StructureMoveRequest request) {
+		return new PickMoveDto(request.targetId(), request.parentFolderId());
 	}
 
-	public PickDeleteDto toPickDeleteDto(StructureDeleteRequest request) {
-		return new PickDeleteDto(request.getTargetId(), request.getUserId());
-	}
-
-	public StructureJson toStructureJson(Long userId, Structure<ServerNode> structure) {
-
-		String json = structure.serialize();
-		User user = userRepository.findById(userId).get();
-
-		return StructureJson.create(json, user);
+	public static PickDeleteDto toPickDeleteDto(StructureDeleteRequest request) {
+		return new PickDeleteDto(request.targetId());
 	}
 }