[202002469 김민성] CRUD 과제 제출

.github/workflows/deployment_scp.yml

@@ -19,39 +19,39 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
-      with:
-        arguments: build
-    - uses: actions/upload-artifact@v3
-      with:
-        name: jar
-        path: build/libs
-        
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+        with:
+          arguments: build
+      - uses: actions/upload-artifact@v3
+        with:
+          name: jar
+          path: build/libs
+
   send-jar:
     needs: build
     runs-on: ubuntu-latest
-    steps: 
+    steps:
       - name: Download jar
         uses: actions/download-artifact@v3
         with:
           name: jar
       - name: Send jar to remote server
         uses: appleboy/scp-action@master
         with:
-          host: {나의 public ip}
-          username: {나의 userName}
+          host: 34.64.133.118
+          username: kms010218
           source: "devlog_springboot-0.0.1-SNAPSHOT.jar"
-          target: "/home/{나의 userName}"
+          target: "/home/kms010218"
           key: ${{ secrets.PRIVATE_KEY }}
-  
+
   run-app:
     needs: send-jar
     runs-on: ubuntu-latest
@@ -61,16 +61,16 @@ jobs:
       - name: Move deploy.sh
         uses: appleboy/scp-action@master
         with:
-          host: {나의 public ip}
-          username: {나의 userName}
+          host: 34.64.133.118
+          username: kms010218
           source: "deploy.sh"
-          target: "/home/{나의 userName}"
+          target: "/home/kms010218"
           key: ${{ secrets.PRIVATE_KEY }}
       - name: Execute script
         uses: appleboy/ssh-action@master
         with:
-          username: {나의 userName}
-          host: {나의 public ip}
+          username: kms010218
+          host: 34.64.133.118
           key: ${{ secrets.PRIVATE_KEY }}
           script_stop: true
-          script: cd /home/{나의 userName} && chmod +x deploy.sh && ./deploy.sh
+          script: cd /home/kms010218 && chmod +x deploy.sh && ./deploy.sh

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

@@ -3,6 +3,8 @@
 import com.com.cnu.devlog_springboot.model.Post;
 import com.com.cnu.devlog_springboot.model.request.PostRequest;
 import com.com.cnu.devlog_springboot.service.PostService;
+import com.com.cnu.devlog_springboot.type.Tag;
+import io.micrometer.common.lang.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,8 +19,8 @@ public class PostController {
 
     // GET /posts
     @GetMapping
-    public ResponseEntity<List<Post>> getPosts() {
-        return ResponseEntity.ok(postService.getPosts());
+    public ResponseEntity<List<Post>> getPosts(@RequestParam("tag") @Nullable Tag tag) {
+        return ResponseEntity.ok(postService.getPosts(tag));
     }
 
     // GET /posts/{postId}

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

@@ -0,0 +1,53 @@
+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;
+
+    @PostMapping
+    public ResponseEntity<Project> createPost(@RequestBody ProjectRequest projectRequest) {
+        return ResponseEntity.ok(projectService.createProject(projectRequest));
+    }
+
+    @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));
+    }
+
+    @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> deletePost(@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,9 @@
+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,8 @@
+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,7 +17,10 @@
 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();
     }
 
@@ -33,12 +40,12 @@ public Post updatePost(Integer postId, PostRequest postRequest) {
                     post.setContents(postRequest.contents());
                     return postRepository.save(post);
                 })
-                .orElse(null);
+                .orElseThrow(() -> new DevlogException(ErrorCode.POST_NOT_FOUND));
     }
 
     public Post getPost(Integer postId) {
         return postRepository.findById(postId)
-                .orElse(null);
+                .orElseThrow(() -> new DevlogException(ErrorCode.POST_NOT_FOUND));
     }
 
     public void deletePost(Integer postId) {

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

@@ -0,0 +1,58 @@
+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,28 @@
+package com.com.cnu.devlog_springboot.type;
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum ErrorCode {
+    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;
+    }
+}