Fixed null pages causing page reordering to fail [#2482]

mcpierce · mcpierce · commit 331d8b8e7b82 · 2025-10-14T09:10:42.000-04:00
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
@@ -563,14 +563,16 @@ public void savePageOrder(final long comicId, final List<PageOrderEntry> entryLi
     log.trace("Applying order");
     for (int index = 0; index < comicBook.getPages().size(); index++) {
       final ComicPage page = comicBook.getPages().get(index);
-      final Optional<PageOrderEntry> position =
-          entryList.stream()
-              .filter(pageOrderEntry -> pageOrderEntry.getFilename().equals(page.getFilename()))
-              .findFirst();
-      if (position.isEmpty())
-        throw new ComicBookException("No such order entry: filename=" + page.getFilename());
-      log.trace("Applying position");
-      page.setPageNumber(position.get().getPosition());
+      if (Objects.nonNull(page)) {
+        final Optional<PageOrderEntry> position =
+            entryList.stream()
+                .filter(pageOrderEntry -> pageOrderEntry.getFilename().equals(page.getFilename()))
+                .findFirst();
+        if (position.isEmpty())
+          throw new ComicBookException("No such order entry: filename=" + page.getFilename());
+        log.trace("Applying position");
+        page.setPageNumber(position.get().getPosition());
+      }
     }
 
     log.trace("Firing event: details updated");
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
@@ -820,16 +820,26 @@ void savePageOrder_invalidId() {
   }
 
   @Test
-  void savePageOrder_containsGap() {
+  void savePageOrder_containsGap() throws ComicBookException {
     List<PageOrderEntry> entryList = new ArrayList<>();
+    List<ComicPage> pageList = new ArrayList<>();
     for (int index = 0; index < 25; index++) {
-      entryList.add(new PageOrderEntry(String.format("filename-%d", index), index + 1));
+      entryList.add(new PageOrderEntry(String.format("filename-%d", index), index));
+      if (index % 2 == 0) {
+        final String filename = String.format("filename-%d", index);
+        final ComicPage page = new ComicPage();
+        page.setFilename(filename);
+        pageList.add(page);
+      }
     }
 
     Mockito.when(comicBookRepository.getById(Mockito.anyLong())).thenReturn(comicBook);
+    Mockito.when(comicBook.getPages()).thenReturn(pageList);
 
-    assertThrows(
-        ComicBookException.class, () -> service.savePageOrder(TEST_COMIC_BOOK_ID, entryList));
+    service.savePageOrder(TEST_COMIC_BOOK_ID, entryList);
+
+    Mockito.verify(comicStateHandler, Mockito.times(1))
+        .fireEvent(comicBook, ComicEvent.detailsUpdated);
   }
 
   @Test
