Merge branch 'master' into dev

Author: becooq81

src/main/java/org/poolc/api/post/controller/PostController.java

@@ -40,7 +40,7 @@ public ResponseEntity<Void> registerPost(@AuthenticationPrincipal Member member,
     @GetMapping("/post/{postId}")
     public ResponseEntity<PostResponse> viewPost(@AuthenticationPrincipal Member member, @PathVariable Long postId) {
         Post post = postService.findById(member, postId);
-        PostResponse response = PostResponse.of(post, (member==null)?scrapService.isScrap(member.getLoginID(),postId):false);
+        PostResponse response = PostResponse.of(post, scrapService.isScrap(member, postId));
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 

src/main/java/org/poolc/api/scrap/service/ScrapService.java

@@ -35,8 +35,9 @@ public void scrap(String memberId, Long postId) {
         }
     }
 
-    public boolean isScrap(String memberId, Long postId){
-        if(scrapRepository.existsByMemberIdAndPostId(memberId, postId)) {
+    public boolean isScrap(Member member, Long postId){
+        if (member == null) return false;
+        if(scrapRepository.existsByMemberIdAndPostId(member.getLoginID(), postId)) {
             return true;
         }
         return false;