Merge pull request #32 from krzykrucz/master

Replaced tuples with domain names

Author: pilloPl

src/integration-test/groovy/io/pillopl/library/lending/patronprofile/infrastructure/FindingPatronProfileInDatabaseIT.groovy

@@ -8,6 +8,8 @@ import io.pillopl.library.lending.librarybranch.model.LibraryBranchId
 import io.pillopl.library.lending.patron.model.PatronEvent
 import io.pillopl.library.lending.patron.model.PatronId
 import io.pillopl.library.lending.patron.model.PatronType
+import io.pillopl.library.lending.patronprofile.model.Checkout
+import io.pillopl.library.lending.patronprofile.model.Hold
 import io.pillopl.library.lending.patronprofile.model.PatronProfile
 import io.pillopl.library.lending.patronprofile.model.PatronProfiles
 import org.springframework.beans.factory.annotation.Autowired
@@ -23,7 +25,6 @@ import static io.pillopl.library.catalogue.BookType.Restricted
 import static io.pillopl.library.lending.book.model.BookFixture.anyBookId
 import static io.pillopl.library.lending.librarybranch.model.LibraryBranchFixture.anyBranch
 import static io.pillopl.library.lending.patron.model.PatronFixture.anyPatronId
-import static io.vavr.Tuple.of
 import static java.time.Instant.now
 
 @SpringBootTest(classes = LendingTestContext.class)
