Corrections after review

Author: krzykrucz

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

@@ -6,7 +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.*;
+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.control.Try;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +36,9 @@
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
 @WebMvcTest(PatronProfileController.class)

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

@@ -1,9 +1,17 @@
 package io.pillopl.library.lending.dailysheet.infrastructure;
 
 import io.pillopl.library.catalogue.BookId;
-import io.pillopl.library.lending.dailysheet.model.*;
+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.control.Option;
 import lombok.AllArgsConstructor;

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

@@ -2,7 +2,12 @@
 
 import io.pillopl.library.catalogue.BookId;
 import io.pillopl.library.lending.patron.model.PatronId;
-import io.pillopl.library.lending.patronprofile.model.*;
+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 lombok.AllArgsConstructor;
 import org.springframework.jdbc.core.ColumnMapRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/io/pillopl/library/lending/patronprofile/web/PatronProfileController.java

@@ -24,9 +24,13 @@
 import java.util.List;
 import java.util.UUID;
 
-import static io.vavr.API.*;
+import static io.vavr.API.$;
+import static io.vavr.API.Case;
+import static io.vavr.API.Match;
 import static java.util.stream.Collectors.toList;
-import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.*;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.afford;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 import static org.springframework.http.ResponseEntity.notFound;
 import static org.springframework.http.ResponseEntity.ok;
 
@@ -110,29 +114,6 @@ private EntityModel<Checkout> resourceWithLinkToCheckoutSelf(UUID patronId, io.p
                         .withSelfRel());
     }
 
-    @Value
-    private class Hold {
-
-        UUID bookId;
-        Instant till;
-
-        private Hold(io.pillopl.library.lending.patronprofile.model.Hold hold) {
-            this.bookId = hold.getBook().getBookId();
-            this.till = hold.getTill();
-        }
-    }
-
-    @Value
-    private class Checkout {
-
-        UUID bookId;
-        Instant till;
-
-        private Checkout(io.pillopl.library.lending.patronprofile.model.Checkout hold) {
-            this.bookId = hold.getBook().getBookId();
-            this.till = hold.getTill();
-        }
-    }
 }
 
 @Value
@@ -150,3 +131,27 @@ class ProfileResource extends RepresentationModel {
 
 }
 
+@Value
+class Hold {
+
+    UUID bookId;
+    Instant till;
+
+    Hold(io.pillopl.library.lending.patronprofile.model.Hold hold) {
+        this.bookId = hold.getBook().getBookId();
+        this.till = hold.getTill();
+    }
+}
+
+@Value
+class Checkout {
+
+    UUID bookId;
+    Instant till;
+
+    Checkout(io.pillopl.library.lending.patronprofile.model.Checkout hold) {
+        this.bookId = hold.getBook().getBookId();
+        this.till = hold.getTill();
+    }
+
+}