[202102685 이지은] CRUD 과제 제출합니다.

.github/workflows/deployment_scp.yml

@@ -46,10 +46,10 @@ jobs:
       - name: Send jar to remote server
         uses: appleboy/scp-action@master
         with:
-          host: {나의 public ip}
-          username: {나의 userName}
+          host: 192.168.219.105
+          username: leejieun0000
           source: "devlog_springboot-0.0.1-SNAPSHOT.jar"
-          target: "/home/{나의 userName}"
+          target: "/home/leejieun0000"
           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: 192.168.219.105
+          username: leejieun0000
           source: "deploy.sh"
-          target: "/home/{나의 userName}"
+          target: "/home/leejieun0000"
           key: ${{ secrets.PRIVATE_KEY }}
       - name: Execute script
         uses: appleboy/ssh-action@master
         with:
-          username: {나의 userName}
-          host: {나의 public ip}
+          username: leejieun0000
+          host: 192.168.219.105
           key: ${{ secrets.PRIVATE_KEY }}
           script_stop: true
-          script: cd /home/{나의 userName} && chmod +x deploy.sh && ./deploy.sh
+          script: cd /home/leejieun0000 && chmod +x deploy.sh && ./deploy.sh

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

@@ -6,6 +6,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import com.com.cnu.devlog_springboot.type.Tag;
+import org.springframework.lang.Nullable;
 
 import java.util.List;
 
@@ -15,24 +17,27 @@
 public class PostController {
     private final PostService postService;
 
-    // GET /posts
-    @GetMapping
-    public ResponseEntity<List<Post>> getPosts() {
-        return ResponseEntity.ok(postService.getPosts());
-    }
-
     // GET /posts/{postId}
     @GetMapping("{postId}")
     public ResponseEntity<Post> getPost(@PathVariable("postId")Integer postId) {
         return ResponseEntity.ok(postService.getPost(postId));
     }
 
+
+    // GET /posts/tag
+    @GetMapping
+    public ResponseEntity<List<Post>> getPosts(@RequestParam @Nullable Tag tag) {
+        return ResponseEntity.ok(postService.getPosts(tag));
+    }
+
+
     // POST /posts
     @PostMapping
     public ResponseEntity<Post> createPost(@RequestBody PostRequest postRequest) {
-        return ResponseEntity.ok(postService.creatPost(postRequest));
+        return ResponseEntity.ok(postService.createPost(postRequest));
     }
 
+
     // PUT /posts/{postId}
     // ex. localhost:8080/posts/3
     @PutMapping("{postId}")
@@ -43,10 +48,12 @@ public ResponseEntity<Post> updatePost(
         return ResponseEntity.ok(postService.updatePost(postId, postRequest));
     }
 
+
     // DELETE /posts/{postId}
     @DeleteMapping("{postId}")
     public ResponseEntity<Void> deletePost(@PathVariable("postId") Integer postId) {
         postService.deletePost(postId);
         return ResponseEntity.noContent().build();
     }
 }
+

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

