Feature/201902741

.github/workflows/deployment.yml

@@ -46,10 +46,10 @@ jobs:
       - name: Send jar to remote server
         uses: appleboy/scp-action@master
         with:
-          host: {나의 public ip}
-          username: {나의 userName}
+          host: 34.64.193.87
+          username: goqpqp234
           source: "real_coding_server-0.0.1-SNAPSHOT.jar"
-          target: "/home/adulkid.kaya"
+          target: "/home/goqpqp234"
           key: ${{ secrets.PRIVATE_KEY }}
 
   run-app:
@@ -61,16 +61,16 @@ jobs:
       - name: Move deploy.sh
         uses: appleboy/scp-action@master
         with:
-          host: {나의 public ip}
-          username: {나의 userName}
+          host: 34.64.193.87
+          username: goqpqp234
           source: "deploy.sh"
-          target: "/home/{나의 userName}"
+          target: "/home/goqpqp234"
           key: ${{ secrets.PRIVATE_KEY }}
       - name: Execute script
         uses: appleboy/ssh-action@master
         with:
-          username: {나의 userName}
-          host: {나의 public ip}
+          username: goqpqp234
+          host: 34.64.193.87
           key: ${{ secrets.PRIVATE_KEY }}
           script_stop: true
-          script: cd /home/{나의 userName} && chmod +x deploy.sh && ./deploy.sh
+          script: cd /home/goqpqp234 && chmod +x deploy.sh && ./deploy.sh

src/main/java/com/cnu/real_coding_server/controller/PostController.java

@@ -4,42 +4,50 @@
 import com.cnu.real_coding_server.model.request.PostRequest;
 import com.cnu.real_coding_server.service.PostService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
