Added sorting duplicate pages by comic count [#2338]

mcpierce · mcpierce · commit 3ea901aa684b · 2025-02-01T14:01:30.000-05:00
diff --git a/comixed-model/src/main/java/org/comixedproject/model/net/library/DuplicatePageUpdate.java b/comixed-model/src/main/java/org/comixedproject/model/net/library/DuplicatePageUpdate.java
@@ -40,7 +40,7 @@ public class DuplicatePageUpdate {
 
   @JsonProperty("total")
   @Getter
-  private int total;
+  private long total;
 
   @JsonProperty("page")
   @JsonView(View.DuplicatePageList.class)
diff --git a/comixed-model/src/main/java/org/comixedproject/model/net/library/LoadDuplicatePageListResponse.java b/comixed-model/src/main/java/org/comixedproject/model/net/library/LoadDuplicatePageListResponse.java
@@ -34,13 +34,13 @@
  */
 @AllArgsConstructor
 public class LoadDuplicatePageListResponse {
-  @JsonProperty("total")
+  @JsonProperty("pages")
   @JsonView(View.DuplicatePageList.class)
   @Getter
-  private int total;
+  private List<DuplicatePage> pages;
 
-  @JsonProperty("pages")
+  @JsonProperty("total")
   @JsonView(View.DuplicatePageList.class)
   @Getter
-  private List<DuplicatePage> pages;
+  private long total;
 }
diff --git a/comixed-repositories/src/main/java/org/comixedproject/repositories/comicpages/ComicPageRepository.java b/comixed-repositories/src/main/java/org/comixedproject/repositories/comicpages/ComicPageRepository.java
@@ -65,7 +65,7 @@ public interface ComicPageRepository extends JpaRepository<ComicPage, Long> {
 
   @Query(
       "SELECT COUNT(DISTINCT p.hash) FROM ComicPage p WHERE p.hash in (SELECT d.hash FROM ComicPage d GROUP BY d.hash HAVING COUNT(*) > 1)")
-  int getDuplicatePageCount();
+  long getDuplicatePageCount();
 
   /**
    * Returns the list of pages that have the given hash and state flag value.
diff --git a/comixed-rest/src/main/java/org/comixedproject/rest/library/DuplicatePageController.java b/comixed-rest/src/main/java/org/comixedproject/rest/library/DuplicatePageController.java
@@ -70,7 +70,9 @@ public LoadDuplicatePageListResponse getDuplicatePageList(
         size,
         sortBy,
         sortDirection);
-    return this.duplicatePageService.getDuplicatePages(page, size, sortBy, sortDirection);
+    return new LoadDuplicatePageListResponse(
+        this.duplicatePageService.getDuplicatePages(page, size, sortBy, sortDirection),
+        this.duplicatePageService.getDuplicatePageCount());
   }
 
   /**
diff --git a/comixed-rest/src/test/java/org/comixedproject/rest/library/DuplicatePageControllerTest.java b/comixed-rest/src/test/java/org/comixedproject/rest/library/DuplicatePageControllerTest.java
@@ -18,9 +18,9 @@
 
 package org.comixedproject.rest.library;
 
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertSame;
+import static junit.framework.TestCase.*;
 
+import java.util.List;
 import org.comixedproject.model.library.DuplicatePage;
 import org.comixedproject.model.net.library.LoadDuplicatePageListRequest;
 import org.comixedproject.model.net.library.LoadDuplicatePageListResponse;
@@ -40,26 +40,31 @@ public class DuplicatePageControllerTest {
   private static final int TEST_PAGE_SIZE = 25;
   private static final String TEST_SORT_BY = "hash";
   private static final String TEST_SORT_DIRECTION = "desc";
+  private static final long TEST_DUPLICATE_PAGE_COUNT = 238L;
 
   @InjectMocks private DuplicatePageController controller;
   @Mock private DuplicatePageService duplicatePageService;
   @Mock private DuplicatePage duplicatePage;
+  @Mock private List<DuplicatePage> duplicatePageList;
   @Mock private LoadDuplicatePageListResponse duplicatePageListResponse;
 
   @Test
   public void testGetDuplicatePageList() {
     Mockito.when(
             duplicatePageService.getDuplicatePages(
                 Mockito.anyInt(), Mockito.anyInt(), Mockito.anyString(), Mockito.anyString()))
-        .thenReturn(duplicatePageListResponse);
+        .thenReturn(duplicatePageList);
+    Mockito.when(duplicatePageService.getDuplicatePageCount())
+        .thenReturn(TEST_DUPLICATE_PAGE_COUNT);
 
     final LoadDuplicatePageListResponse result =
         controller.getDuplicatePageList(
             new LoadDuplicatePageListRequest(
                 TEST_PAGE_NUMBER, TEST_PAGE_SIZE, TEST_SORT_BY, TEST_SORT_DIRECTION));
 
     assertNotNull(result);
-    assertSame(duplicatePageListResponse, result);
+    assertSame(duplicatePageList, result.getPages());
+    assertEquals(TEST_DUPLICATE_PAGE_COUNT, result.getTotal());
 
     Mockito.verify(duplicatePageService, Mockito.times(1))
         .getDuplicatePages(TEST_PAGE_NUMBER, TEST_PAGE_SIZE, TEST_SORT_BY, TEST_SORT_DIRECTION);
diff --git a/comixed-services/src/main/java/org/comixedproject/service/library/DuplicatePageService.java b/comixed-services/src/main/java/org/comixedproject/service/library/DuplicatePageService.java
@@ -22,7 +22,6 @@
 import lombok.extern.log4j.Log4j2;
 import org.comixedproject.model.comicpages.ComicPage;
 import org.comixedproject.model.library.DuplicatePage;
-import org.comixedproject.model.net.library.LoadDuplicatePageListResponse;
 import org.comixedproject.repositories.comicpages.ComicPageRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -46,21 +45,23 @@ public class DuplicatePageService {
   /**
    * Retrieves the list of all duplicate pages in the library.
    *
-   * @return the duplicate pages
+   * @return the duplicate page list
    */
   @Transactional(isolation = Isolation.READ_UNCOMMITTED)
-  public LoadDuplicatePageListResponse getDuplicatePages(
+  public List<DuplicatePage> getDuplicatePages(
       final int page, final int size, final String sortBy, final String sortDirection) {
     log.trace("Getting pages from repository");
-    final List<DuplicatePage> pages =
-        this.comicPageRepository.getDuplicatePages(
-            PageRequest.of(page, size, this.doCreateSort(sortBy, sortDirection)));
-    log.trace("Returning duplicate page list");
-    return new LoadDuplicatePageListResponse(this.getDuplicatePageCount(), pages);
+    return this.comicPageRepository.getDuplicatePages(
+        PageRequest.of(page, size, this.doCreateSort(sortBy, sortDirection)));
   }
 
+  /**
+   * Retrieves the number of duplicate pages in the library.
+   *
+   * @return the page count
+   */
   @Transactional
-  public int getDuplicatePageCount() {
+  public long getDuplicatePageCount() {
     log.debug("Loading duplicate page count");
     return this.comicPageRepository.getDuplicatePageCount();
   }
@@ -73,6 +74,7 @@ private Sort doCreateSort(final String sortBy, final String sortDirection) {
     String fieldName;
     switch (sortBy) {
       case "hash" -> fieldName = "hash";
+      case "comic-count" -> fieldName = "comicCount";
       default -> fieldName = "hash";
     }
 
diff --git a/comixed-services/src/test/java/org/comixedproject/service/comicpages/BlockedHashServiceTest.java b/comixed-services/src/test/java/org/comixedproject/service/comicpages/BlockedHashServiceTest.java
@@ -75,7 +75,7 @@ public class BlockedHashServiceTest {
   private static final byte[] TEST_PAGE_CONTENT = "This is the page content".getBytes();
   private static final String TEST_ENCODED_PAGE = "This is the encoded page.";
   private static final byte[] TEST_DECODED_PAGE = "This is the decoded page".getBytes();
-  private static final int TEST_TOTAL_DUPLICATE_PAGES = 320;
+  private static final long TEST_TOTAL_DUPLICATE_PAGES = 320L;
 
   @InjectMocks private BlockedHashService service;
   @Mock private DuplicatePageService duplicatePageService;
diff --git a/comixed-services/src/test/java/org/comixedproject/service/library/DuplicatePageServiceTest.java b/comixed-services/src/test/java/org/comixedproject/service/library/DuplicatePageServiceTest.java
@@ -10,7 +10,6 @@
 import org.comixedproject.model.comicbooks.ComicDetail;
 import org.comixedproject.model.comicpages.ComicPage;
 import org.comixedproject.model.library.DuplicatePage;
-import org.comixedproject.model.net.library.LoadDuplicatePageListResponse;
 import org.comixedproject.repositories.comicpages.ComicPageRepository;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +41,6 @@ public class DuplicatePageServiceTest {
 
   @Before
   public void setUp() {
-    Mockito.when(duplicatePage.getHash()).thenReturn(TEST_PAGE_HASH);
     Mockito.when(comicBook.getComicDetail()).thenReturn(comicDetail);
     Mockito.when(comicPage.getComicBook()).thenReturn(comicBook);
   }
@@ -55,13 +53,12 @@ public void testGetDuplicatePages() {
     Mockito.when(comicPageRepository.getDuplicatePages(pageRequestArgumentCaptor.capture()))
         .thenReturn(duplicatePageList);
 
-    LoadDuplicatePageListResponse result =
+    List<DuplicatePage> result =
         service.getDuplicatePages(
             TEST_PAGE_NUMBER, TEST_PAGE_SIZE, TEST_SORT_BY, TEST_SORT_DIRECTION);
 
     assertNotNull(result);
-    assertFalse(result.getPages().isEmpty());
-    assertEquals(TEST_PAGE_HASH, result.getPages().get(0).getHash());
+    assertFalse(result.isEmpty());
 
     final PageRequest pageRequest = pageRequestArgumentCaptor.getValue();
     assertEquals(TEST_PAGE_NUMBER, pageRequest.getPageNumber());
diff --git a/comixed-webui/src/app/library/pages/duplicate-page-list-page/duplicate-page-list-page.component.html b/comixed-webui/src/app/library/pages/duplicate-page-list-page/duplicate-page-list-page.component.html
@@ -134,7 +134,7 @@ <h2>
   </ng-container>
 
   <ng-container matColumnDef="hash">
-    <mat-header-cell mat-sort-header mat-sort-header *matHeaderCellDef>
+    <mat-header-cell mat-sort-header *matHeaderCellDef>
       {{ "duplicate-pages.header.hash" | translate }}
     </mat-header-cell>
     <mat-cell *matCellDef="let row">
@@ -143,7 +143,7 @@ <h2>
   </ng-container>
 
   <ng-container matColumnDef="comic-count">
-    <mat-header-cell *matHeaderCellDef>
+    <mat-header-cell mat-sort-header *matHeaderCellDef>
       {{ "duplicate-pages.header.comic-count" | translate }}
     </mat-header-cell>
     <mat-cell *matCellDef="let row">
