Done with Post delete Refactoring working properly

src/main/java/com/cadac/stone_inscription/admin/entity/ArchiveComment.java

@@ -34,6 +34,11 @@ public class ArchiveComment {
     @JsonSerialize(using = ToStringSerializer.class)
     private ObjectId id;
 
+    @Field("originalCommentId")
+    @JsonProperty("originalCommentId")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private ObjectId originalCommentId;
+
     @Field("postId")
     @JsonProperty("postId")
     @JsonSerialize(using = ToStringSerializer.class)

src/main/java/com/cadac/stone_inscription/admin/entity/ArchivePost.java

@@ -35,6 +35,11 @@ public class ArchivePost {
     @JsonSerialize(using = ToStringSerializer.class)
     private ObjectId id;
 
+    @Field("originalPostId")
+    @JsonProperty("originalPostId")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private ObjectId originalPostId;
+
     @Field("user_id")
     @JsonProperty("user_id")
     @JsonSerialize(using = ToStringSerializer.class)

src/main/java/com/cadac/stone_inscription/admin/repository/ArchiveCommentRepository.java

@@ -0,0 +1,11 @@
+package com.cadac.stone_inscription.admin.repository;
+
+import org.bson.types.ObjectId;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cadac.stone_inscription.admin.entity.ArchiveComment;
+
+@Repository
+public interface ArchiveCommentRepository extends MongoRepository<ArchiveComment, ObjectId> {
+}

src/main/java/com/cadac/stone_inscription/admin/repository/ArchivePostRepository.java

@@ -0,0 +1,11 @@
+package com.cadac.stone_inscription.admin.repository;
+
+import org.bson.types.ObjectId;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+import com.cadac.stone_inscription.admin.entity.ArchivePost;
+
+@Repository
+public interface ArchivePostRepository extends MongoRepository<ArchivePost, ObjectId> {
+}

src/main/java/com/cadac/stone_inscription/content/delete/ArchiveContentMapper.java

@@ -0,0 +1,66 @@
+package com.cadac.stone_inscription.content.delete;
+
+import org.springframework.stereotype.Component;
+
+import com.cadac.stone_inscription.admin.entity.ArchiveComment;
+import com.cadac.stone_inscription.admin.entity.ArchivePost;
+import com.cadac.stone_inscription.entity.InscriptionPost;
+import com.cadac.stone_inscription.entity.PublicPostDescription;
+
+@Component
+public class ArchiveContentMapper {
+
+    public ArchivePost toArchivePost(InscriptionPost post) {
+        return ArchivePost.builder()
+                .originalPostId(post.getId())
+                .userId(post.getUserId())
+                .createdAt(post.getCreatedAt())
+                .updatedAt(post.getUpdatedAt())
+                .images(post.getImages() != null ? ArchivePost.Images.builder()
+                        .thumbnailImage(post.getImages().getThumbnailImage())
+                        .image(post.getImages().getImage())
+                        .build() : null)
+                .description(post.getDescription() != null ? ArchivePost.Description.builder()
+                        .title(post.getDescription().getTitle())
+                        .subject(post.getDescription().getSubject())
+                        .description(post.getDescription().getDescription())
+                        .scriptLanguage(post.getDescription().getScriptLanguage())
+                        .language(post.getDescription().getLanguage())
+                        .englishTranslation(post.getDescription().getEnglishTranslation())
+                        .moderation(post.getDescription().getModeration())
+                        .upvote(post.getDescription().getUpvote())
+                        .geolocation(post.getDescription().getGeolocation() != null ? ArchivePost.GeoLocation.builder()
+                                .lat(post.getDescription().getGeolocation().getLat())
+                                .lon(post.getDescription().getGeolocation().getLon())
+                                .state(post.getDescription().getGeolocation().getState())
+                                .city(post.getDescription().getGeolocation().getCity())
+                                .country(post.getDescription().getGeolocation().getCountry())
+                                .build() : null)
+                        .createdAt(post.getDescription().getCreatedAt())
+                        .updatedAt(post.getDescription().getUpdatedAt())
+                        .build() : null)
+                .topic(post.getTopic())
+                .script(post.getScript())
+                .type(post.getType())
+                .status(post.getStatus())
+                .report(post.getReport())
+                .build();
+    }
+
+    public ArchiveComment toArchiveComment(PublicPostDescription comment) {
+        return ArchiveComment.builder()
+                .originalCommentId(comment.getId())
+                .postId(comment.getPostId())
+                .userId(comment.getUserId())
+                .username(comment.getUsername())
+                .userImageUrl(comment.getUserImageUrl())
+                .description(comment.getDescription())
+                .moderation(comment.getModeration())
+                .upvote(comment.getUpvote())
+                .createdAt(comment.getCreatedAt())
+                .updatedAt(comment.getUpdatedAt())
+                .status(comment.getStatus())
+                .report(comment.getReport())
+                .build();
+    }
+}

src/main/java/com/cadac/stone_inscription/content/delete/ContentDeleteResult.java

@@ -0,0 +1,12 @@
+package com.cadac.stone_inscription.content.delete;
+
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder
+public class ContentDeleteResult {
+    int archivedPosts;
+    int archivedComments;
+    int deletedImages;
+}

src/main/java/com/cadac/stone_inscription/content/delete/ContentDeleteService.java

@@ -0,0 +1,93 @@
+package com.cadac.stone_inscription.content.delete;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.bson.types.ObjectId;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import com.cadac.stone_inscription.admin.repository.ArchiveCommentRepository;
+import com.cadac.stone_inscription.admin.repository.ArchivePostRepository;
+import com.cadac.stone_inscription.entity.InscriptionPost;
+import com.cadac.stone_inscription.entity.PublicPostDescription;
+import com.cadac.stone_inscription.entity.User;
+import com.cadac.stone_inscription.exception.StoneInscriptionException;
+import com.cadac.stone_inscription.repository.ImagesDataRepo;
+import com.cadac.stone_inscription.repository.InscriptionPostRepo;
+import com.cadac.stone_inscription.repository.PublicPostDescriptionRepo;
+import com.cadac.stone_inscription.repository.UserRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class ContentDeleteService {
+
+    private final InscriptionPostRepo inscriptionPostRepo;
+    private final PublicPostDescriptionRepo publicPostDescriptionRepo;
+    private final ArchivePostRepository archivePostRepository;
+    private final ArchiveCommentRepository archiveCommentRepository;
+    private final ArchiveContentMapper archiveContentMapper;
+    private final ImagesDataRepo imagesDataRepo;
+    private final UserRepository userRepository;
+
+    public ContentDeleteResult deletePost(ObjectId postId) {
+        InscriptionPost post = inscriptionPostRepo.findById(postId)
+                .orElseThrow(() -> new StoneInscriptionException("Unprocesable request", HttpStatus.BAD_REQUEST));
+
+        List<PublicPostDescription> comments = publicPostDescriptionRepo.findByPostId(postId);
+        List<String> imageIds = getImageIds(post);
+
+        archivePostRepository.save(archiveContentMapper.toArchivePost(post));
+        comments.stream()
+                .map(archiveContentMapper::toArchiveComment)
+                .forEach(archiveCommentRepository::save);
+
+        imageIds.forEach(imagesDataRepo::deleteById);
+        publicPostDescriptionRepo.deleteAll(comments);
+        inscriptionPostRepo.delete(post);
+        decrementUserImagesUploaded(post.getUserId(), imageIds.size());
+
+        return ContentDeleteResult.builder()
+                .archivedPosts(1)
+                .archivedComments(comments.size())
+                .deletedImages(imageIds.size())
+                .build();
+    }
+
+    public ContentDeleteResult deleteComment(ObjectId commentId) {
+        PublicPostDescription comment = publicPostDescriptionRepo.findById(commentId)
+                .orElseThrow(() -> new StoneInscriptionException("Unprocesable request", HttpStatus.BAD_REQUEST));
+
+        archiveCommentRepository.save(archiveContentMapper.toArchiveComment(comment));
+        publicPostDescriptionRepo.delete(comment);
+
+        return ContentDeleteResult.builder()
+                .archivedPosts(0)
+                .archivedComments(1)
+                .deletedImages(0)
+                .build();
+    }
+
+    private List<String> getImageIds(InscriptionPost post) {
+        if (post.getImages() == null || post.getImages().getImage() == null) {
+            return Collections.emptyList();
+        }
+
+        return post.getImages().getImage();
+    }
+
+    private void decrementUserImagesUploaded(ObjectId userId, int imageCount) {
+        if (imageCount <= 0) {
+            return;
+        }
+
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new StoneInscriptionException("User not found", HttpStatus.NOT_FOUND));
+
+        int currentCount = user.getImagesUploaded() == null ? 0 : user.getImagesUploaded();
+        user.setImagesUploaded(Math.max(0, currentCount - imageCount));
+        userRepository.save(user);
+    }
+}

src/main/java/com/cadac/stone_inscription/post/controller/PostController.java

@@ -25,6 +25,7 @@
 import com.cadac.stone_inscription.post.dto.InscriptionPostDto;
 import com.cadac.stone_inscription.post.service.PostService;
 
+import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 
 @RestController
@@ -264,71 +265,88 @@ public ResponseEntity<?> deleteImagesFromPost(HttpServletRequest request,
     // TODO: Remove these methods when testing is done to restore normal behavior.
     // ============================
 
-    // // @PostMapping("/test/updatePost/{email}")
-    // public ResponseEntity<?> updatePostForTest(
-    //         @PathVariable String email,
-    //         @RequestPart(value = "post", required = false) InscriptionPostDto InscriptionPostDto,
-    //         @RequestParam String postId,
-    //         @RequestParam(value = "deletedImageIds", required = false) List<String> deletedImageIds,
-    //         @RequestPart(value = "files", required = false) MultipartFile... files) {
+    // @PostMapping("/test/updatePost/{email}")
+//     public ResponseEntity<?> updatePostForTest(
+//             @PathVariable String email,
+//             @RequestPart(value = "post", required = false) InscriptionPostDto InscriptionPostDto,
+//             @RequestParam String postId,
+//             @RequestParam(value = "deletedImageIds", required = false) List<String> deletedImageIds,
+//             @RequestPart(value = "files", required = false) MultipartFile... files) {
 
-    //     files = getNonEmptyFiles(files);
-    //     validateFiles(files, MAX_IMAGES_PER_POST);
+//         files = getNonEmptyFiles(files);
+//         validateFiles(files, MAX_IMAGES_PER_POST);
 
-    //     return postService.updatePost(email, InscriptionPostDto, postId, deletedImageIds, files);
-    // }
+//         return postService.updatePost(email, InscriptionPostDto, postId, deletedImageIds, files);
+//     }
 
-    // @PostMapping("/test/addPostWithFile/{email}")
-    // public ResponseEntity<?> addPostWithFileForTest(
-    //         @PathVariable String email,
-    //         @RequestPart(value = "post", required = false) InscriptionPostDto InscriptionPostDto,
-    //         @RequestPart("files") MultipartFile... files) throws IOException {
+//     @PostMapping("/test/addPostWithFile/{email}")
+//     public ResponseEntity<?> addPostWithFileForTest(
+//             @PathVariable String email,
+//             @RequestPart(value = "post", required = false) InscriptionPostDto InscriptionPostDto,
+//             @RequestPart("files") MultipartFile... files) throws IOException {
 
-    //     files = getNonEmptyFiles(files);
+//         files = getNonEmptyFiles(files);
 
-    //     if (files.length == 0) {
-    //         throw new StoneInscriptionException("No File Uploaded", HttpStatus.BAD_REQUEST);
-    //     }
+//         if (files.length == 0) {
+//             throw new StoneInscriptionException("No File Uploaded", HttpStatus.BAD_REQUEST);
+//         }
 
-    //     validateFiles(files, MAX_IMAGES_PER_POST);
+//         validateFiles(files, MAX_IMAGES_PER_POST);
 
-    //     return postService.addPostWithFile(InscriptionPostDto, files, email);
-    // }
+//         return postService.addPostWithFile(InscriptionPostDto, files, email);
+//     }
 
-    // @PostMapping("/test/addImagesToPost/{email}")
-    // public ResponseEntity<?> addImagesToPostForTest(
-    //         @PathVariable String email,
-    //         @RequestParam String postId,
-    //         @RequestPart("files") MultipartFile... files) {
+//     @PostMapping("/test/addImagesToPost/{email}")
+//     public ResponseEntity<?> addImagesToPostForTest(
+//             @PathVariable String email,
+//             @RequestParam String postId,
+//             @RequestPart("files") MultipartFile... files) {
 
-    //     files = getNonEmptyFiles(files);
+//         files = getNonEmptyFiles(files);
 
-    //     if (files.length == 0) {
-    //         throw new StoneInscriptionException("No File Uploaded", HttpStatus.BAD_REQUEST);
-    //     }
+//         if (files.length == 0) {
+//             throw new StoneInscriptionException("No File Uploaded", HttpStatus.BAD_REQUEST);
+//         }
 
-    //     validateFiles(files, MAX_IMAGES_PER_POST);
+//         validateFiles(files, MAX_IMAGES_PER_POST);
 
-    //     return postService.addImagesToPost(email, postId, files);
-    // }
+//         return postService.addImagesToPost(email, postId, files);
+//     }
 
-    // @PostMapping("/test/deleteImagesFromPost/{email}")
-    // public ResponseEntity<?> deleteImagesFromPostForTest(
-    //         @PathVariable String email,
-    //         @RequestParam String postId,
-    //         @RequestParam(value = "deletedImageIds") List<String> deletedImageIds) {
+//     @PostMapping("/test/deleteImagesFromPost/{email}")
+//     public ResponseEntity<?> deleteImagesFromPostForTest(
+//             @PathVariable String email,
+//             @RequestParam String postId,
+//             @RequestParam(value = "deletedImageIds") List<String> deletedImageIds) {
 
-    //     return postService.deleteImagesFromPost(email, postId, deletedImageIds);
-    // }
+//         return postService.deleteImagesFromPost(email, postId, deletedImageIds);
+//     }
 
-    // @PostMapping("/test/postDelete/{email}")
-    // public ResponseEntity<?> postDeleteForTest(
-    //         @PathVariable String email,
-    //         @RequestParam String postId) {
+//     @PostMapping("/test/postDelete/{email}")
+//     public ResponseEntity<?> postDeleteForTest(
+//             @PathVariable String email,
+//             @RequestParam String postId) {
 
-    //     return postService.postDelete(email, postId);
-    // }
+//         return postService.postDelete(email, postId);
+//     }
 
+//     @PostMapping("/test/discriptionDelete/{email}")
+//     public ResponseEntity<?> descriptionDeleteForTest(
+//             @PathVariable String email,
+//             @RequestParam String descriptionId) {
+
+//         return postService.descriptionDelete(email, descriptionId);
+//     }
+
+
+//     @PostMapping("/test/addPoastDiscription/{email}")
+//     public ResponseEntity<?> addPoastDiscriptionForTest(
+//             @PathVariable String email,
+//             @RequestParam String postId,
+//             @RequestParam String discription) {
+
+//         return postService.addPoastDiscription(email, postId, discription);
+//   }
 
 //  end of test api's 
     private MultipartFile[] getNonEmptyFiles(MultipartFile[] files) {