[201902722 유형곤] Feature/201902722

.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: 34.64.125.87
+          username: g42_hyeyoo
           source: "devlog_springboot-0.0.1-SNAPSHOT.jar"
-          target: "/home/{나의 userName}"
+          target: "/home/g42_hyeyoo"
           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.125.87
+          username: g42_hyeyoo
           source: "deploy.sh"
-          target: "/home/{나의 userName}"
+          target: "/home/g42_hyeyoo"
           key: ${{ secrets.PRIVATE_KEY }}
       - name: Execute script
         uses: appleboy/ssh-action@master
         with:
-          username: {나의 userName}
-          host: {나의 public ip}
+          username: g42_hyeyoo
+          host: 34.64.125.87
           key: ${{ secrets.PRIVATE_KEY }}
           script_stop: true
-          script: cd /home/{나의 userName} && chmod +x deploy.sh && ./deploy.sh
+          script: cd /home/g42_hyeyoo && chmod +x deploy.sh && ./deploy.sh

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

@@ -0,0 +1,46 @@
+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 lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/projects")
+@RequiredArgsConstructor
+public class ProjectController {
+    // GET /projects
+    public final ProjectService projectService;
+
+    @GetMapping
+    public List<Project> getAllProjects() {
+        return projectService.getAllProjects();
+    }
+
+    @GetMapping("{projectId}")
+    public ResponseEntity<Project> getProjectById(@PathVariable Integer projectId) {
+        Project project = projectService.getProject(projectId);
+        return ResponseEntity.ok(project);
+    }
+
+    @PostMapping
+    public ResponseEntity<Project> createProject(@RequestBody ProjectRequest projectRequest) {
+        return ResponseEntity.ok(projectService.createProject(projectRequest));
+    }
+
+    @PutMapping("{projectId}")
+    public ResponseEntity<Project> updateProject(@PathVariable Integer projectId, @RequestBody ProjectRequest projectRequest) {
+        Project project = projectService.updateProject(projectId, projectRequest);
+        return ResponseEntity.ok(project);
+    }
+
+    @DeleteMapping("{projectId}")
+    public ResponseEntity<Void> deleteProject(@PathVariable 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,29 @@
+package com.com.cnu.devlog_springboot.exception;
+
+import com.com.cnu.devlog_springboot.model.ErrorResponse;
+import com.com.cnu.devlog_springboot.type.ErrorCode;
+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> handleDevlogException(
+            final HttpServletRequest request,
+            final DevlogException e
+    ) {
+        final ErrorCode errorCode = e.getErrorCode();
+        return ResponseEntity.status(e.getErrorCode().getHttpStatus())
+                .body(
+                        new ErrorResponse(
+                                errorCode.getDescription(),
+                                errorCode.getHttpStatus().value(),
+                                errorCode.getErrorCode(),
+                                request.getRequestURI()
+                        )
+                );
+    }
+}

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

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

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

@@ -0,0 +1,13 @@
+package com.com.cnu.devlog_springboot.repository;
+
+import com.com.cnu.devlog_springboot.model.Project;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ProjectRepository extends JpaRepository<Project, Integer> {
+    //    Project save(Project project);
+    //    List<Project> findAll();
+    //    Optional<Project> findById(Integer projectId);
+    //    void delete(Project project);
+}

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

@@ -1,8 +1,10 @@
 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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -33,16 +35,17 @@ 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) {
-        postRepository.findById(postId)
-                .ifPresent(postRepository::delete);
+        Post post = postRepository.findById(postId)
+                .orElseThrow(() -> new DevlogException(ErrorCode.POST_NOT_FOUND));
+        postRepository.delete(post);
     }
 }

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

@@ -0,0 +1,55 @@
+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 lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ProjectService {
+    private final ProjectRepository projectRepository;
+
+    public Project createProject(ProjectRequest projectRequest) {
+        return projectRepository.save(
+                new Project(null,
+                        projectRequest.title(),
+                        projectRequest.summary(),
+                        projectRequest.contents(),
+                        projectRequest.startDate(),
+                        projectRequest.endDate())
+        );
+    }
+
+    public Project getProject(Integer projectId) {
+        return projectRepository.findById(projectId).orElseThrow(()
+                -> new DevlogException(ErrorCode.PROJECT_NOT_FOUND));
+    }
+
+    public List<Project> getAllProjects() {
+        return projectRepository.findAll();
+    }
+
+    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) {
+        Project project = projectRepository.findById(projectId)
+                .orElseThrow(() -> new DevlogException(ErrorCode.PROJECT_NOT_FOUND));
+        projectRepository.delete(project);
+    }
+}

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

@@ -0,0 +1,20 @@
+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, 404, "해당 게시글을 찾을 수 없습니다."),
+    PROJECT_NOT_FOUND(HttpStatus.NOT_FOUND, 404, "해당 프로젝트 글을 찾을 수 없습니다.");
+
+    private final HttpStatus httpStatus;
+    private final Integer errorCode;
+    private final String description;
+
+    ErrorCode(final HttpStatus httpStatus, final Integer errorCode, final String description) {
+        this.httpStatus = httpStatus;
+        this.errorCode = errorCode;
+        this.description = description;
+    }
+}