Added deleting related records when deleting a comic book [#2222]

mcpierce · mcpierce · commit cfe22a31eb2c · 2025-01-01T15:54:21.000-05:00
diff --git a/comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicDetail.java b/comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicDetail.java
@@ -243,7 +243,7 @@ public class ComicDetail {
       mappedBy = "comicDetail",
       cascade = CascadeType.ALL,
       orphanRemoval = true,
-      fetch = FetchType.LAZY)
+      fetch = FetchType.EAGER)
   @JsonProperty("tags")
   @JsonView({View.ComicListView.class, View.ReadingListDetail.class})
   @Getter
@@ -302,6 +302,13 @@ public class ComicDetail {
   @Setter
   private Date addedDate = new Date();
 
+  @ElementCollection
+  @CollectionTable(name = "read_comic_books", joinColumns = @JoinColumn(name = "comic_detail_id"))
+  @Column(name = "comixed_user_id")
+  @JsonView(View.UserList.class)
+  @Getter
+  private Set<Long> readByUserIds = new HashSet<>();
+
   /**
    * Returns the id for the parent comic book.
    *
diff --git a/comixed-repositories/src/main/java/org/comixedproject/repositories/comicbooks/ComicTagRepository.java b/comixed-repositories/src/main/java/org/comixedproject/repositories/comicbooks/ComicTagRepository.java
@@ -0,0 +1,34 @@
+/*
+ * ComiXed - A digital comic book library management application.
+ * Copyright (C) 2025, The ComiXed Project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>
+ */
+
+package org.comixedproject.repositories.comicbooks;
+
+import org.comixedproject.model.comicbooks.ComicDetail;
+import org.comixedproject.model.comicbooks.ComicTag;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ComicTagRepository extends JpaRepository<ComicTag, Long> {
+  /**
+   * Deletes all tags for the given comic detail.
+   *
+   * @param comicDetail the comic detail
+   */
+  void deleteAllByComicDetail(ComicDetail comicDetail);
+}
diff --git a/comixed-services/src/main/java/org/comixedproject/service/comicbooks/ComicBookService.java b/comixed-services/src/main/java/org/comixedproject/service/comicbooks/ComicBookService.java
@@ -44,6 +44,7 @@
 import org.comixedproject.model.net.library.RemoteLibrarySegmentState;
 import org.comixedproject.repositories.comicbooks.ComicBookRepository;
 import org.comixedproject.repositories.comicbooks.ComicDetailRepository;
+import org.comixedproject.repositories.comicbooks.ComicTagRepository;
 import org.comixedproject.state.comicbooks.ComicEvent;
 import org.comixedproject.state.comicbooks.ComicStateHandler;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,6 +80,7 @@ public class ComicBookService {
   @Autowired private ImprintService imprintService;
   @Autowired private FileTypeAdaptor fileTypeAdaptor;
   @Autowired private ApplicationEventPublisher applicationEventPublisher;
+  @Autowired private ComicTagRepository comicTagRepository;
 
   /**
    * Retrieves a single comic by id. It is expected that this comic exists.
@@ -240,6 +242,9 @@ public ComicBook undeleteComicBook(final long id) throws ComicBookException {
    */
   @Transactional
   public void deleteComicBook(final ComicBook comicBook) {
+    log.trace("Removing read references");
+    comicBook.getComicDetail().getReadByUserIds().clear();
+    this.comicTagRepository.deleteAllByComicDetail(comicBook.getComicDetail());
     log.debug("Deleting comicBook: id={}", comicBook.getId());
     this.comicBookRepository.delete(comicBook);
   }
diff --git a/comixed-services/src/test/java/org/comixedproject/service/comicbooks/ComicBookServiceTest.java b/comixed-services/src/test/java/org/comixedproject/service/comicbooks/ComicBookServiceTest.java
@@ -42,6 +42,7 @@
 import org.comixedproject.model.net.library.PublisherAndYearSegment;
 import org.comixedproject.model.net.library.RemoteLibrarySegmentState;
 import org.comixedproject.repositories.comicbooks.ComicBookRepository;
+import org.comixedproject.repositories.comicbooks.ComicTagRepository;
 import org.comixedproject.state.comicbooks.ComicEvent;
 import org.comixedproject.state.comicbooks.ComicStateHandler;
 import org.junit.Before;
@@ -109,6 +110,7 @@ public class ComicBookServiceTest {
   @InjectMocks private ComicBookService service;
   @Mock private ComicStateHandler comicStateHandler;
   @Mock private ComicBookRepository comicBookRepository;
+  @Mock private ComicTagRepository comicTagRepository;
   @Mock private ComicBookMetadataAdaptor comicBookMetadataAdaptor;
   @Mock private ComicFileAdaptor comicFileAdaptor;
   @Mock private ApplicationEventPublisher applicationEventPublisher;
@@ -137,6 +139,7 @@ public class ComicBookServiceTest {
 
   @Before
   public void setUp() {
+    Mockito.when(comicBook.getComicDetail()).thenReturn(comicDetail);
     Mockito.when(comicBook.getId()).thenReturn(TEST_COMIC_BOOK_ID);
     Mockito.when(comicBook.getComicDetail()).thenReturn(comicDetail);
     Mockito.when(incomingComicBook.getComicDetail()).thenReturn(incomingComicDetail);
@@ -397,10 +400,14 @@ public void testSave() {
 
   @Test
   public void testDelete() {
+    Mockito.doNothing()
+        .when(comicTagRepository)
+        .deleteAllByComicDetail(Mockito.any(ComicDetail.class));
     Mockito.doNothing().when(comicBookRepository).delete(Mockito.any(ComicBook.class));
 
     service.deleteComicBook(comicBook);
 
+    Mockito.verify(comicTagRepository, Mockito.times(1)).deleteAllByComicDetail(comicDetail);
     Mockito.verify(comicBookRepository, Mockito.times(1)).delete(comicBook);
   }
 
