Merge pull request #291 from amihaiemil/287

#287 pass the list to the supplier
self-xdsd · Apr 14, 2021 · e4630b7 · e4630b7
2 parents 936066a + af0b345
commit e4630b7
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/main/java/com/selfxdsd/storage/SelfInvoicedTasks.java b/src/main/java/com/selfxdsd/storage/SelfInvoicedTasks.java
@@ -75,28 +75,24 @@ public SelfInvoicedTasks(
      * InvoicedTasks of an Invoice.
      * @param invoice Invoice.
      * @return InvoicedTasks of the specified Invoice.
-     * @todo #280:60min Initialize the Stream from a List, to avoid querying
-     *  the DB at every Stream.get().
      */
     @Override
     public InvoicedTasks ofInvoice(final Invoice invoice) {
+        final Result<Record> results = database.jooq()
+            .select()
+            .from(SLF_INVOICEDTASKS_XDSD)
+            .where(
+                SLF_INVOICEDTASKS_XDSD.INVOICEID.eq(
+                    invoice.invoiceId()
+                )
+            ).fetch();
+        final List<InvoicedTask> tasks = new ArrayList<>();
+        for (final Record rec : results) {
+            tasks.add(invoicedTaskFromRecord(rec, invoice));
+        }
         return new InvoiceTasks(
             invoice,
-            () -> {
-                final Result<Record> results = database.jooq()
-                    .select()
-                    .from(SLF_INVOICEDTASKS_XDSD)
-                    .where(
-                        SLF_INVOICEDTASKS_XDSD.INVOICEID.eq(
-                            invoice.invoiceId()
-                        )
-                    ).fetch();
-                final List<InvoicedTask> tasks = new ArrayList<>();
-                for (final Record rec : results) {
-                    tasks.add(invoicedTaskFromRecord(rec, invoice));
-                }
-                return tasks.stream();
-            },
+            () -> tasks.stream(),
             this.storage
         );
     }