Set delivery price (#137)

yg-apaza · Tim Moore · commit ef0b3d5bc383 · 2017-07-26T12:08:41.000+09:30
* Add entity tests

* Add service integration test

* Add entity and service call

* Remove unused import, comments and fix typo

* Add UI to set delivery price
diff --git a/transaction-api/src/main/java/com/example/auction/transaction/api/TransactionInfo.java b/transaction-api/src/main/java/com/example/auction/transaction/api/TransactionInfo.java
@@ -16,13 +16,13 @@ public final class TransactionInfo {
     private final UUID winner;
     private final ItemData itemData;
     private final int itemPrice;
-    private final int deliveryPrice;
+    private final Optional<Integer> deliveryPrice;
     private final Optional<DeliveryInfo> deliveryInfo;
     private final TransactionInfoStatus status;
     //private final PaymentInfo paymentInfo;
 
     @JsonCreator
-    public TransactionInfo(UUID itemId, UUID creator, UUID winner, ItemData itemData, int itemPrice, int deliveryPrice, Optional<DeliveryInfo> deliveryInfo, TransactionInfoStatus status) {
+    public TransactionInfo(UUID itemId, UUID creator, UUID winner, ItemData itemData, int itemPrice, Optional<Integer> deliveryPrice, Optional<DeliveryInfo> deliveryInfo, TransactionInfoStatus status) {
         this.itemId = itemId;
         this.creator = creator;
         this.winner = winner;
diff --git a/transaction-api/src/main/java/com/example/auction/transaction/api/TransactionService.java b/transaction-api/src/main/java/com/example/auction/transaction/api/TransactionService.java
@@ -30,7 +30,7 @@ public interface TransactionService extends Service {
 
     ServiceCall<DeliveryInfo, Done> submitDeliveryDetails(UUID itemId);
 
-    //ServiceCall<Integer, Done> setDeliveryPrice(UUID itemId);
+    ServiceCall<Integer, Done> setDeliveryPrice(UUID itemId);
 
     //ServiceCall<PaymentInfo, Done> submitPaymentDetails(UUID itemId);
 
@@ -53,7 +53,8 @@ ServiceCall<NotUsed, PaginatedSequence<TransactionSummary>> getTransactionsForUs
     @Override
     default Descriptor descriptor() {
         return named("transaction").withCalls(
-                pathCall("/api/transaction/:id", this::submitDeliveryDetails),
+                pathCall("/api/transaction/:id/deliverydetails", this::submitDeliveryDetails),
+                pathCall("/api/transaction/:id/deliveryprice", this::setDeliveryPrice),
                 pathCall("/api/transaction/:id", this::getTransaction),
                 pathCall("/api/transaction?status&pageNo&pageSize", this::getTransactionsForUser)
         ).withPathParamSerializer(
diff --git a/transaction-impl/src/main/java/com/example/auction/transaction/impl/Transaction.java b/transaction-impl/src/main/java/com/example/auction/transaction/impl/Transaction.java
@@ -16,11 +16,11 @@ public class Transaction implements Jsonable {
     private final UUID winner;
     private final ItemData itemData;
     private final int itemPrice;
-    private final int deliveryPrice;
+    private final Optional<Integer> deliveryPrice;
     private final Optional<DeliveryData> deliveryData;
 
     @JsonCreator
-    private Transaction(UUID itemId, UUID creator, UUID winner, ItemData itemData, int itemPrice, int deliveryPrice, Optional<DeliveryData> deliveryData) {
+    private Transaction(UUID itemId, UUID creator, UUID winner, ItemData itemData, int itemPrice, Optional<Integer> deliveryPrice, Optional<DeliveryData> deliveryData) {
         this.itemId = itemId;
         this.creator = creator;
         this.winner = winner;
@@ -36,11 +36,15 @@ public Transaction(UUID itemId, UUID creator, UUID winner, ItemData itemData, in
         this.winner = winner;
         this.itemData = itemData;
         this.itemPrice = itemPrice;
-        this.deliveryPrice = 0;
+        this.deliveryPrice = Optional.empty();
         this.deliveryData = Optional.empty();
     }
 
-    public Transaction withDeliveryData(DeliveryData deliveryData){
+    public Transaction withDeliveryData(DeliveryData deliveryData) {
         return new Transaction(itemId, creator, winner, itemData, itemPrice, deliveryPrice, Optional.of(deliveryData));
     }
+
+    public Transaction withDeliveryPrice(int deliveryPrice) {
+        return new Transaction(itemId, creator, winner, itemData, itemPrice, Optional.of(deliveryPrice), deliveryData);
+    }
 }
diff --git a/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionCommand.java b/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionCommand.java
@@ -36,6 +36,18 @@ public SubmitDeliveryDetails(UUID userId, DeliveryData deliveryData) {
         }
     }
 
+    @Value
+    final class SetDeliveryPrice implements TransactionCommand, ReplyType<Done> {
+        private final UUID userId;
+        private final int deliveryPrice;
+
+        @JsonCreator
+        public SetDeliveryPrice(UUID userId, int deliveryPrice) {
+            this.userId = userId;
+            this.deliveryPrice = deliveryPrice;
+        }
+    }
+
     @Value
     final class GetTransaction implements TransactionCommand, ReplyType<TransactionState> {
         private final UUID userId;
diff --git a/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionEntity.java b/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionEntity.java
@@ -69,6 +69,20 @@ private Behavior negotiatingDelivery(TransactionState state) {
                 state().updateDeliveryData(evt.getDeliveryData())
         );
 
+        builder.setCommandHandler(SetDeliveryPrice.class, (cmd, ctx) -> {
+            if(cmd.getUserId().equals(state().getTransaction().get().getCreator())) {
+                return ctx.thenPersist(new DeliveryPriceUpdated(entityUUID(), cmd.getDeliveryPrice()), (e) ->
+                        ctx.reply(Done.getInstance())
+                );
+            }
+            else
+                throw new Forbidden("Only the item creator can set the delivery price");
+        });
+
+        builder.setEventHandler(DeliveryPriceUpdated.class, evt ->
+                state().updateDeliveryPrice(evt.getDeliveryPrice())
+        );
+
         addGetTransactionHandler(builder);
 
         return builder.build();
diff --git a/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionEvent.java b/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionEvent.java
@@ -43,4 +43,16 @@ public DeliveryDetailsSubmitted(UUID itemId, DeliveryData deliveryData) {
             this.deliveryData = deliveryData;
         }
     }
+
+    @Value
+    final class DeliveryPriceUpdated implements TransactionEvent {
+        private final UUID itemId;
+        private final int deliveryPrice;
+
+        @JsonCreator
+        public DeliveryPriceUpdated(UUID itemId, int deliveryPrice) {
+            this.itemId = itemId;
+            this.deliveryPrice = deliveryPrice;
+        }
+    }
 }
diff --git a/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionServiceImpl.java b/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionServiceImpl.java
@@ -62,6 +62,14 @@ public ServiceCall<DeliveryInfo, Done> submitDeliveryDetails(UUID itemId) {
         });
     }
 
+    @Override
+    public ServiceCall<Integer, Done> setDeliveryPrice(UUID itemId) {
+        return authenticated(userId -> deliveryPrice -> {
+            SetDeliveryPrice setDeliveryPrice = new SetDeliveryPrice(userId, deliveryPrice);
+            return entityRef(itemId).ask(setDeliveryPrice);
+        });
+    }
+
     @Override
     public ServiceCall<NotUsed, TransactionInfo> getTransaction(UUID itemId) {
         return authenticated(userId -> request -> {
diff --git a/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionState.java b/transaction-impl/src/main/java/com/example/auction/transaction/impl/TransactionState.java
@@ -34,6 +34,10 @@ public TransactionState updateDeliveryData(DeliveryData deliveryData) {
         return update(i -> i.withDeliveryData(deliveryData), status);
     }
 
+    public TransactionState updateDeliveryPrice(int deliveryPrice) {
+        return update(i -> i.withDeliveryPrice(deliveryPrice), status);
+    }
+
     private TransactionState update(Function<Transaction, Transaction> updateFunction, TransactionStatus status) {
         assert transaction.isPresent();
         return new TransactionState(transaction.map(updateFunction), status);
diff --git a/transaction-impl/src/test/java/com/example/auction/transaction/impl/TransactionEntityTest.java b/transaction-impl/src/test/java/com/example/auction/transaction/impl/TransactionEntityTest.java
@@ -40,11 +40,13 @@ public static void shutdownActorSystem() {
     private final UUID winner = UUID.randomUUID();
     private final ItemData itemData = new ItemData("title", "desc", "EUR", 1, 10, Duration.ofMinutes(10), Optional.empty());
     private final DeliveryData deliveryData = new DeliveryData("Addr1", "Addr2", "City", "State", 27, "Country");
+    private final int deliveryPrice = 500;
 
     private final Transaction transaction  = new Transaction(itemId, creator, winner, itemData, 2000);
 
     private final StartTransaction startTransaction = new StartTransaction(transaction);
     private final SubmitDeliveryDetails submitDeliveryDetails = new SubmitDeliveryDetails(winner, deliveryData);
+    private final SetDeliveryPrice setDeliveryPrice = new SetDeliveryPrice(creator, deliveryPrice);
     private final GetTransaction getTransaction = new GetTransaction(creator);
 
     @Before
@@ -93,11 +95,28 @@ public void shouldAllowSeeTransactionByItemCreator() {
     }
 
     @Test(expected = Forbidden.class)
-    public void shouldForbidSeeTransactionByNonWinnerNonCreator() throws Throwable{
+    public void shouldForbidSeeTransactionByNonWinnerNonCreator() throws Throwable {
         driver.run(startTransaction);
         UUID hacker = UUID.randomUUID();
         GetTransaction invalid = new GetTransaction(hacker);
         driver.run(invalid);
     }
+
+    @Test
+    public void shouldEmitEventWhenSettingDeliveryPrice() {
+        driver.run(startTransaction);
+        Outcome<TransactionEvent, TransactionState> outcome = driver.run(setDeliveryPrice);
+        assertThat(outcome.state().getStatus(), equalTo(TransactionStatus.NEGOTIATING_DELIVERY));
+        assertThat(outcome.state().getTransaction().get().getDeliveryPrice().get(), equalTo(deliveryPrice));
+        assertThat(outcome.events(), hasItem(new DeliveryPriceUpdated(itemId, deliveryPrice)));
+    }
+
+    @Test(expected = Forbidden.class)
+    public void shouldForbidSettingDeliveryPriceByNonSeller() {
+        driver.run(startTransaction);
+        UUID hacker = UUID.randomUUID();
+        SetDeliveryPrice invalid = new SetDeliveryPrice(hacker, deliveryPrice);
+        driver.run(invalid);
+    }
 }
 
diff --git a/transaction-impl/src/test/java/com/example/auction/transaction/impl/TransactionServiceImplIntegrationTest.java b/transaction-impl/src/test/java/com/example/auction/transaction/impl/TransactionServiceImplIntegrationTest.java
@@ -65,10 +65,11 @@ public static void afterAll() {
     private final ItemEvent.AuctionFinished auctionFinished = new ItemEvent.AuctionFinished(itemId, item);
 
     private final DeliveryInfo deliveryInfo = new DeliveryInfo("ADDR1", "ADDR2", "CITY", "STATE", 27, "COUNTRY");
+    private final int deliveryPrice = 500;
 
-    private final TransactionInfo transactionInfoStarted = new TransactionInfo(itemId, creatorId, winnerId, itemData, item.getPrice(), 0, Optional.empty(), TransactionInfoStatus.NEGOTIATING_DELIVERY);
-    private final TransactionInfo transactionInfoWithDelivery = new TransactionInfo(itemId, creatorId, winnerId, itemData, item.getPrice(), 0, Optional.of(deliveryInfo), TransactionInfoStatus.NEGOTIATING_DELIVERY);
-
+    private final TransactionInfo transactionInfoStarted = new TransactionInfo(itemId, creatorId, winnerId, itemData, item.getPrice(), Optional.empty(), Optional.empty(), TransactionInfoStatus.NEGOTIATING_DELIVERY);
+    private final TransactionInfo transactionInfoWithDeliveryInfo = new TransactionInfo(itemId, creatorId, winnerId, itemData, item.getPrice(), Optional.empty(), Optional.of(deliveryInfo), TransactionInfoStatus.NEGOTIATING_DELIVERY);
+    private final TransactionInfo transactionInfoWithDeliveryPrice = new TransactionInfo(itemId, creatorId, winnerId, itemData, item.getPrice(), Optional.of(deliveryPrice), Optional.empty(), TransactionInfoStatus.NEGOTIATING_DELIVERY);
 
     @Test
     public void shouldCreateTransactionOnAuctionFinished() {
@@ -101,17 +102,19 @@ public void shouldSubmitDeliveryDetails() throws Throwable {
 
         eventually(new FiniteDuration(15, SECONDS), () -> {
             TransactionInfo retrievedTransaction = retrieveTransaction(itemId, creatorId);
-            assertEquals(retrievedTransaction, transactionInfoWithDelivery);
+            assertEquals(retrievedTransaction, transactionInfoWithDeliveryInfo);
         });
     }
 
-    private TransactionInfo retrieveTransaction(UUID itemId, UUID creatorId) {
-        return Await.result(
-                transactionService
-                        .getTransaction(itemId)
-                        .handleRequestHeader(authenticate(creatorId))
-                        .invoke()
-        );
+    @Test
+    public void shouldSetDeliveryPrice() throws Throwable {
+        itemProducerStub.send(auctionFinished);
+        setDeliveryPrice(itemId, creatorId, deliveryPrice);
+
+        eventually(new FiniteDuration(15, SECONDS), () -> {
+            TransactionInfo retrievedTransaction = retrieveTransaction(itemId, creatorId);
+            assertEquals(retrievedTransaction, transactionInfoWithDeliveryPrice);
+        });
     }
 
     private Done submitDeliveryDetails(UUID itemId, UUID winnerId, DeliveryInfo deliveryInfo){
@@ -122,6 +125,23 @@ private Done submitDeliveryDetails(UUID itemId, UUID winnerId, DeliveryInfo deli
         );
     }
 
+    private Done setDeliveryPrice(UUID itemId, UUID creatorId, int deliveryPrice){
+        return Await.result(
+                transactionService.setDeliveryPrice(itemId)
+                .handleRequestHeader(authenticate(creatorId))
+                .invoke(deliveryPrice)
+        );
+    }
+
+    private TransactionInfo retrieveTransaction(UUID itemId, UUID creatorId) {
+        return Await.result(
+                transactionService
+                        .getTransaction(itemId)
+                        .handleRequestHeader(authenticate(creatorId))
+                        .invoke()
+        );
+    }
+
     private static class ItemStub implements ItemService {
 
         @Inject
diff --git a/web-gateway/src/main/java/controllers/DeliveryPriceForm.java b/web-gateway/src/main/java/controllers/DeliveryPriceForm.java
@@ -0,0 +1,10 @@
+package controllers;
+
+import lombok.Data;
+import play.data.validation.Constraints;
+
+@Data
+public class DeliveryPriceForm {
+    @Constraints.Required
+    private int deliveryPrice;
+}
diff --git a/web-gateway/src/main/java/controllers/TransactionController.java b/web-gateway/src/main/java/controllers/TransactionController.java
@@ -1,11 +1,9 @@
 package controllers;
 
-import com.example.auction.item.api.ItemStatus;
 import com.example.auction.pagination.PaginatedSequence;
 import com.example.auction.transaction.api.*;
 import com.example.auction.user.api.User;
 import com.example.auction.user.api.UserService;
-import com.lightbend.lagom.javadsl.api.transport.TransportException;
 import com.typesafe.config.Config;
 import play.data.Form;
 import play.data.FormFactory;
@@ -96,7 +94,7 @@ public CompletionStage<Result> getTransaction(String id) {
                             Currency currency = Currency.valueOf(transaction.getItemData().getCurrencyId());
                             return ok(views.html.transaction.render(showInlineInstruction, Optional.of(transaction), seller, winner, Optional.of(currency), Optional.empty(), nav));
                         } else {
-                            String msg = ((TransportException) exception.getCause()).exceptionMessage().detail();
+                            String msg = exception.getCause().getMessage();
                             return ok(views.html.transaction.render(showInlineInstruction, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(msg), nav));
                         }
                     });
@@ -132,7 +130,7 @@ public CompletionStage<Result> submitDeliveryDetailsForm(String id) {
                                                     nav)
                                     );
                                 } else {
-                                    String msg = ((TransportException) exception.getCause()).exceptionMessage().detail();
+                                    String msg = exception.getCause().getMessage();
                                     return ok(views.html.deliveryDetails.render(showInlineInstruction, false, itemId, formFactory.form(DeliveryDetailsForm.class), TransactionInfoStatus.NEGOTIATING_DELIVERY, Optional.of(msg), nav));
                                 }
                             });
@@ -162,7 +160,7 @@ public CompletionStage<Result> submitDeliveryDetails(String id, String transacti
                             if (exception == null) {
                                 return CompletableFuture.completedFuture(redirect(routes.TransactionController.getTransaction(id)));
                             } else {
-                                String msg = ((TransportException) exception.getCause()).exceptionMessage().detail();
+                                String msg = exception.getCause().getMessage();
                                 return loadNav(user).thenApplyAsync(nav ->
                                                 ok(views.html.deliveryDetails.render(showInlineInstruction, isBuyer, itemId, form, status, Optional.of(msg), nav)),
                                         ec.current());
@@ -182,4 +180,66 @@ private DeliveryInfo fromForm(DeliveryDetailsForm deliveryForm) {
                 deliveryForm.getCountry()
         );
     }
+
+    public CompletionStage<Result> setDeliveryPriceForm(String id) {
+        return requireUser(ctx(), user ->
+                loadNav(user).thenComposeAsync(nav -> {
+                            UUID itemId = UUID.fromString(id);
+                            CompletionStage<TransactionInfo> transactionFuture = transactionService.getTransaction(itemId).handleRequestHeader(authenticate(user)).invoke();
+                            return transactionFuture.handle((transaction, exception) -> {
+                                if (exception == null) {
+                                    DeliveryPriceForm form = new DeliveryPriceForm();
+                                    Optional<Integer> maybeDeliveryPrice = transaction.getDeliveryPrice();
+                                    if (maybeDeliveryPrice.isPresent())
+                                        form.setDeliveryPrice(maybeDeliveryPrice.get());
+                                    return ok(
+                                            views.html.deliveryPrice.render(
+                                                    showInlineInstruction,
+                                                    transaction.getCreator().equals(user),
+                                                    itemId,
+                                                    formFactory.form(DeliveryPriceForm.class).fill(form),
+                                                    transaction.getStatus(),
+                                                    Optional.empty(),
+                                                    nav)
+                                    );
+                                } else {
+                                    String msg = exception.getCause().getMessage();
+                                    return ok(views.html.deliveryPrice.render(showInlineInstruction, false, itemId, formFactory.form(DeliveryPriceForm.class), TransactionInfoStatus.NEGOTIATING_DELIVERY, Optional.of(msg), nav));
+                                }
+                            });
+                        },
+                        ec.current())
+        );
+    }
+
+    public CompletionStage<Result> setDeliveryPrice(String id, String transactionStatus, boolean isSeller) {
+        Http.Context ctx = ctx();
+        return requireUser(ctx(), user -> {
+
+            Form<DeliveryPriceForm> form = formFactory.form(DeliveryPriceForm.class).bindFromRequest(ctx.request());
+            UUID itemId = UUID.fromString(id);
+            TransactionInfoStatus status = TransactionInfoStatus.valueOf(transactionStatus);
+
+            if (form.hasErrors()) {
+                return loadNav(user).thenApplyAsync(nav ->
+                                ok(views.html.deliveryPrice.render(showInlineInstruction, isSeller, itemId, form, status, Optional.empty(), nav)),
+                        ec.current()
+                );
+            } else {
+                return transactionService.setDeliveryPrice(itemId)
+                        .handleRequestHeader(authenticate(user))
+                        .invoke(form.get().getDeliveryPrice())
+                        .handle((done, exception) -> {
+                            if (exception == null) {
+                                return CompletableFuture.completedFuture(redirect(routes.TransactionController.getTransaction(id)));
+                            } else {
+                                String msg = exception.getCause().getMessage();
+                                return loadNav(user).thenApplyAsync(nav ->
+                                                ok(views.html.deliveryPrice.render(showInlineInstruction, isSeller, itemId, form, status, Optional.of(msg), nav)),
+                                        ec.current());
+                            }
+                        }).thenComposeAsync(x -> x, ec.current());
+            }
+        });
+    }
 }
diff --git a/web-gateway/src/main/resources/messages b/web-gateway/src/main/resources/messages
diff --git a/web-gateway/src/main/resources/routes b/web-gateway/src/main/resources/routes
diff --git a/web-gateway/src/main/twirl/views/deliveryDetails.scala.html b/web-gateway/src/main/twirl/views/deliveryDetails.scala.html
diff --git a/web-gateway/src/main/twirl/views/deliveryPrice.scala.html b/web-gateway/src/main/twirl/views/deliveryPrice.scala.html
diff --git a/web-gateway/src/main/twirl/views/myTransactions.scala.html b/web-gateway/src/main/twirl/views/myTransactions.scala.html
diff --git a/web-gateway/src/main/twirl/views/transaction.scala.html b/web-gateway/src/main/twirl/views/transaction.scala.html

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,16 @@ public DeliveryDetailsSubmitted(UUID itemId, DeliveryData deliveryData) {`
`43`	`43`	`this.deliveryData = deliveryData;`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ @Value`
	`48`	`+ final class DeliveryPriceUpdated implements TransactionEvent {`
	`49`	`+ private final UUID itemId;`
	`50`	`+ private final int deliveryPrice;`
	`51`	`+`
	`52`	`+ @JsonCreator`
	`53`	`+ public DeliveryPriceUpdated(UUID itemId, int deliveryPrice) {`
	`54`	`+ this.itemId = itemId;`
	`55`	`+ this.deliveryPrice = deliveryPrice;`
	`56`	`+ }`
	`57`	`+ }`
`46`	`58`	`}`