From 2372084978452a295360d1cdd91f73b500262d92 Mon Sep 17 00:00:00 2001 From: Minju Song Date: Wed, 19 Apr 2023 22:23:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=93=9C=EB=94=94=EC=96=B4=20=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=20=EB=8B=A4=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/{PostController.java => ProjectController.java} | 0 .../service/{PostService.java => ProjectService.java} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/com/cnu/real_coding_server/controller/{PostController.java => ProjectController.java} (100%) rename src/main/java/com/cnu/real_coding_server/service/{PostService.java => ProjectService.java} (100%) diff --git a/src/main/java/com/cnu/real_coding_server/controller/PostController.java b/src/main/java/com/cnu/real_coding_server/controller/ProjectController.java similarity index 100% rename from src/main/java/com/cnu/real_coding_server/controller/PostController.java rename to src/main/java/com/cnu/real_coding_server/controller/ProjectController.java diff --git a/src/main/java/com/cnu/real_coding_server/service/PostService.java b/src/main/java/com/cnu/real_coding_server/service/ProjectService.java similarity index 100% rename from src/main/java/com/cnu/real_coding_server/service/PostService.java rename to src/main/java/com/cnu/real_coding_server/service/ProjectService.java From 4d8f7323a0a4471b008d363be9cf5544be9fbfd0 Mon Sep 17 00:00:00 2001 From: Minju Song Date: Wed, 19 Apr 2023 22:26:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?"=EB=93=9C=EB=94=94=EC=96=B4=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EB=81=9D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectController.java | 44 ++++++++--------- .../service/ProjectService.java | 49 ++++++++++--------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/cnu/real_coding_server/controller/ProjectController.java b/src/main/java/com/cnu/real_coding_server/controller/ProjectController.java index c31c90e..8ba96e9 100644 --- a/src/main/java/com/cnu/real_coding_server/controller/ProjectController.java +++ b/src/main/java/com/cnu/real_coding_server/controller/ProjectController.java @@ -1,8 +1,7 @@ package com.cnu.real_coding_server.controller; - -import com.cnu.real_coding_server.entity.Post; -import com.cnu.real_coding_server.model.request.PostRequest; -import com.cnu.real_coding_server.service.PostService; +import com.cnu.real_coding_server.entity.Project; +import com.cnu.real_coding_server.model.request.ProjectRequest; +import com.cnu.real_coding_server.service.ProjectService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -10,36 +9,35 @@ import java.util.List; @RestController -@RequestMapping("/posts") +@RequestMapping("/projects") @RequiredArgsConstructor -public class PostController { - private final PostService postService; +public class ProjectController { + private final ProjectService projectService; @PostMapping - public ResponseEntity createPost(@RequestBody PostRequest postRequest) { - return ResponseEntity.ok(postService.createPost(postRequest)); + public ResponseEntity createProject(@RequestBody ProjectRequest projectRequest){ + return ResponseEntity.ok(projectService.createProject(projectRequest)); } @GetMapping - public ResponseEntity> getPosts() { - return ResponseEntity.ok(postService.getPosts()); + public ResponseEntity> getProjects(){ + return ResponseEntity.ok(projectService.getProjects()); } - @GetMapping("/{postId}") - public ResponseEntity getPost(@PathVariable("postId") Integer postId) { - return ResponseEntity.ok(postService.getPost(postId).orElse(null)); - } + @GetMapping("/{projectId}") - @PutMapping("/{postId}") - public ResponseEntity updatePost(@PathVariable("postId")Integer postId, - @RequestBody PostRequest postRequest) { - return ResponseEntity.ok(postService.updatePost(postId, postRequest).orElse(null)); + public ResponseEntity getProject(@PathVariable("projectId") Integer projectId) { + return ResponseEntity.ok(projectService.getProject(projectId).orElse(null)); } - @DeleteMapping("/{postId}") - public ResponseEntity deletePost(@PathVariable("postId") Integer postId) { - postService.deletePost(postId); + @PutMapping("/{projectId}") + public ResponseEntity updateProject(@PathVariable ("projectId") Integer projectId, @RequestBody ProjectRequest projectRequest ){ + return ResponseEntity.ok(projectService.updateProject(projectId, projectRequest).orElse(null)); + } + @DeleteMapping("/{projectId}") + public ResponseEntity deleteProject(@PathVariable ("projectId") Integer projectId){ + projectService.deleteProject(projectId); return ResponseEntity.noContent().build(); } -} +} \ No newline at end of file diff --git a/src/main/java/com/cnu/real_coding_server/service/ProjectService.java b/src/main/java/com/cnu/real_coding_server/service/ProjectService.java index 490a745..5ea3a89 100644 --- a/src/main/java/com/cnu/real_coding_server/service/ProjectService.java +++ b/src/main/java/com/cnu/real_coding_server/service/ProjectService.java @@ -1,8 +1,7 @@ package com.cnu.real_coding_server.service; - -import com.cnu.real_coding_server.entity.Post; -import com.cnu.real_coding_server.model.request.PostRequest; -import com.cnu.real_coding_server.repository.PostRepository; +import com.cnu.real_coding_server.entity.Project; +import com.cnu.real_coding_server.model.request.ProjectRequest; +import com.cnu.real_coding_server.repository.ProjectRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -11,34 +10,36 @@ @Service @RequiredArgsConstructor -public class PostService { - - private final PostRepository postRepository; +public class ProjectService { + private final ProjectRepository projectRepository; - public Post createPost(PostRequest postRequest) { - return postRepository.save(postRequest.toEntity()); + public Project createProject(ProjectRequest projectRequest) { + return projectRepository.save(projectRequest.toEntity()); } - public List getPosts() { - return postRepository.findAll(); + public List getProjects() { + return projectRepository.findAll(); } - public Optional getPost(Integer postId) { - return postRepository.findById(postId); + public Optional getProject (Integer projectId) { + return projectRepository.findById(projectId); } - public Optional updatePost(Integer postId, PostRequest postRequest) { - return postRepository.findById(postId) - .map(post -> { - post.setTitle(postRequest.getTitle()); - post.setContents(postRequest.getContents()); - post.setTag(postRequest.getTag()); - return postRepository.save(post); + public Optional updateProject(Integer projectId, ProjectRequest projectRequest){ + return projectRepository.findById(projectId) + .map(project ->{ + project.setTitle(projectRequest.getTitle()); + project.setSummary(projectRequest.getSummary()); + project.setDescription(projectRequest.getDescription()); + project.setStartDate(projectRequest.getStartDate()); + project.setEndDate(projectRequest.getEndDate()); + project.setIsInProgress(projectRequest.getIsInProgress()); + return projectRepository.save(project); }); } - public void deletePost(Integer postId) { - postRepository.findById(postId) - .ifPresent(postRepository::delete); + public void deleteProject (Integer projectId){ + projectRepository.findById(projectId).ifPresent(project->projectRepository.delete(project)); } -} + +} \ No newline at end of file