diff --git a/src/main/java/com/cadac/stone_inscription/auth/JwtRequestFilter.java b/src/main/java/com/cadac/stone_inscription/auth/JwtRequestFilter.java index 8cc4bf7..f5100b5 100644 --- a/src/main/java/com/cadac/stone_inscription/auth/JwtRequestFilter.java +++ b/src/main/java/com/cadac/stone_inscription/auth/JwtRequestFilter.java @@ -86,6 +86,7 @@ public String extractJwtFromRequest(HttpServletRequest request) { // } } else { + // return null; throw new StoneInscriptionException("Invalid Token Request Bearer not found ", HttpStatus.BAD_REQUEST); } diff --git a/src/main/java/com/cadac/stone_inscription/post/controller/PostController.java b/src/main/java/com/cadac/stone_inscription/post/controller/PostController.java index c2fac30..7b5cbc2 100644 --- a/src/main/java/com/cadac/stone_inscription/post/controller/PostController.java +++ b/src/main/java/com/cadac/stone_inscription/post/controller/PostController.java @@ -315,6 +315,21 @@ public ResponseEntity deleteImagesFromPost(HttpServletRequest request, // return postService.deleteImagesFromPost(email, postId, deletedImageIds); // } + // @PostMapping("/test/addPoastDiscription/{email}") + // public ResponseEntity addPoastDiscriptionForTest( + // @PathVariable String email, + // @RequestParam String postId, + // @RequestParam String discription) { + + // return postService.addPoastDiscription(email, postId, discription); + // } + + // @PostMapping("/test/getPostDiscription") + // public ResponseEntity getPostDiscriptionForTest(@RequestParam String postId) { + + // return postService.getPostDiscription(postId); + // } + // @PostMapping("/test/postDelete/{email}") // public ResponseEntity postDeleteForTest( // @PathVariable String email, diff --git a/src/main/java/com/cadac/stone_inscription/post/service/PostService.java b/src/main/java/com/cadac/stone_inscription/post/service/PostService.java index fc7ff73..d2dcd64 100644 --- a/src/main/java/com/cadac/stone_inscription/post/service/PostService.java +++ b/src/main/java/com/cadac/stone_inscription/post/service/PostService.java @@ -1,10 +1,10 @@ -package com.cadac.stone_inscription.post.service; - -import java.util.List; - -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.ResponseEntity; -import org.springframework.web.multipart.MultipartFile; +package com.cadac.stone_inscription.post.service; + +import java.util.List; + +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.multipart.MultipartFile; import com.cadac.stone_inscription.post.dto.InscriptionPostDto; @@ -37,16 +37,16 @@ ResponseEntity addPostWithFile(InscriptionPostDto inscriptionPostDto, Multipa ResponseEntity postDelete(String usernameFromToken, String postId); - ResponseEntity descriptionDelete(String usernameFromToken, String descriptionId); - - ResponseEntity updatePost(String usernameFromToken, InscriptionPostDto inscriptionPostDto, String postId, - List deletedImageIds, MultipartFile[] files); - - ResponseEntity addImagesToPost(String usernameFromToken, String postId, MultipartFile[] files); - - ResponseEntity deleteImagesFromPost(String usernameFromToken, String postId, List deletedImageIds); - - ResponseEntity getCommentByUser(String usernameFromToken); + ResponseEntity descriptionDelete(String usernameFromToken, String descriptionId); + + ResponseEntity updatePost(String usernameFromToken, InscriptionPostDto inscriptionPostDto, String postId, + List deletedImageIds, MultipartFile[] files); + + ResponseEntity addImagesToPost(String usernameFromToken, String postId, MultipartFile[] files); + + ResponseEntity deleteImagesFromPost(String usernameFromToken, String postId, List deletedImageIds); + + ResponseEntity getCommentByUser(String usernameFromToken); ResponseEntity getDashboardCounts(); diff --git a/src/main/java/com/cadac/stone_inscription/post/service/PostServiceImp.java b/src/main/java/com/cadac/stone_inscription/post/service/PostServiceImp.java index 868a912..c8387a8 100644 --- a/src/main/java/com/cadac/stone_inscription/post/service/PostServiceImp.java +++ b/src/main/java/com/cadac/stone_inscription/post/service/PostServiceImp.java @@ -325,7 +325,8 @@ public ResponseEntity userProfile(String usernameFromToken) { public ResponseEntity postDelete(String usernameFromToken, String postId) { User user = userRepository.findByEmail(usernameFromToken); - Optional postDelete = inscriptionPostRepo.findById(new ObjectId(postId)); + ObjectId objectId = new ObjectId(postId); + Optional postDelete = inscriptionPostRepo.findById(objectId); if (postDelete.isEmpty()) { throw new StoneInscriptionException("Unprocesable request", HttpStatus.BAD_REQUEST); @@ -338,8 +339,8 @@ public ResponseEntity postDelete(String usernameFromToken, String postId) { adjustUserImagesUploaded(user, -deletedImageCount); userRepository.save(user); - publicPostDescriptionRepo.deleteAllByPostId(postId); - inscriptionPostRepo.deleteById(new ObjectId(postId)); + publicPostDescriptionRepo.deleteAllByPostId(objectId); + inscriptionPostRepo.deleteById(objectId); return UserResponse.responseHandler("post deleted", HttpStatus.OK, true); } diff --git a/src/main/java/com/cadac/stone_inscription/repository/PublicPostDescriptionRepo.java b/src/main/java/com/cadac/stone_inscription/repository/PublicPostDescriptionRepo.java index f82d79f..ef172e1 100644 --- a/src/main/java/com/cadac/stone_inscription/repository/PublicPostDescriptionRepo.java +++ b/src/main/java/com/cadac/stone_inscription/repository/PublicPostDescriptionRepo.java @@ -13,7 +13,7 @@ public interface PublicPostDescriptionRepo extends MongoRepository findByPostId(ObjectId postId); - void deleteAllByPostId(String postId); + void deleteAllByPostId(ObjectId postId); List findAllByUserId(ObjectId id);