-@RequestMapping("/posts")
 @RequiredArgsConstructor
 public class PostController {
+
     private final PostService postService;
 
-    @PostMapping
-    public ResponseEntity<Post> createPost(@RequestBody PostRequest postRequest) {
-        return ResponseEntity.ok(postService.createPost(postRequest));
+    @PostMapping("post")
+    public ResponseEntity<?> save(
+            @RequestBody PostRequest postRequest
+    ) {
+        postService.save(postRequest);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @GetMapping
-    public ResponseEntity<List<Post>> getPosts() {
-        return ResponseEntity.ok(postService.getPosts());
+    @GetMapping("post")
+    public ResponseEntity<?> findAllPost() {
+        List<Post> postList = postService.findAll();
+        return new ResponseEntity<>(postList, HttpStatus.OK);
     }
 
-    @GetMapping("/{postId}")
-    public ResponseEntity<Post> getPost(@PathVariable("postId") Integer postId) {
-        return ResponseEntity.ok(postService.getPost(postId).orElse(null));
+    @GetMapping("post/{postId}")
+    public ResponseEntity<?> findPostById(@PathVariable Integer postId) {
+        Post post = postService.findById(postId);
+        return new ResponseEntity<>(post, HttpStatus.OK);
     }
 
-    @PutMapping("/{postId}")
-    public ResponseEntity<Post> updatePost(@PathVariable("postId")Integer postId,
-                                           @RequestBody PostRequest postRequest) {
-        return ResponseEntity.ok(postService.updatePost(postId, postRequest).orElse(null));
+    @PutMapping("post/{postId}")
+    public ResponseEntity<?> editPostPyId(
+            @PathVariable Integer postId,
+            @RequestBody PostRequest postRequest) {
+        postService.edit(postId, postRequest);
+        return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
-    @DeleteMapping("/{postId}")
-    public ResponseEntity<Void> deletePost(@PathVariable("postId") Integer postId) {
-        postService.deletePost(postId);
-
-        return ResponseEntity.noContent().build();
+    @DeleteMapping("post/{postId}")
+    public ResponseEntity<?> editPostPyId(
+            @PathVariable Integer postId) {
+        postService.delete(postId);
+        return new ResponseEntity<>(HttpStatus.CREATED);
     }
 }

src/main/java/com/cnu/real_coding_server/controller/ProjectController.java

@@ -0,0 +1,52 @@
+package com.cnu.real_coding_server.controller;
+
+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.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class ProjectController {
+    private final ProjectService projectService;
+
+    @PostMapping("project")
+    public ResponseEntity<?> save(
+            @RequestBody ProjectRequest projectRequest
+    ) {
+        projectService.save(projectRequest);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("project")
+    public ResponseEntity<?> findAllProject() {
+        List<Project> projectList = projectService.findAll();
+        return new ResponseEntity<>(projectList, HttpStatus.OK);
+    }
+
+    @GetMapping("project/{projectId}")
+    public ResponseEntity<?> findProjectById(@PathVariable Integer projectId) {
+        Project project = projectService.findById(projectId);
+        return new ResponseEntity<>(project, HttpStatus.OK);
+    }
+
+    @PutMapping("project/{projectId}")
+    public ResponseEntity<?> editProjectPyId(
+            @PathVariable Integer projectId,
+            @RequestBody ProjectRequest projectRequest) {
+        projectService.edit(projectId, projectRequest);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("project/{projectId}")
+    public ResponseEntity<?> editProjectPyId(
+            @PathVariable Integer projectId) {
+        projectService.delete(projectId);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+}

src/main/java/com/cnu/real_coding_server/entity/Post.java

@@ -20,8 +20,8 @@ public class Post extends BaseEntity {
     @Setter
     private String contents;
 
-    @Setter
     @Enumerated(EnumType.STRING)
+    @Setter
     private Tag tag;
 
     @Builder

src/main/java/com/cnu/real_coding_server/model/request/PostRequest.java

@@ -3,12 +3,10 @@
 
 import com.cnu.real_coding_server.entity.Post;
 import com.cnu.real_coding_server.model.type.Tag;
-import jakarta.validation.Valid;
 import lombok.Getter;
 
 @Getter
 public class PostRequest {
-    @Valid
     private String title;
     private String contents;
 

src/main/java/com/cnu/real_coding_server/repository/PostRepository.java

@@ -4,10 +4,13 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface PostRepository extends JpaRepository<Post, Integer> {
-//    Post save(Post post);
-//    List<Post> findAll();
-//    Optional<Post> findById(Integer postId);
-//    void delete(Post post);
+    Post save(Post post);
+    List<Post> findAll();
+    Optional<Post> findById(Integer postId);
+    void delete(Post post);
 }

src/main/java/com/cnu/real_coding_server/repository/ProjectRepository.java

@@ -2,12 +2,13 @@
 
 import com.cnu.real_coding_server.entity.Project;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
-@Repository
+import java.util.List;
+import java.util.Optional;
+
 public interface ProjectRepository extends JpaRepository<Project, Integer> {
-//    Project save(Project post);
-//    List<Project> findAll();
-//    Optional<Project> findById(Integer projectId);
-//    void delete(Project projectId);
+    Project save(Project project);
+    List<Project> findAll();
+    Optional<Project> findById(Integer projectId);
+    void delete(Project project);
 }

src/main/java/com/cnu/real_coding_server/service/PostService.java

@@ -5,40 +5,46 @@
 import com.cnu.real_coding_server.repository.PostRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
+@Transactional
 @RequiredArgsConstructor
 public class PostService {
 
     private final PostRepository postRepository;
 
-    public Post createPost(PostRequest postRequest) {
-        return postRepository.save(postRequest.toEntity());
+    public void save(PostRequest postRequest) {
+         postRepository.save(postRequest.toEntity());
     }
 
-    public List<Post> getPosts() {
+    public Post findById(Integer postId) {
+        return getPost(postId);
+    }
+
+    public List<Post> findAll() {
         return postRepository.findAll();
     }
 
-    public Optional<Post> getPost(Integer postId) {
-        return postRepository.findById(postId);
+    public void edit(Integer postId, PostRequest postRequest) {
+        Post post = getPost(postId);
+
+        post.setTitle(postRequest.getTitle());
+        post.setContents(postRequest.getContents());
+        post.setTag(postRequest.getTag());
     }
 
-    public Optional<Post> 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 void delete(Integer postId) {
+        Post post = getPost(postId);
+
+        postRepository.delete(post);
     }
 
-    public void deletePost(Integer postId) {
-        postRepository.findById(postId)
-                .ifPresent(postRepository::delete);
+    private Post getPost(Integer postId) {
+        return postRepository.findById(postId).stream().findAny()
+                .orElseThrow(() -> new RuntimeException("포스트가 존재하지 않습니다."));
     }
+
 }

src/main/java/com/cnu/real_coding_server/service/ProjectService.java

@@ -0,0 +1,51 @@
+package com.cnu.real_coding_server.service;
+
+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;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProjectService {
+
+    private final ProjectRepository projectRepository;
+
+    public void save(ProjectRequest projectRequest) {
+        projectRepository.save(projectRequest.toEntity());
+    }
+
+    public Project findById(Integer projectId) {
+        return getProject(projectId);
+    }
+
+    public List<Project> findAll() {
+        return projectRepository.findAll();
+    }
+
+    public void edit(Integer projectId, ProjectRequest projectRequest) {
+        Project project = getProject(projectId);
+
+        project.setTitle(projectRequest.getTitle());
+        project.setDescription(projectRequest.getDescription());
+        project.setSummary(projectRequest.getSummary());
+        project.setEndDate(projectRequest.getEndDate());
+        project.setStartDate(projectRequest.getStartDate());
+        project.setIsInProgress(projectRequest.getIsInProgress());
+    }
+
+    public void delete(Integer projectId) {
+        projectRepository.findById(projectId).ifPresent(projectRepository::delete);
+    }
+
+    private Project getProject(Integer projectId) {
+        return projectRepository.findById(projectId).stream().findAny()
+                .orElseThrow(() -> new RuntimeException("포스트가 존재하지 않습니다."));
+    }
+
+}