Added limiting the values returned to the amount requested [#22]

comixed · Dec 20, 2024 · 5ded03f · 5ded03f
1 parent 97edf9c
commit 5ded03f
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 22 deletions.
diff --git a/src/main/java/org/comixedproject/metadata/marvel/actions/AbstractMarvelScrapingAction.java b/src/main/java/org/comixedproject/metadata/marvel/actions/AbstractMarvelScrapingAction.java
@@ -51,9 +51,13 @@ public abstract class AbstractMarvelScrapingAction<T> extends AbstractScrapingAc
   @Getter @Setter private String privateKey;
 
   protected boolean isDone(final BaseMarvelResponse<?> response) {
-    return ((response.getData().getLimit() + response.getData().getOffset())
-            + response.getData().getCount())
-        >= response.getData().getTotal();
+    final int current =
+        ((response.getData().getLimit() + response.getData().getOffset())
+            + response.getData().getCount());
+    final Integer total = response.getData().getTotal();
+    final boolean result = total <= current;
+    log.trace("current={} total={} result={}", current, total, result);
+    return result;
   }
 
   /**

diff --git a/src/main/java/org/comixedproject/metadata/marvel/actions/MarvelGetVolumesAction.java b/src/main/java/org/comixedproject/metadata/marvel/actions/MarvelGetVolumesAction.java
@@ -44,7 +44,7 @@ public class MarvelGetVolumesAction extends AbstractMarvelScrapingAction<List<Vo
   // https://gateway.marvel.com/v1/public/series?titleStartsWith=SERIES&ts=TIMESTAMP&apikey=APIKEY&hash=KEY
 
   @Getter @Setter private String series;
-  @Getter @Setter private Integer maxRecords;
+  @Getter @Setter private Integer maxRecords = Integer.MAX_VALUE;
 
   @Override
   public List<VolumeMetadata> execute() throws MetadataException {
@@ -80,26 +80,33 @@ public List<VolumeMetadata> execute() throws MetadataException {
           .getResults()
           .forEach(
               volume -> {
-                log.trace(
-                    "Processing volume record: {} name={}", volume.getId(), volume.getTitle());
-                final VolumeMetadata entry = new VolumeMetadata();
-                entry.setId(volume.getId());
-                entry.setPublisher(PUBLISHER_NAME);
-                final SeriesNameAdaptor.SeriesDetail seriesDetails =
-                    SeriesNameAdaptor.getInstance().execute(volume.getTitle());
-                entry.setName(seriesDetails.getName());
-                entry.setStartYear(seriesDetails.getStartYear());
-                entry.setIssueCount(volume.getComics().getAvailable());
-                entry.setImageURL(
-                    String.format(
-                        "%s.%s",
-                        volume.getThumbnail().getPath(), volume.getThumbnail().getExtension()));
-                result.add(entry);
+                if (canAddMoreResult(result)) {
+                  log.trace(
+                      "Processing volume record: {} name={}", volume.getId(), volume.getTitle());
+                  final VolumeMetadata entry = new VolumeMetadata();
+                  entry.setId(volume.getId());
+                  entry.setPublisher(PUBLISHER_NAME);
+                  final SeriesNameAdaptor.SeriesDetail seriesDetails =
+                      SeriesNameAdaptor.getInstance().execute(volume.getTitle());
+                  entry.setName(seriesDetails.getName());
+                  entry.setStartYear(seriesDetails.getStartYear());
+                  entry.setIssueCount(volume.getComics().getAvailable());
+                  entry.setImageURL(
+                      String.format(
+                          "%s.%s",
+                          volume.getThumbnail().getPath(), volume.getThumbnail().getExtension()));
+                  result.add(entry);
+                }
               });
-      done = isDone(response);
+      done = !canAddMoreResult(result) || isDone(response);
     }
 
     log.debug("Returning {} volume(s)", result.size());
     return result;
   }
+
+  private boolean canAddMoreResult(final List<VolumeMetadata> result) {
+    log.trace("Checking that {} is less than {}", result.size(), this.maxRecords);
+    return result.size() < this.maxRecords;
+  }
 }
diff --git a/src/test/java/org/comixedproject/metadata/marvel/actions/MarvelGetVolumesActionTest.java b/src/test/java/org/comixedproject/metadata/marvel/actions/MarvelGetVolumesActionTest.java