@@ -83,14 +84,14 @@ class FindingPatronProfileInDatabaseIT extends Specification {
 
     void thereIsOnlyOneHold(PatronProfile profile) {
         assert profile.holdsView.currentHolds.size() == 1
-        assert profile.holdsView.currentHolds.get(0).equals(of(bookId, TOMORROW))
+        assert profile.holdsView.currentHolds.get(0) == new Hold(bookId, TOMORROW)
         assert profile.currentCheckouts.currentCheckouts.size() == 0
     }
 
     void thereIsOnlyOneCheckout(PatronProfile profile) {
         assert profile.holdsView.currentHolds.size() == 0
         assert profile.currentCheckouts.currentCheckouts.size() == 1
-        assert profile.currentCheckouts.currentCheckouts.get(0).equals(of(bookId, TOMORROW))
+        assert profile.currentCheckouts.currentCheckouts.get(0) == new Checkout(bookId, TOMORROW)
     }
 
     void thereIsZeroHoldsAndZeroCheckouts(PatronProfile profile) {
@@ -99,7 +100,7 @@ class FindingPatronProfileInDatabaseIT extends Specification {
 
     }
 
-	PatronEvent.BookCheckedOut bookCheckedOutTill(Instant till) {
+    PatronEvent.BookCheckedOut bookCheckedOutTill(Instant till) {
         return new PatronEvent.BookCheckedOut(
                 now(),
                 patronId.getPatronId(),

src/integration-test/groovy/io/pillopl/library/lending/patronprofile/web/PatronProfileControllerIT.java

@@ -6,11 +6,12 @@
 import io.pillopl.library.lending.patron.application.hold.CancelingHold;
 import io.pillopl.library.lending.patron.model.PatronFixture;
 import io.pillopl.library.lending.patron.model.PatronId;
+import io.pillopl.library.lending.patronprofile.model.Checkout;
 import io.pillopl.library.lending.patronprofile.model.CheckoutsView;
+import io.pillopl.library.lending.patronprofile.model.Hold;
 import io.pillopl.library.lending.patronprofile.model.HoldsView;
 import io.pillopl.library.lending.patronprofile.model.PatronProfile;
 import io.pillopl.library.lending.patronprofile.model.PatronProfiles;
-import io.vavr.Tuple;
 import io.vavr.control.Try;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -191,7 +192,7 @@ public void shouldReturn500IfSomethingFailedWhileCanceling() throws Exception {
 
     PatronProfile profiles() {
         return new PatronProfile(
-                new HoldsView(of(Tuple.of(bookId, anyDate))),
-                new CheckoutsView(of(Tuple.of(anotherBook, anotherDate))));
+                new HoldsView(of(new Hold(bookId, anyDate))),
+                new CheckoutsView(of(new Checkout(anotherBook, anotherDate))));
     }
 }

src/main/java/io/pillopl/library/lending/dailysheet/infrastructure/SheetsReadModel.java

@@ -3,11 +3,16 @@
 import io.pillopl.library.catalogue.BookId;
 import io.pillopl.library.lending.dailysheet.model.CheckoutsToOverdueSheet;
 import io.pillopl.library.lending.dailysheet.model.DailySheet;
+import io.pillopl.library.lending.dailysheet.model.ExpiredHold;
 import io.pillopl.library.lending.dailysheet.model.HoldsToExpireSheet;
+import io.pillopl.library.lending.dailysheet.model.OverdueCheckout;
 import io.pillopl.library.lending.librarybranch.model.LibraryBranchId;
-import io.pillopl.library.lending.patron.model.PatronEvent.*;
+import io.pillopl.library.lending.patron.model.PatronEvent.BookCheckedOut;
+import io.pillopl.library.lending.patron.model.PatronEvent.BookHoldCanceled;
+import io.pillopl.library.lending.patron.model.PatronEvent.BookHoldExpired;
+import io.pillopl.library.lending.patron.model.PatronEvent.BookPlacedOnHold;
+import io.pillopl.library.lending.patron.model.PatronEvent.BookReturned;
 import io.pillopl.library.lending.patron.model.PatronId;
-import io.vavr.Tuple3;
 import io.vavr.control.Option;
 import lombok.AllArgsConstructor;
 import org.springframework.context.event.EventListener;
@@ -23,7 +28,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static io.vavr.Tuple.of;
 import static io.vavr.collection.List.ofAll;
 import static java.sql.Timestamp.from;
 import static java.util.stream.Collectors.toList;
@@ -39,7 +43,7 @@ public HoldsToExpireSheet queryForHoldsToExpireSheet() {
         return new HoldsToExpireSheet(ofAll(
                 findHoldsToExpire()
                         .stream()
-                        .map(this::toExpiredHoldsTuple)
+                        .map(this::toExpiredHold)
                         .collect(toList())));
     }
 
@@ -50,8 +54,8 @@ private List<Map<String, Object>> findHoldsToExpire() {
                 new ColumnMapRowMapper());
     }
 
-    private Tuple3<BookId, PatronId, LibraryBranchId> toExpiredHoldsTuple(Map<String, Object> map) {
-        return of(
+    private ExpiredHold toExpiredHold(Map<String, Object> map) {
+        return new ExpiredHold(
                 new BookId((UUID) map.get("BOOK_ID")),
                 new PatronId((UUID) map.get("HOLD_BY_PATRON_ID")),
                 new LibraryBranchId((UUID) map.get("HOLD_AT_BRANCH")));
@@ -62,7 +66,7 @@ public CheckoutsToOverdueSheet queryForCheckoutsToOverdue() {
         return new CheckoutsToOverdueSheet(ofAll(
                 findCheckoutsToOverdue()
                         .stream()
-                        .map(this::toOverdueCheckoutsTuple)
+                        .map(this::toOverdueCheckout)
                         .collect(toList())));
     }
 
@@ -73,8 +77,8 @@ private List<Map<String, Object>> findCheckoutsToOverdue() {
                 new ColumnMapRowMapper());
     }
 
-    private Tuple3<BookId, PatronId, LibraryBranchId> toOverdueCheckoutsTuple(Map<String, Object> map) {
-        return of(
+    private OverdueCheckout toOverdueCheckout(Map<String, Object> map) {
+        return new OverdueCheckout(
                 new BookId((UUID) map.get("BOOK_ID")),
                 new PatronId((UUID) map.get("CHECKED_OUT_BY_PATRON_ID")),
                 new LibraryBranchId((UUID) map.get("CHECKED_OUT_AT_BRANCH")));

src/main/java/io/pillopl/library/lending/dailysheet/model/CheckoutsToOverdueSheet.java

@@ -1,10 +1,6 @@
 package io.pillopl.library.lending.dailysheet.model;
 
-import io.pillopl.library.catalogue.BookId;
-import io.pillopl.library.lending.librarybranch.model.LibraryBranchId;
 import io.pillopl.library.lending.patron.model.PatronEvent.OverdueCheckoutRegistered;
-import io.pillopl.library.lending.patron.model.PatronId;
-import io.vavr.Tuple3;
 import io.vavr.collection.List;
 import io.vavr.collection.Stream;
 import lombok.NonNull;
@@ -14,21 +10,15 @@
 public class CheckoutsToOverdueSheet {
 
     @NonNull
-    List<Tuple3<BookId, PatronId, LibraryBranchId>> checkouts;
+    List<OverdueCheckout> checkouts;
 
     public Stream<OverdueCheckoutRegistered> toStreamOfEvents() {
-        return checkouts
-                .toStream()
-                .map(this::tupleToEvent);
+        return checkouts.toStream()
+                .map(OverdueCheckout::toEvent);
     }
 
     public int count() {
         return checkouts.size();
     }
 
-    private OverdueCheckoutRegistered tupleToEvent(Tuple3<BookId, PatronId, LibraryBranchId> overdueCheckouts) {
-        return OverdueCheckoutRegistered.now(overdueCheckouts._2, overdueCheckouts._1, overdueCheckouts._3);
-    }
-
-
 }

src/main/java/io/pillopl/library/lending/dailysheet/model/ExpiredHold.java

@@ -0,0 +1,18 @@
+package io.pillopl.library.lending.dailysheet.model;
+
+import io.pillopl.library.catalogue.BookId;
+import io.pillopl.library.lending.librarybranch.model.LibraryBranchId;
+import io.pillopl.library.lending.patron.model.PatronEvent.BookHoldExpired;
+import io.pillopl.library.lending.patron.model.PatronId;
+import lombok.Value;
+
+@Value
+public class ExpiredHold {
+    private final BookId heldBook;
+    private final PatronId patron;
+    private final LibraryBranchId library;
+
+    BookHoldExpired toEvent() {
+        return BookHoldExpired.now(this.heldBook, this.patron, this.library);
+    }
+}

src/main/java/io/pillopl/library/lending/dailysheet/model/HoldsToExpireSheet.java

@@ -1,10 +1,6 @@
 package io.pillopl.library.lending.dailysheet.model;
 
-import io.pillopl.library.catalogue.BookId;
-import io.pillopl.library.lending.librarybranch.model.LibraryBranchId;
 import io.pillopl.library.lending.patron.model.PatronEvent;
-import io.pillopl.library.lending.patron.model.PatronId;
-import io.vavr.Tuple3;
 import io.vavr.collection.List;
 import io.vavr.collection.Stream;
 import lombok.NonNull;
@@ -15,22 +11,17 @@
 public class HoldsToExpireSheet {
 
     @NonNull
-    List<Tuple3<BookId, PatronId, LibraryBranchId>> expiredHolds;
+    List<ExpiredHold> expiredHolds;
 
     @EventListener
     public Stream<PatronEvent.BookHoldExpired> toStreamOfEvents() {
         return expiredHolds
                 .toStream()
-                .map(this::tupleToEvent);
+                .map(ExpiredHold::toEvent);
     }
 
     public int count() {
         return expiredHolds.size();
     }
 
-    private PatronEvent.BookHoldExpired tupleToEvent(Tuple3<BookId, PatronId, LibraryBranchId> expiredHold) {
-        return PatronEvent.BookHoldExpired.now(expiredHold._1, expiredHold._2, expiredHold._3);
-    }
-
-
 }

src/main/java/io/pillopl/library/lending/dailysheet/model/OverdueCheckout.java

@@ -0,0 +1,18 @@
+package io.pillopl.library.lending.dailysheet.model;
+
+import io.pillopl.library.catalogue.BookId;
+import io.pillopl.library.lending.librarybranch.model.LibraryBranchId;
+import io.pillopl.library.lending.patron.model.PatronEvent.OverdueCheckoutRegistered;
+import io.pillopl.library.lending.patron.model.PatronId;
+import lombok.Value;
+
+@Value
+public class OverdueCheckout {
+    private final BookId checkedOutBook;
+    private final PatronId patron;
+    private final LibraryBranchId library;
+
+    OverdueCheckoutRegistered toEvent() {
+        return OverdueCheckoutRegistered.now(this.patron, this.checkedOutBook, this.library);
+    }
+}

src/main/java/io/pillopl/library/lending/patronprofile/infrastructure/PatronProfileReadModel.java

@@ -2,18 +2,17 @@
 
 import io.pillopl.library.catalogue.BookId;
 import io.pillopl.library.lending.patron.model.PatronId;
+import io.pillopl.library.lending.patronprofile.model.Checkout;
 import io.pillopl.library.lending.patronprofile.model.CheckoutsView;
+import io.pillopl.library.lending.patronprofile.model.Hold;
 import io.pillopl.library.lending.patronprofile.model.HoldsView;
 import io.pillopl.library.lending.patronprofile.model.PatronProfile;
 import io.pillopl.library.lending.patronprofile.model.PatronProfiles;
-import io.vavr.Tuple;
-import io.vavr.Tuple2;
 import lombok.AllArgsConstructor;
 import org.springframework.jdbc.core.ColumnMapRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.sql.Timestamp;
-import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -31,12 +30,12 @@ public PatronProfile fetchFor(PatronId patronId) {
         HoldsView holdsView = new HoldsView(
                 ofAll(findCurrentHoldsFor(patronId)
                         .stream()
-                        .map(this::toHoldViewTuple)
+                        .map(this::toHold)
                         .collect(toList())));
         CheckoutsView checkoutsView = new CheckoutsView(
                 ofAll(findCurrentCheckoutsFor(patronId)
                         .stream()
-                        .map(this::toCheckoutsViewTuple)
+                        .map(this::toCheckout)
                         .collect(toList())));
         return new PatronProfile(holdsView, checkoutsView);
     }
@@ -48,8 +47,8 @@ private List<Map<String, Object>> findCurrentHoldsFor(PatronId patronId) {
                 new ColumnMapRowMapper());
     }
 
-    private Tuple2<BookId, Instant> toHoldViewTuple(Map<String, Object> map) {
-        return Tuple.of(new BookId((UUID) map.get("BOOK_ID")),
+    private Hold toHold(Map<String, Object> map) {
+        return new Hold(new BookId((UUID) map.get("BOOK_ID")),
                 ((Timestamp) map.get("HOLD_TILL")).toInstant());
     }
 
@@ -60,8 +59,8 @@ private List<Map<String, Object>> findCurrentCheckoutsFor(PatronId patronId) {
                 new ColumnMapRowMapper());
     }
 
-    private Tuple2<BookId, Instant> toCheckoutsViewTuple(Map<String, Object> map) {
-        return Tuple.of(new BookId((UUID) map.get("BOOK_ID")),
+    private Checkout toCheckout(Map<String, Object> map) {
+        return new Checkout(new BookId((UUID) map.get("BOOK_ID")),
                 ((Timestamp) map.get("CHECKOUT_TILL")).toInstant());
     }
 }

src/main/java/io/pillopl/library/lending/patronprofile/model/Checkout.java

@@ -0,0 +1,15 @@
+package io.pillopl.library.lending.patronprofile.model;
+
+import io.pillopl.library.catalogue.BookId;
+import lombok.Value;
+
+import java.time.Instant;
+
+@Value
+public class Checkout {
+
+    private final BookId book;
+
+    private final Instant till;
+
+}

src/main/java/io/pillopl/library/lending/patronprofile/model/CheckoutsView.java

@@ -1,17 +1,13 @@
 package io.pillopl.library.lending.patronprofile.model;
 
-import io.pillopl.library.catalogue.BookId;
-import io.vavr.Tuple2;
 import io.vavr.collection.List;
 import lombok.NonNull;
 import lombok.Value;
 
-import java.time.Instant;
-
 @Value
 public class CheckoutsView {
 
     @NonNull
-    List<Tuple2<BookId, Instant>> currentCheckouts;
+    List<Checkout> currentCheckouts;
 
 }