Feature/add location to posts

src/main/java/com/SafeNet/Backend/InitDB.java

@@ -1,61 +1,61 @@
-package com.SafeNet.Backend;
-
-import com.SafeNet.Backend.domain.member.entity.Member;
-import com.SafeNet.Backend.domain.member.repository.MemberRepository;
-import com.SafeNet.Backend.domain.region.entity.Region;
-import com.SafeNet.Backend.domain.region.repository.RegionRepository;
-import jakarta.annotation.PostConstruct;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Optional;
-
-@Component
-@RequiredArgsConstructor
-public class InitDB {
-
-    private final InitService initService;
-
-    @PostConstruct
-    public void init() {
-        initService.userDBInit();
-    }
-
-    @Component
-    @Transactional
-    @RequiredArgsConstructor
-    static class InitService {
-
-        private final MemberRepository memberRepository;
-        private final RegionRepository regionRepository;
-
-        public void userDBInit() {
-            String cityName = "용인시";
-            String memberEmail = "[email protected]";
-
-            Optional<Region> existingRegion = regionRepository.findByCity(cityName);
-            Region region;
-            if (existingRegion.isEmpty()) {
-                region = Region.builder()
-                        .city(cityName)
-                        .build();
-                regionRepository.save(region);
-            } else {
-                region = existingRegion.get();
-            }
-
-            Optional<Member> existingMember = memberRepository.findByEmail(memberEmail);
-            if (existingMember.isEmpty()) {
-                Member member = Member.builder()
-                        .name("눈송이")
-                        .phoneNumber("010-3333-4444")
-                        .email(memberEmail)
-                        .pwd("3333")
-                        .region(region)
-                        .build();
-                memberRepository.save(member);
-            }
-        }
-    }
-}
+//package com.SafeNet.Backend;
+//
+//import com.SafeNet.Backend.domain.member.entity.Member;
+//import com.SafeNet.Backend.domain.member.repository.MemberRepository;
+//import com.SafeNet.Backend.domain.region.entity.Region;
+//import com.SafeNet.Backend.domain.region.repository.RegionRepository;
+//import jakarta.annotation.PostConstruct;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.stereotype.Component;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import java.util.Optional;
+//
+//@Component
+//@RequiredArgsConstructor
+//public class InitDB {
+//
+//    private final InitService initService;
+//
+//    @PostConstruct
+//    public void init() {
+//        initService.userDBInit();
+//    }
+//
+//    @Component
+//    @Transactional
+//    @RequiredArgsConstructor
+//    static class InitService {
+//
+//        private final MemberRepository memberRepository;
+//        private final RegionRepository regionRepository;
+//
+//        public void userDBInit() {
+//            String cityName = "용인시";
+//            String memberEmail = "[email protected]";
+//
+//            Optional<Region> existingRegion = regionRepository.findByCity(cityName);
+//            Region region;
+//            if (existingRegion.isEmpty()) {
+//                region = Region.builder()
+//                        .city(cityName)
+//                        .build();
+//                regionRepository.save(region);
+//            } else {
+//                region = existingRegion.get();
+//            }
+//
+//            Optional<Member> existingMember = memberRepository.findByEmail(memberEmail);
+//            if (existingMember.isEmpty()) {
+//                Member member = Member.builder()
+//                        .name("눈송이")
+//                        .phoneNumber("010-3333-4444")
+//                        .email(memberEmail)
+//                        .pwd("3333")
+//                        .region(region)
+//                        .build();
+//                memberRepository.save(member);
+//            }
+//        }
+//    }
+//}

src/main/java/com/SafeNet/Backend/domain/post/controller/PostController.java

@@ -23,7 +23,7 @@
 import java.util.Optional;
 
 @RestController
-@RequestMapping("/api/v2/posts")
+@RequestMapping("/api/v3/posts")
 @RequiredArgsConstructor
 @Tag(name = "Post", description = "게시물 CRUD API")
 public class PostController {
@@ -36,7 +36,7 @@ public class PostController {
             @ApiResponse(responseCode = "201", description = "게시물이 성공적으로 생성되었습니다"),
             @ApiResponse(responseCode = "400", description = "잘못된 요청입니다")
     })
