Fixed not selecting and deselecting comics in collections [#2326]

mcpierce · mcpierce · commit cd5586569bfa · 2025-01-27T16:49:13.000-05:00
diff --git a/comixed-rest/src/main/java/org/comixedproject/rest/comicbooks/ComicBookSelectionController.java b/comixed-rest/src/main/java/org/comixedproject/rest/comicbooks/ComicBookSelectionController.java
@@ -151,7 +151,7 @@ public void selectComicBooksByFilter(
    * Adds selections by tag type and value
    *
    * @param session the session
-   * @param tagTypeString the tag type string
+   * @param tagType the tag type
    * @param tagValue the tag value
    * @throws ComicBookSelectionException if an error occurs
    */
@@ -160,10 +160,9 @@ public void selectComicBooksByFilter(
   @Timed(value = "comixed.comic-book.selections.add-by-tag-type-and-value")
   public void addComicBooksByTagTypeAndValue(
       final HttpSession session,
-      @PathVariable("tagType") final String tagTypeString,
+      @PathVariable("tagType") final ComicTagType tagType,
       @PathVariable("tagValue") final String tagValue)
       throws ComicBookSelectionException {
-    final ComicTagType tagType = ComicTagType.forValue(tagTypeString);
     final String decodedTagValue = this.opdsUtils.urlDecodeString(tagValue);
     log.info(
         "Adding multiple comic books by tag type and value: type={} value={}",
@@ -181,7 +180,7 @@ public void addComicBooksByTagTypeAndValue(
    * Removes selections using filters.
    *
    * @param session the session
-   * @param tagTypeString the tag type string
+   * @param tagType the tag type
    * @param tagValue the tag value
    * @throws ComicBookSelectionException if an error occurs
    */
@@ -190,10 +189,9 @@ public void addComicBooksByTagTypeAndValue(
   @Timed(value = "comixed.comic-book.selections.remove-by-tag-type-and-value")
   public void removeComicBooksByTagTypeAndValue(
       final HttpSession session,
-      @PathVariable("tagType") final String tagTypeString,
+      @PathVariable("tagType") final ComicTagType tagType,
       @PathVariable("tagValue") final String tagValue)
       throws ComicBookSelectionException {
-    final ComicTagType tagType = ComicTagType.forValue(tagTypeString);
     final String decodedTagValue = this.opdsUtils.urlDecodeString(tagValue);
 
     log.info(
diff --git a/comixed-rest/src/test/java/org/comixedproject/rest/comicbooks/ComicBookSelectionControllerTest.java b/comixed-rest/src/test/java/org/comixedproject/rest/comicbooks/ComicBookSelectionControllerTest.java
@@ -138,8 +138,7 @@ public void testSelectComicBooksByFilter_deselecting() throws ComicBookSelection
   public void testAddComicBooksByTagTypeAndValue() throws ComicBookSelectionException {
     Mockito.when(opdsUtils.urlDecodeString(TEST_TAG_VALUE)).thenReturn(TEST_TAG_VALUE);
 
-    controller.addComicBooksByTagTypeAndValue(
-        httpSession, TEST_TAG_TYPE.getValue(), TEST_TAG_VALUE);
+    controller.addComicBooksByTagTypeAndValue(httpSession, TEST_TAG_TYPE, TEST_TAG_VALUE);
 
     Mockito.verify(httpSession, Mockito.times(1)).getAttribute(LIBRARY_SELECTIONS);
     Mockito.verify(comicSelectionService, Mockito.times(1))
@@ -153,8 +152,7 @@ public void testAddComicBooksByTagTypeAndValue() throws ComicBookSelectionExcept
   public void testRemoveComicBooksByTagTypeAndValue() throws ComicBookSelectionException {
     Mockito.when(opdsUtils.urlDecodeString(TEST_TAG_VALUE)).thenReturn(TEST_TAG_VALUE);
 
-    controller.removeComicBooksByTagTypeAndValue(
-        httpSession, TEST_TAG_TYPE.getValue(), TEST_TAG_VALUE);
+    controller.removeComicBooksByTagTypeAndValue(httpSession, TEST_TAG_TYPE, TEST_TAG_VALUE);
 
     Mockito.verify(httpSession, Mockito.times(1)).getAttribute(LIBRARY_SELECTIONS);
     Mockito.verify(comicSelectionService, Mockito.times(1))
