Merge pull request #41 from SOPT-all/feat/37

[FEAT] 게시물 조회 로직 수정- isSpoon추가,response에서 카테고리 관련 부분 수정
SOPT-all · Jan 19, 2025 · 33a0607 · 33a0607
2 parents 4e00efc + 6870f3f
commit 33a0607
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/src/main/java/com/spoony/spoony_server/domain/post/controller/PostController.java b/src/main/java/com/spoony/spoony_server/domain/post/controller/PostController.java
@@ -25,9 +25,9 @@ public class PostController {
     private final PostService postService;
     private final AwsFileService awsFileService;
 
-    @GetMapping("/{postId}")
-    public ResponseEntity<ResponseDTO<PostResponseDTO>> getPost(@PathVariable Long postId) {
-        PostResponseDTO postResponse = postService.getPostById(postId);
+    @GetMapping("/{userId}/{postId}")
+    public ResponseEntity<ResponseDTO<PostResponseDTO>> getPost(@PathVariable Long postId, @PathVariable Long userId) {
+        PostResponseDTO postResponse = postService.getPostById(postId, userId);
         return ResponseEntity.status(HttpStatus.OK).body(ResponseDTO.success(postResponse));
     }
 

diff --git a/src/main/java/com/spoony/spoony_server/domain/post/dto/response/PostResponseDTO.java b/src/main/java/com/spoony/spoony_server/domain/post/dto/response/PostResponseDTO.java
@@ -8,7 +8,8 @@ public record PostResponseDTO(Long postId, Long userId, String userName, String
                               List<String> menuList,
                               String description,
                               String place_name, String place_address, Double latitude,
-                              Double longitude, Long zzinCount
+                              Double longitude, Long zzinCount, Boolean is_scoop, String IconUrlColor,
+                              String BackgroundColor
 ) {
 }
 

diff --git a/src/main/java/com/spoony/spoony_server/domain/post/repository/ZzimPostRepository.java b/src/main/java/com/spoony/spoony_server/domain/post/repository/ZzimPostRepository.java
@@ -9,6 +9,8 @@
 import java.util.Optional;
 
 public interface ZzimPostRepository extends JpaRepository<ZzimPostEntity, Long> {
+
+    Long countByPost(PostEntity postEntity);
     Optional<List<ZzimPostEntity>> findByUser_UserId(Long userId);
 
     Long countByPost(PostEntity postEntity);

diff --git a/src/main/java/com/spoony/spoony_server/domain/post/service/PostService.java b/src/main/java/com/spoony/spoony_server/domain/post/service/PostService.java
@@ -18,6 +18,7 @@
 import com.spoony.spoony_server.domain.spoon.entity.SpoonBalanceEntity;
 import com.spoony.spoony_server.domain.spoon.entity.SpoonHistoryEntity;
 import com.spoony.spoony_server.domain.spoon.repository.ActivityRepository;
+import com.spoony.spoony_server.domain.spoon.repository.ScoopPostRepository;
 import com.spoony.spoony_server.domain.spoon.repository.SpoonBalanceRepository;
 import com.spoony.spoony_server.domain.spoon.repository.SpoonHistoryRepository;
 import com.spoony.spoony_server.domain.user.entity.FollowEntity;
@@ -49,15 +50,14 @@ public class PostService {
     private final ZzimPostRepository zzimPostRepository;
     private final FollowRepository followRepository;
     private final FeedRepository feedRepository;
+    private final ScoopPostRepository scoopPostRepository;
 
     @Transactional
-    public PostResponseDTO getPostById(Long postId) {
+    public PostResponseDTO getPostById(Long postId, Long userId) {
+
+        PostEntity postEntity = postRepository.findById(postId).orElseThrow(() -> new BusinessException(PostErrorMessage.NOT_FOUND_ERROR));
+        UserEntity userEntity = userRepository.findById(userId).orElseThrow(() -> new BusinessException(PostErrorMessage.NOT_FOUND_ERROR));
 
-        PostEntity postEntity = postRepository.findById(postId).orElseThrow(() -> new BusinessException(PostErrorMessage.POST_NOT_FOUND));
-        UserEntity userEntity = postEntity.getUser();
-        if (userEntity == null) {
-            throw new BusinessException(PostErrorMessage.POST_NOT_FOUND);
-        }
 
         RegionEntity regionEntity = userRepository.findReigonByUserId(userEntity.getUserId()).orElseThrow(() -> new BusinessException(UserErrorMessage.USER_NOT_FOUND));
         PostCategoryEntity postCategoryEntity = postCategoryRepository.findByPost(postEntity).orElseThrow(() -> new BusinessException(PostErrorMessage.POST_NOT_FOUND));
@@ -67,7 +67,14 @@ public PostResponseDTO getPostById(Long postId) {
         PlaceEntity place = postEntity.getPlace();
         LocalDateTime latestDate = postEntity.getUpdatedAt().isAfter(postEntity.getCreatedAt()) ? postEntity.getUpdatedAt() : postEntity.getCreatedAt();
         String formattedDate = latestDate.toLocalDate().toString();
-        Long zzim_count = postRepository.countByPostId(postId);
+
+        Long zzim_count = zzimPostRepository.countByPost(postEntity);
+        Boolean isScoop = scoopPostRepository.existsByUserAndPost(userEntity, postEntity);
+
+
+        String IconUrlColor = categoryEntity.getIconUrlColor();
+        String BackgroundColor = categoryEntity.getBackgroundColor();
+
         //List<String> category_list = List.of(categoryEntity.getCategoryName());
         String category = categoryEntity.getCategoryName();
 
@@ -77,8 +84,11 @@ public PostResponseDTO getPostById(Long postId) {
                 .map(menuEntity -> menuEntity.getMenuName())
                 .collect(Collectors.toList());
 
+
+        //boolean scoop, String IconUrlColor,String BackgroundColor
+
         return new PostResponseDTO(postId, userEntity.getUserId(), userEntity.getUserName(), regionEntity.getRegionName(), category, postEntity.getTitle(), formattedDate, menuList, postEntity.getDescription(),
-                place.getPlaceName(), place.getPlaceAddress(), place.getLatitude(), place.getLongitude(), zzim_count
+                place.getPlaceName(), place.getPlaceAddress(), place.getLatitude(), place.getLongitude(), zzim_count, isScoop, IconUrlColor, BackgroundColor
         );
     }
 

diff --git a/src/main/java/com/spoony/spoony_server/domain/spoon/repository/ScoopPostRepository.java b/src/main/java/com/spoony/spoony_server/domain/spoon/repository/ScoopPostRepository.java
@@ -1,9 +1,13 @@
 package com.spoony.spoony_server.domain.spoon.repository;
 
+import com.spoony.spoony_server.domain.post.entity.PostEntity;
 import com.spoony.spoony_server.domain.post.entity.ScoopPostEntity;
+import com.spoony.spoony_server.domain.user.entity.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ScoopPostRepository extends JpaRepository<ScoopPostEntity, Long> {
+    //oolean existsByUser_userId(Long userId);
+    boolean existsByUserAndPost(UserEntity userEntity, PostEntity postEntity); // user_id의 존재 여부 확인
+}
 
 
-}