-    public ResponseEntity<String> createPost(
+    public ResponseEntity<String> createPost( // v3: 사용자와 사용자의 지역 정보 추가
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken,
             @RequestPart(value = "post") String postRequestDtoJson,
@@ -50,7 +50,7 @@ public ResponseEntity<String> createPost(
 
     @GetMapping
     @Operation(summary = "게시물 리스트 불러오기", description = "전체 게시물을 리스트로 볼 때 사용하는 API")
-    public ResponseEntity<?> getPosts(
+    public ResponseEntity<?> getPosts( // v3: 사용자와 사용자의 지역 정보 추가
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken
     ) {
@@ -67,8 +67,8 @@ public ResponseEntity<?> getPosts(
     public ResponseEntity<?> getPostById(
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken,
-            @PathVariable("postId") Long id) {
-        Optional<PostResponseDto> postById = postService.getPostById(id);
+            @PathVariable("postId") Long postId) {
+        Optional<PostResponseDto> postById = postService.getPostById(postId);
         if (postById.isPresent()) {
             return ResponseEntity.ok(postById.get());
         } else {
@@ -108,7 +108,8 @@ public ResponseEntity<String> updatePostStatusToTrading(
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken,
             @PathVariable("postId") Long id) {
-        postService.updatePostStatusToTrading(id);
+        String email = getUserEmail();
+        postService.updatePostStatusToTrading(id, email);
         return ResponseEntity.ok("Post status updated to trading");
     }
 
@@ -118,7 +119,8 @@ public ResponseEntity<String> updatePostStatusToCompleted(
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken,
             @PathVariable("postId") Long id) {
-        postService.updatePostStatusToCompleted(id);
+        String email = getUserEmail();
+        postService.updatePostStatusToCompleted(id, email);
         return ResponseEntity.ok("Post status updated to completed");
     }
 

src/main/java/com/SafeNet/Backend/domain/post/controller/PostSearchAndSortController.java

@@ -14,14 +14,14 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/v1/posts")
+@RequestMapping("/api/v3/posts")
 @RequiredArgsConstructor
 @Tag(name = "Post Query", description = "게시글 특정 조건 조회 및 정렬 API")
 public class PostSearchAndSortController {
     private final PostSearchAndSortService postSearchAndSortService;
 
     @GetMapping("/keyword")
-    public ResponseEntity<List<PostResponseDto>> searchByKeyWord(
+    public ResponseEntity<List<PostResponseDto>> searchByKeyWord( // v3: 사용자와 사용자의 지역 정보 추가
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken,
             @RequestParam("keyword") String keyword) {
@@ -31,7 +31,7 @@ public ResponseEntity<List<PostResponseDto>> searchByKeyWord(
     }
 
     @GetMapping("/category")
-    public ResponseEntity<List<PostResponseDto>> searchByCategory(
+    public ResponseEntity<List<PostResponseDto>> searchByCategory( // v3: 사용자와 사용자의 지역 정보 추가
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken,
             @RequestParam("category") Category category) {
@@ -41,7 +41,7 @@ public ResponseEntity<List<PostResponseDto>> searchByCategory(
     }
 
     @GetMapping("/sort/created")
-    public ResponseEntity<List<PostResponseDto>> sortByCreated(
+    public ResponseEntity<List<PostResponseDto>> sortByCreated( // v3: 사용자와 사용자의 지역 정보 추가
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken
     ) {
@@ -51,7 +51,7 @@ public ResponseEntity<List<PostResponseDto>> sortByCreated(
     }
 
     @GetMapping("/sort/buyDate")
-    public ResponseEntity<List<PostResponseDto>> sortByBuyDate(
+    public ResponseEntity<List<PostResponseDto>> sortByBuyDate( // v3: 사용자와 사용자의 지역 정보 추가
             @RequestHeader(name = "ACCESS_TOKEN", required = false) String accessToken,
             @RequestHeader(name = "REFRESH_TOKEN", required = false) String refreshToken
     ) {

src/main/java/com/SafeNet/Backend/domain/post/dto/PostResponseDto.java

@@ -11,7 +11,7 @@
 public class PostResponseDto {
     private Long postId;
     private Category category;
-    private boolean likeCount; // 현재 사용자가 하트를 눌렀는지 여부
+    private boolean isLikedByCurrentUser; // 현재 사용자가 하트를 눌렀는지 여부
     private String productImageUrl; // 상품 이미지 URL
     private String receiptImageUrl; // 영수증 이미지 URL
     private String title;

src/main/java/com/SafeNet/Backend/domain/post/repository/PostRepository.java

@@ -11,12 +11,14 @@
 public interface PostRepository extends JpaRepository<Post, Long> {
     List<Post> findByMember_Id(Long memberId);
 
-    List<Post> findByTitleContainingOrContentsContaining(String title, String contents);
+    List<Post> findByRegion_IdAndCategory(Long memberRegionId, Category category);
 
-    List<Post> findByCategory(Category category);
+    List<Post> findByRegion_IdOrderByCreatedDesc(Long memberRegionId);
 
-    List<Post> findAllByOrderByCreatedDesc();
+    List<Post> findByRegion_IdOrderByBuyDateDesc(Long memberRegionId);
+
+    List<Post> findByRegion_Id(Long regionId);
+    List<Post> findByRegion_IdAndTitleContainingOrContentsContaining(Long regionId, String title, String contents);
 
-    List<Post> findAllByOrderByBuyDateDesc();
 }
 

src/main/java/com/SafeNet/Backend/domain/post/service/CommonPostService.java

@@ -7,8 +7,10 @@
 import com.SafeNet.Backend.domain.post.entity.Post;
 import com.SafeNet.Backend.domain.post.exception.PostException;
 import com.SafeNet.Backend.domain.post.repository.PostRepository;
+import com.SafeNet.Backend.domain.postLike.entity.PostLike;
 import com.SafeNet.Backend.domain.postLike.repository.PostLikeRepository;
 import com.SafeNet.Backend.domain.post.util.PostDtoConverter;
+import com.SafeNet.Backend.domain.region.entity.Region;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -26,6 +28,11 @@ public class CommonPostService {
     public Member getMemberByEmail(String email) {
         return memberRepository.findByEmail(email).orElseThrow(() -> new PostException("Member not found with email: " + email, HttpStatus.NOT_FOUND));
     }
+    private Long getMemberRegionId(String email) {
+        Member member = getMemberByEmail(email);
+        Region region = member.getRegion();
+        return region.getId();
+    }
 
     public List<PostResponseDto> convertPostsToDto(List<Post> posts, Long memberId) {
         return posts.stream().map(post -> {
@@ -34,54 +41,69 @@ public List<PostResponseDto> convertPostsToDto(List<Post> posts, Long memberId)
         }).collect(Collectors.toList());
     }
 
+    // 게시물 리스트 조회
     public List<PostResponseDto> getAllPosts(String email) {
         Member member = getMemberByEmail(email);
-        Long memberId = member.getId();
-        List<Post> posts = postRepository.findAll();
+        Long memberId = member.getId(); // MemberId 추출
+        Region region = member.getRegion();
+        Long memberRegionId = region.getId(); // 멤버의 RegionId 추출
+        List<Post> posts = postRepository.findByRegion_Id(memberRegionId);
         return convertPostsToDto(posts, memberId);
     }
 
+    // 사용자가 등록한 게시물 조회
     public List<PostResponseDto> getPostsByMemberId(String email) {
         Member member = getMemberByEmail(email);
         Long memberId = member.getId();
         List<Post> posts = postRepository.findByMember_Id(memberId);
         return convertPostsToDto(posts, memberId);
     }
 
+    // 사용자가 좋아요 누른 게시물 조회
     public List<PostResponseDto> getLikedPostsByMemberId(String email) {
         Member member = getMemberByEmail(email);
         Long memberId = member.getId();
         List<Post> posts = postLikeRepository.findByMember_Id(memberId).stream()
-                .map(postLike -> postLike.getPost())
+                .map(PostLike::getPost)
                 .collect(Collectors.toList());
         return convertPostsToDto(posts, memberId);
     }
 
+    // 키워드로 게시물 조회
     public List<PostResponseDto> searchPostsByKeyword(String keyword, String email) {
-        Member member = getMemberByEmail(email);
-        Long memberId = member.getId();
-        List<Post> posts = postRepository.findByTitleContainingOrContentsContaining(keyword, keyword);
-        return convertPostsToDto(posts, memberId);
+        int MAX_LENGTH = 50;
+        if (keyword.length() > MAX_LENGTH) { // 입력한 keyword가 50글자보다 길다면
+            throw new PostException("검색어가 너무 깁니다. " + MAX_LENGTH + " 글자 이하로 입력해주세요.", HttpStatus.BAD_REQUEST);
+        }
+        Long memberRegionId = getMemberRegionId(email);
+        List<Post> posts = postRepository.findByRegion_IdAndTitleContainingOrContentsContaining(memberRegionId, keyword, keyword);
+        return getPostResponseDtos(email, posts);
     }
 
+    // 카테고리로 게시물 조회
     public List<PostResponseDto> searchPostsByCategory(Category category, String email) {
-        Member member = getMemberByEmail(email);
-        Long memberId = member.getId();
-        List<Post> posts = postRepository.findByCategory(category);
-        return convertPostsToDto(posts, memberId);
+        Long memberRegionId = getMemberRegionId(email);
+        List<Post> posts = postRepository.findByRegion_IdAndCategory(memberRegionId, category);
+        return getPostResponseDtos(email, posts);
     }
 
+    // 게시물 생성 일자 역순으로 게시물 조회
     public List<PostResponseDto> sortPostsByCreated(String email) {
-        Member member = getMemberByEmail(email);
-        Long memberId = member.getId();
-        List<Post> posts = postRepository.findAllByOrderByCreatedDesc();
-        return convertPostsToDto(posts, memberId);
+        Long memberRegionId = getMemberRegionId(email);
+        List<Post> posts = postRepository.findByRegion_IdOrderByCreatedDesc(memberRegionId);
+        return getPostResponseDtos(email, posts);
     }
 
+    // 구매일자 역순으로 게시물 조회
     public List<PostResponseDto> sortPostsByBuyDate(String email) {
+        Long memberRegionId = getMemberRegionId(email);
+        List<Post> posts = postRepository.findByRegion_IdOrderByBuyDateDesc(memberRegionId);
+        return getPostResponseDtos(email, posts);
+    }
+
+    private List<PostResponseDto> getPostResponseDtos(String email, List<Post> posts) {
         Member member = getMemberByEmail(email);
         Long memberId = member.getId();
-        List<Post> posts = postRepository.findAllByOrderByBuyDateDesc();
         return convertPostsToDto(posts, memberId);
     }
 }