[Issue #260] Fix an issue with retrieving the reading lists for comics.

comixed · Jun 21, 2020 · fd494cc · fd494cc
1 parent da9e542
commit fd494cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/comixed-library/src/main/java/org/comixed/model/comic/Comic.java b/comixed-library/src/main/java/org/comixed/model/comic/Comic.java
@@ -273,7 +273,7 @@ public class Comic {
   private String summary;
 
   @Formula(
-      "(SELECT COUNT(*) FROM comics c WHERE c.series = series AND c.volume = volume AND c.issue_number = issueNumber)")
+      "(SELECT COUNT(*) FROM comics c WHERE c.series = series AND c.volume = volume AND c.issue_number = issue_number)")
   @JsonProperty("duplicateCount")
   @JsonView(View.ComicList.class)
   private Integer duplicateCount;

diff --git a/comixed-library/src/main/java/org/comixed/repositories/library/ReadingListRepository.java b/comixed-library/src/main/java/org/comixed/repositories/library/ReadingListRepository.java
@@ -38,6 +38,6 @@ List<ReadingList> getAllReadingListsForOwnerUpdatedAfter(
   ReadingList findReadingListForUser(ComiXedUser owner, String listName);
 
   @Query(
-      "SELECT l FROM ReadingList l WHERE l.owner.email = :email AND l IN (SELECT e FROM ReadingListEntry e WHERE e.comic = :comic)")
+      "SELECT l FROM ReadingList l WHERE l.owner.email = :email AND l IN (SELECT e.readingList FROM ReadingListEntry e WHERE e.comic = :comic)")
   List<ReadingList> findByOwnerAndComic(@Param("email") String email, @Param("comic") Comic comic);
 }
diff --git a/comixed-services/src/main/java/org/comixed/service/library/LibraryService.java b/comixed-services/src/main/java/org/comixed/service/library/LibraryService.java
@@ -75,8 +75,10 @@ public List<Comic> getComicsUpdatedSince(
       }
     }
 
-    this.log.debug("Loading reading lists");
-    this.readingListService.getReadingListsForComics(email, result);
+    if (!result.isEmpty()) {
+      this.log.debug("Loading reading lists");
+      this.readingListService.getReadingListsForComics(email, result);
+    }
 
     this.log.debug("Returning {} updated comic{}", result.size(), result.size() == 1 ? "" : "s");
     return result;