@@ -0,0 +1,54 @@
+package com.com.cnu.devlog_springboot.controller;
+
+import com.com.cnu.devlog_springboot.model.Project;
+import com.com.cnu.devlog_springboot.model.request.ProjectRequest;
+import com.com.cnu.devlog_springboot.service.ProjectService;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+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.PostMapping;
+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;
+
+@RestController
+@RequestMapping("/project")
+@RequiredArgsConstructor
+public class ProjectController {
+
+    private final ProjectService projectService;
+
+    @GetMapping
+    public ResponseEntity<List<Project>> getProjects() {
+        return ResponseEntity.ok(projectService.getProjects());
+    }
+
+    @GetMapping("{projectId}")
+    public ResponseEntity<Project> getProject(@PathVariable("projectId") Integer projectId) {
+        return ResponseEntity.ok(projectService.getProject(projectId));
+    }
+
+    @PostMapping
+    public ResponseEntity<Project> createPost(@RequestBody ProjectRequest projectRequest) {
+        return ResponseEntity.ok(projectService.createProject(projectRequest));
+    }
+
+
+    @PutMapping("{projectId}")
+    public ResponseEntity<Project> updateProject(
+            @PathVariable("projectId") Integer projectId,
+            @RequestBody ProjectRequest projectRequest
+    ) {
+        return ResponseEntity.ok(projectService.updateProject(projectId, projectRequest));
+    }
+
+    @DeleteMapping("{projectId}")
+    public ResponseEntity<Void> deleteProject(@PathVariable("projectId") Integer projectId) {
+        projectService.deleteProject(projectId);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/com/com/cnu/devlog_springboot/exception/DevlogException.java

@@ -0,0 +1,11 @@
+package com.com.cnu.devlog_springboot.exception;
+
+import com.com.cnu.devlog_springboot.type.ErrorCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class DevlogException extends RuntimeException {
+    private final ErrorCode errorCode;
+}

src/main/java/com/com/cnu/devlog_springboot/exception/GlobalExceptionHandler.java

@@ -0,0 +1,26 @@
+package com.com.cnu.devlog_springboot.exception;
+
+import com.com.cnu.devlog_springboot.model.response.ErrorResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(DevlogException.class)
+    public ResponseEntity<ErrorResponse> handlerDevlogException(
+            HttpServletRequest request, DevlogException e
+    ) {
+        return ResponseEntity.status(e.getErrorCode().getHttpStatus())
+                .body(
+                        new ErrorResponse(
+                                e.getErrorCode().getDescription(),
+                                e.getErrorCode().getHttpStatus().value(),
+                                e.getErrorCode().getErrorCode(),
+                                request.getRequestURI()
+                        )
+                );
+    }
+}

src/main/java/com/com/cnu/devlog_springboot/model/response/ErrorResponse.java

@@ -0,0 +1,8 @@
+package com.com.cnu.devlog_springboot.model.response;
+
+public record ErrorResponse(String title,
+                            Integer status,
+                            Integer code,
+                            String instance) {
+
+}

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

@@ -1,13 +1,17 @@
 package com.com.cnu.devlog_springboot.repository;
 
 import com.com.cnu.devlog_springboot.model.Post;
+import com.com.cnu.devlog_springboot.type.Tag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface PostRepository extends JpaRepository<Post, Integer> {
 //    Post save(Post post);
 //    List<Post> findAll();
 //    Optional<Post> findById(Integer postId);
 //    void delete(Post post);
+    List<Post> findAllByTag(Tag tag);
 }

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

@@ -0,0 +1,9 @@
+package com.com.cnu.devlog_springboot.repository;
+
+import com.com.cnu.devlog_springboot.model.Project;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProjectRepository extends JpaRepository<Project, Integer> {
+
+}
+

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

@@ -1,8 +1,12 @@
 package com.com.cnu.devlog_springboot.service;
 
+import com.com.cnu.devlog_springboot.exception.DevlogException;
 import com.com.cnu.devlog_springboot.model.Post;
 import com.com.cnu.devlog_springboot.model.request.PostRequest;
 import com.com.cnu.devlog_springboot.repository.PostRepository;
+import com.com.cnu.devlog_springboot.type.ErrorCode;
+import com.com.cnu.devlog_springboot.type.Tag;
+import io.micrometer.common.lang.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -13,11 +17,18 @@
 public class PostService {
     private final PostRepository postRepository;
 
-    public List<Post> getPosts() {
+    public List<Post> getPosts(@Nullable Tag tag) {
+        if (tag != null)
+            return postRepository.findAllByTag(tag);
+
         return postRepository.findAll();
     }
 
-    public Post creatPost(PostRequest postRequest) {
+    public Post getPost(Integer postId) {
+        return postRepository.findById(postId)
+                .orElseThrow(() -> new DevlogException(ErrorCode.POST_NOT_FOUND));
+    }
+    public Post createPost(PostRequest postRequest) {
         return postRepository.save(new Post(
                 null,
                 postRequest.title(),
@@ -36,13 +47,10 @@ public Post updatePost(Integer postId, PostRequest postRequest) {
                 .orElse(null);
     }
 
-    public Post getPost(Integer postId) {
-        return postRepository.findById(postId)
-                .orElse(null);
-    }
-
     public void deletePost(Integer postId) {
         postRepository.findById(postId)
                 .ifPresent(postRepository::delete);
     }
+
+
 }

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

@@ -0,0 +1,60 @@
+package com.com.cnu.devlog_springboot.service;
+
+import com.com.cnu.devlog_springboot.exception.DevlogException;
+import com.com.cnu.devlog_springboot.model.Project;
+import com.com.cnu.devlog_springboot.model.request.ProjectRequest;
+import com.com.cnu.devlog_springboot.repository.ProjectRepository;
+import com.com.cnu.devlog_springboot.type.ErrorCode;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ProjectService {
+
+    private final ProjectRepository projectRepository;
+
+
+    public List<Project> getProjects() {
+        return projectRepository.findAll();
+    }
+
+    public Project getProject(Integer projectId) {
+        return projectRepository.findById(projectId)
+                .orElseThrow(() -> new DevlogException(ErrorCode.PROJECT_NOT_FOUND));
+    }
+
+    public Project createProject(ProjectRequest projectRequest) {
+        return projectRepository.save(new Project(
+                null,
+                projectRequest.title(),
+                projectRequest.summary(),
+                projectRequest.contents(),
+                projectRequest.startDate(),
+                projectRequest.endDate()
+        ));
+    }
+
+    public Project updateProject(Integer projectId, ProjectRequest projectRequest) {
+        return projectRepository.findById(projectId)
+                .map(project -> {
+                    project.setTitle(projectRequest.title());
+                    project.setContents(projectRequest.contents());
+                    project.setSummary(projectRequest.summary());
+                    project.setStartDate(projectRequest.startDate());
+                    project.setEndDate(projectRequest.endDate());
+                    return projectRepository.save(project);
+                })
+                .orElseThrow(() -> new DevlogException(ErrorCode.PROJECT_NOT_FOUND));
+
+    }
+
+    public void deleteProject(Integer projectId) {
+        projectRepository.findById(projectId)
+                .ifPresent(projectRepository::delete);
+    }
+
+
+
+}

src/main/java/com/com/cnu/devlog_springboot/type/ErrorCode.java

@@ -0,0 +1,30 @@
+package com.com.cnu.devlog_springboot.type;
+
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum ErrorCode {
+    //4xx
+
+    POST_NOT_FOUND(HttpStatus.NOT_FOUND,
+            4000,
+            "해당 게시글을 찾을 수 없음."
+    ),
+    PROJECT_NOT_FOUND(
+            HttpStatus.NOT_FOUND,
+            4001,
+            "해당 프로젝트를 찾을 수 없음.")
+    ;
+
+    private final HttpStatus httpStatus;
+    private final Integer errorCode;
+    private final String description;
+
+    ErrorCode(HttpStatus httpStatus, Integer errorCode, String description) {
+        this.httpStatus = httpStatus;
+        this.errorCode = errorCode;
+        this.description = description;
+    }
+}