[feature/Inhabas#241] 프로젝트 게시판 리뷰 반영

InhaBas · Mar 15, 2024 · f1bbf7f · f1bbf7f
1 parent 69e45a2
commit f1bbf7f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 29 deletions.
diff --git a/.../api/domain/project/domain/PinOption.java → ...as/api/domain/board/domain/PinOption.java b/.../api/domain/project/domain/PinOption.java → ...as/api/domain/board/domain/PinOption.java
@@ -1,4 +1,4 @@
-package com.inhabas.api.domain.project.domain;
+package com.inhabas.api.domain.board.domain;
 
 public enum PinOption {
   DISABLED(0),

diff --git a/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/PinOption.java b/resource-server/src/main/java/com/inhabas/api/domain/normalBoard/domain/PinOption.java
diff --git a/...rver/src/main/java/com/inhabas/api/domain/normalBoard/usecase/NormalBoardServiceImpl.java b/...rver/src/main/java/com/inhabas/api/domain/normalBoard/usecase/NormalBoardServiceImpl.java
@@ -1,21 +1,20 @@
 package com.inhabas.api.domain.normalBoard.usecase;
 
+import static com.inhabas.api.domain.board.domain.PinOption.*;
 import static com.inhabas.api.domain.normalBoard.domain.NormalBoardType.*;
 import static com.inhabas.api.domain.normalBoard.domain.NormalBoardType.EXECUTIVE;
 import static com.inhabas.api.domain.normalBoard.domain.NormalBoardType.NOTICE;
-import static com.inhabas.api.domain.normalBoard.domain.PinOption.*;
 
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import javax.transaction.Transactional;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.inhabas.api.auth.domain.error.authException.InvalidAuthorityException;
 import com.inhabas.api.auth.domain.error.businessException.InvalidInputException;
@@ -40,7 +39,6 @@
 
 @Service
 @Slf4j
-@Transactional
 @RequiredArgsConstructor
 public class NormalBoardServiceImpl implements NormalBoardService {
 
@@ -55,6 +53,7 @@ public class NormalBoardServiceImpl implements NormalBoardService {
   private static final Integer TEMPORARY_DAYS = 14;
 
   @Override
+  @Transactional(readOnly = true)
   public List<NormalBoardDto> getPinned(NormalBoardType boardType) {
     List<NormalBoardDto> normalBoardList = new ArrayList<>();
     if (boardType.equals(NOTICE) || boardType.equals(EXECUTIVE)) {
@@ -64,6 +63,7 @@ public List<NormalBoardDto> getPinned(NormalBoardType boardType) {
   }
 
   @Override
+  @Transactional(readOnly = true)
   public List<NormalBoardDto> getPosts(NormalBoardType boardType, String search) {
     List<NormalBoardDto> normalBoardList = new ArrayList<>();
     if (boardType.equals(SUGGEST)) {
@@ -80,6 +80,7 @@ public List<NormalBoardDto> getPosts(NormalBoardType boardType, String search) {
   }
 
   @Override
+  @Transactional(readOnly = true)
   public NormalBoardDetailDto getPost(Long memberId, NormalBoardType boardType, Long boardId) {
     NormalBoard normalBoard;
     if (boardType.equals(SUGGEST)) {
@@ -112,6 +113,7 @@ public NormalBoardDetailDto getPost(Long memberId, NormalBoardType boardType, Lo
   }
 
   @Override
+  @Transactional
   public Long write(
       Long memberId, NormalBoardType boardType, SaveNormalBoardDto saveNormalBoardDto) {
 
@@ -128,6 +130,7 @@ public Long write(
   }
 
   @Override
+  @Transactional
   public void update(
       Long boardId, NormalBoardType boardType, SaveNormalBoardDto saveNormalBoardDto) {
 
@@ -138,6 +141,7 @@ public void update(
   }
 
   @Override
+  @Transactional
   public void delete(Long boardId) {
     normalBoardRepository.deleteById(boardId);
   }

diff --git a/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java b/resource-server/src/main/java/com/inhabas/api/domain/project/domain/ProjectBoard.java
@@ -29,7 +29,7 @@
 import com.inhabas.api.domain.menu.domain.Menu;
 
 @Entity
-@Table(name = "NORMAL_BOARD")
+@Table(name = "PROJECT_BOARD")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @EntityListeners(AuditingEntityListener.class)
 @Inheritance(strategy = InheritanceType.JOINED)

diff --git a/...-server/src/main/java/com/inhabas/api/domain/project/usecase/ProjectBoardServiceImpl.java b/...-server/src/main/java/com/inhabas/api/domain/project/usecase/ProjectBoardServiceImpl.java
@@ -1,7 +1,7 @@
 package com.inhabas.api.domain.project.usecase;
 
-import static com.inhabas.api.domain.project.domain.PinOption.PERMANENT;
-import static com.inhabas.api.domain.project.domain.PinOption.TEMPORARY;
+import static com.inhabas.api.domain.board.domain.PinOption.PERMANENT;
+import static com.inhabas.api.domain.board.domain.PinOption.TEMPORARY;
 import static com.inhabas.api.domain.project.domain.ProjectBoardType.ALPHA;
 import static com.inhabas.api.domain.project.domain.ProjectBoardType.BETA;
 
@@ -13,12 +13,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.transaction.Transactional;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.inhabas.api.auth.domain.error.businessException.InvalidInputException;
 import com.inhabas.api.auth.domain.error.businessException.NotFoundException;
@@ -42,7 +41,6 @@
 
 @Service
 @Slf4j
-@Transactional
 @RequiredArgsConstructor
 public class ProjectBoardServiceImpl implements ProjectBoardService {
 
@@ -57,6 +55,7 @@ public class ProjectBoardServiceImpl implements ProjectBoardService {
   private static final Integer TEMPORARY_DAYS = 14;
 
   @Override
+  @Transactional
   public List<ProjectBoardDto> getPinned(ProjectBoardType projectboardType) {
     List<ProjectBoardDto> projectBoardList = new ArrayList<>();
     if (projectboardType.equals(ALPHA) || projectboardType.equals(BETA)) {
@@ -66,6 +65,7 @@ public List<ProjectBoardDto> getPinned(ProjectBoardType projectboardType) {
   }
 
   @Override
+  @Transactional(readOnly = true)
   public List<ProjectBoardDto> getPosts(ProjectBoardType projectBoardType, String search) {
     List<ProjectBoardDto> projectBoardList = new ArrayList<>();
     projectBoardList.addAll(
@@ -74,6 +74,7 @@ public List<ProjectBoardDto> getPosts(ProjectBoardType projectBoardType, String
   }
 
   @Override
+  @Transactional(readOnly = true)
   public ProjectBoardDetailDto getPost(
       Long memberId, ProjectBoardType projectBoardType, Long boardId) {
     ProjectBoard projectBoard;
@@ -100,6 +101,7 @@ public ProjectBoardDetailDto getPost(
   }
 
   @Override
+  @Transactional
   public Long write(
       Long memberId, ProjectBoardType projectBoardType, SaveProjectBoardDto saveProjectBoardDto) {
 
@@ -117,6 +119,7 @@ public Long write(
   }
 
   @Override
+  @Transactional
   public void update(
       Long boardId, ProjectBoardType projectBoardType, SaveProjectBoardDto saveProjectBoardDto) {
 
@@ -127,6 +130,7 @@ public void update(
   }
 
   @Override
+  @Transactional
   public void delete(Long boardId) {
     projectBoardRepository.deleteById(boardId);
   }

diff --git a/resource-server/src/test/java/com/inhabas/api/web/ProjectBoardControllerTest.java b/resource-server/src/test/java/com/inhabas/api/web/ProjectBoardControllerTest.java
@@ -51,7 +51,7 @@ private String jsonOf(Object response) throws JsonProcessingException {
     return objectMapper.writeValueAsString(response);
   }
 
-  @DisplayName("게시판 종류 당 글 개수 조회 성공 200")
+  @DisplayName("프로젝트 게시판 종류 당 글 개수 조회 성공 200")
   @Test
   void getBoardCount_Success() throws Exception {
     // given