202102721/최진경

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

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

@@ -1,45 +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 lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.RestController;
 
 @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));
-    }
-
-    @GetMapping
-    public ResponseEntity<List<Post>> getPosts() {
-        return ResponseEntity.ok(postService.getPosts());
-    }
-
-    @GetMapping("/{postId}")
-    public ResponseEntity<Post> getPost(@PathVariable("postId") Integer postId) {
-        return ResponseEntity.ok(postService.getPost(postId).orElse(null));
-    }
-
-    @PutMapping("/{postId}")
-    public ResponseEntity<Post> updatePost(@PathVariable("postId")Integer postId,
-                                           @RequestBody PostRequest postRequest) {
-        return ResponseEntity.ok(postService.updatePost(postId, postRequest).orElse(null));
-    }
-
-    @DeleteMapping("/{postId}")
-    public ResponseEntity<Void> deletePost(@PathVariable("postId") Integer postId) {
-        postService.deletePost(postId);
-
-        return ResponseEntity.noContent().build();
-    }
 }

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

@@ -0,0 +1,44 @@
+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.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/projects")
+public class ProjectController {
+    private final ProjectService projectService;
+
+    @PostMapping
+    public ResponseEntity<Project> createProject(@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).orElse(null));
+    }
+
+    @PutMapping("/{projectId}")
+    public ResponseEntity<Project> updateProject(@PathVariable("projectId") Integer projectId, @RequestBody ProjectRequest projectRequest) {
+        return ResponseEntity.ok(projectService.updateProject(projectId, projectRequest).orElse(null));
+    }
+
+    @DeleteMapping("/{projectId}")
+    public ResponseEntity<Void> deleteProject(@PathVariable("projectId") Integer projectId) {
+        projectService.deleteProject(projectId);
+
+        return ResponseEntity.noContent().build();
+    }
+}

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

@@ -1,21 +1,17 @@
 package com.cnu.real_coding_server.entity;
-
 import com.cnu.real_coding_server.model.type.Tag;
 import jakarta.persistence.*;
 import lombok.*;
-
 @Getter
 @Entity(name = "posts")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Post extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
-
     @Column
     @Setter
     private String title;
-
     @Column
     @Setter
     private String contents;
@@ -30,4 +26,4 @@ public Post(String title, String contents, Tag tag) {
         this.contents = contents;
         this.tag = tag;
     }
-}
+}

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

@@ -6,8 +6,12 @@
 
 @Repository
 public interface ProjectRepository extends JpaRepository<Project, Integer> {
+<<<<<<< HEAD
+}
+=======
 //    Project save(Project post);
 //    List<Project> findAll();
 //    Optional<Project> findById(Integer projectId);
 //    void delete(Project projectId);
 }
+>>>>>>> nice/feature/202102721

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

@@ -1,44 +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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Optional;
-
 @Service
-@RequiredArgsConstructor
 public class PostService {
-
-    private final PostRepository postRepository;
-
-    public Post createPost(PostRequest postRequest) {
-        return postRepository.save(postRequest.toEntity());
-    }
-
-    public List<Post> getPosts() {
-        return postRepository.findAll();
-    }
-
-    public Optional<Post> getPost(Integer postId) {
-        return postRepository.findById(postId);
-    }
-
-    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 deletePost(Integer postId) {
-        postRepository.findById(postId)
-                .ifPresent(postRepository::delete);
-    }
 }

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

@@ -0,0 +1,46 @@
+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 java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class ProjectService {
+    private final ProjectRepository projectRepository;
+
+    public Project createProject(ProjectRequest projectRequest) {
+        return projectRepository.save(projectRequest.toEntity());
+    }
+
+    public List<Project> getProjects() {
+        return projectRepository.findAll();
+    }
+
+    public Optional<Project> getProject(Integer projectId) {
+        return projectRepository.findById(projectId);
+    }
+
+    public Optional<Project> updateProject(Integer projectId, ProjectRequest projectRequest) {
+        return projectRepository.findById(projectId)
+                .map(project -> {
+                    project.setTitle(projectRequest.getTitle());
+                    project.setDescription(projectRequest.getDescription());
+                    project.setSummary(projectRequest.getSummary());
+                    project.setStartDate(projectRequest.getStartDate());
+                    project.setEndDate(projectRequest.getEndDate());
+                    project.setIsInProgress(projectRequest.getIsInProgress());
+                    return projectRepository.save(project);
+                });
+    }
+
+    public void deleteProject(Integer projectId) {
+        projectRepository.findById(projectId)
+                .ifPresent(projectRepository::delete);
+    }
+}

src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     driver-class-name: org.h2.Driver  # Database? H2? ?????.
     url: jdbc:h2:mem:devblog # H2 ?? ??
     username: sa  # H2 ?? ? ??? username ?? (??? ??? ??)
-    password:  # H2 ?? ? ??? password ?? (??? ??? ??)
+    password: 1234 # H2 ?? ? ??? password ?? (??? ??? ??)
 
   jpa:
     hibernate: