diff --git a/ad/src/main/java/com/cnu/ad/model/Advertisment.java b/ad/src/main/java/com/cnu/ad/model/Advertisment.java new file mode 100644 index 0000000..c9eb464 --- /dev/null +++ b/ad/src/main/java/com/cnu/ad/model/Advertisment.java @@ -0,0 +1,2 @@ +package com.cnu.ad.model;public record Advertisment() { +} diff --git a/ad/src/main/java/com/cnu/ad/service/PostService.java b/ad/src/main/java/com/cnu/ad/service/PostService.java new file mode 100644 index 0000000..f4bfe3f --- /dev/null +++ b/ad/src/main/java/com/cnu/ad/service/PostService.java @@ -0,0 +1,2 @@ +package com.cnu.ad.service;public class PostService { +} diff --git a/ad/src/main/resources/application.yml b/ad/src/main/resources/application.yml new file mode 100644 index 0000000..b92eded --- /dev/null +++ b/ad/src/main/resources/application.yml @@ -0,0 +1,32 @@ +spring: + # H2 Setting Info (H2 Console? ???? ?? ???? ??) + h2: + console: + enabled: true # H2 Console? ???? ?? (H2 Console? H2 Database? UI? ????? ??) + path: /h2-console # H2 Console? Path + # Database Setting Info (Database? H2? ???? ?? H2?? ?? ??) + datasource: + driver-class-name: org.h2.Driver # Database? H2? ?????. + url: jdbc:h2:mem:devblog # H2 ?? ?? + username: sa # H2 ?? ? ??? username ?? (??? ??? ??) + password: # H2 ?? ? ??? password ?? (??? ??? ??) + + jpa: + hibernate: + ddl-auto: create # ??????? ??? ? ??????? ????? ?? ??? ?? + properties: + hibernate: + format_sql: true # ???? query? ??? + + resilience4j: + circuitbreaker: + instances: + ad: + slidingWindowType: COUNT_BASED + slidingWindowSize: 5 + failureRateThreshold: 50 # 에러 비율로 해당 값 이상으로 에러 발생시 서킷이 open + slowCallRateThreshold: 100 + minimumNumberOfCalls: 3 # circuitbreaker가 에러비율 또는 slow call 비율을 계산하기 전에 요구되는 최소 호출 횟수 + + logging.level: + org.hibernate.SQL: debug \ No newline at end of file diff --git a/post/src/main/java/com/cnu/post/controller/PostController.java b/post/src/main/java/com/cnu/post/controller/PostController.java new file mode 100644 index 0000000..b5e7d15 --- /dev/null +++ b/post/src/main/java/com/cnu/post/controller/PostController.java @@ -0,0 +1,2 @@ +package com.cnu.post.controller;public class PostController { +} diff --git a/src/main/java/com/cnu/real_coding_server/controller/PostController.java b/src/main/java/com/cnu/real_coding_server/controller/PostController.java index 8d7b907..7e086fb 100644 --- a/src/main/java/com/cnu/real_coding_server/controller/PostController.java +++ b/src/main/java/com/cnu/real_coding_server/controller/PostController.java @@ -1,7 +1,47 @@ package com.cnu.real_coding_server.controller; -import org.springframework.web.bind.annotation.RestController; +import com.cnu.real_coding_server.entity.Post; +import com.cnu.real_coding_server.entity.Project; +import com.cnu.real_coding_server.model.request.PostRequest; +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 -public class PostController { -} +@RequestMapping("/projects") +@RequiredArgsConstructor +public class ProjectController { + private final ProjectService projectService; + + @PostMapping + public ResponseEntity createProject(@RequestBody ProjectRequest projectRequest) { + return ResponseEntity.ok(projectService.createProject(projectRequest)); + } + + @GetMapping + public ResponseEntity> getProjects() { + return ResponseEntity.ok(projectService.getProjects()); + } + + @GetMapping("/{projectId}") + public ResponseEntity getProject(@PathVariable("projectId") Integer projectId) { + return ResponseEntity.ok(projectService.getProject(projectId).orElse(null)); + } + + @PutMapping("/{projectId}") + public ResponseEntity updateProject(@PathVariable("projectId") Integer projectId, ProjectRequest projectRequest) { + return ResponseEntity.ok(projectService.updateProject(projectId, projectRequest).orElse(null)); + } + + @DeleteMapping("/{projectId}") + public ResponseEntity deleteProject(@PathVariable("projectId") Integer projectId) { + projectService.deleteProject(projectId); + + return ResponseEntity.noContent().build(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/cnu/real_coding_server/entity/Post.java b/src/main/java/com/cnu/real_coding_server/entity/Post.java index 5cfa06a..bb99748 100644 --- a/src/main/java/com/cnu/real_coding_server/entity/Post.java +++ b/src/main/java/com/cnu/real_coding_server/entity/Post.java @@ -20,6 +20,7 @@ public class Post extends BaseEntity { @Setter private String contents; + @Setter @Enumerated(EnumType.STRING) private Tag tag; diff --git a/src/main/java/com/cnu/real_coding_server/repository/PostRepository.java b/src/main/java/com/cnu/real_coding_server/repository/PostRepository.java index 0366c87..ee40fc2 100644 --- a/src/main/java/com/cnu/real_coding_server/repository/PostRepository.java +++ b/src/main/java/com/cnu/real_coding_server/repository/PostRepository.java @@ -1,6 +1,7 @@ package com.cnu.real_coding_server.repository; import com.cnu.real_coding_server.entity.Post; +import com.cnu.real_coding_server.model.request.PostRequest; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -10,4 +11,5 @@ public interface PostRepository extends JpaRepository { // List findAll(); // Optional findById(Integer postId); // void delete(Post post); + } diff --git a/src/main/java/com/cnu/real_coding_server/service/PostService.java b/src/main/java/com/cnu/real_coding_server/service/PostService.java deleted file mode 100644 index f79fbb8..0000000 --- a/src/main/java/com/cnu/real_coding_server/service/PostService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cnu.real_coding_server.service; - -import org.springframework.stereotype.Service; - -@Service -public class PostService { -} diff --git a/src/main/java/com/cnu/real_coding_server/service/ProjectService.java b/src/main/java/com/cnu/real_coding_server/service/ProjectService.java new file mode 100644 index 0000000..0e9c2a5 --- /dev/null +++ b/src/main/java/com/cnu/real_coding_server/service/ProjectService.java @@ -0,0 +1,45 @@ +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 getProjects() { + return projectRepository.findAll(); + } + + public Optional getProject(Integer projectId) { + return projectRepository.findById(projectId); + } + + public Optional updateProject(Integer projectId, ProjectRequest projectRequest) { + return projectRepository.findById(projectId) + .map(project -> { + project.setTitle(projectRequest.getTitle()); + project.setSummary(projectRequest.getSummary()); + project.setDescription(projectRequest.getDescription()); + project.setStartDate(projectRequest.getStartDate()); + project.setEndDate(projectRequest.getEndDate()); + return projectRepository.save(project); + }); + } + + public void deleteProject(Integer projectId) { + projectRepository.findById(projectId) + .ifPresent(projectRepository::delete); + } +} \ No newline at end of file