Did some work on the price for executed orders that were partially ex…

…ecuted first
AxonFramework · Jan 27, 2012 · 6d52096 · 6d52096
1 parent be6482f
commit 6d52096
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/app/src/main/java/org/axonframework/samples/trader/app/command/trading/Transaction.java b/app/src/main/java/org/axonframework/samples/trader/app/command/trading/Transaction.java
@@ -133,12 +133,12 @@ public void onTransactionCancelled(SellTransactionCancelledEvent event) {
 
     @EventHandler
     public void onTransactionExecuted(BuyTransactionExecutedEvent event) {
-        this.amountOfExecutedItems = event.getAmountOfItems();
+        this.amountOfExecutedItems = this.amountOfItems;
     }
 
     @EventHandler
     public void onTransactionExecuted(SellTransactionExecutedEvent event) {
-        this.amountOfExecutedItems = event.getAmountOfItems();
+        this.amountOfExecutedItems = this.amountOfItems;
     }
 
     @EventHandler

diff --git a/...rc/main/java/org/axonframework/samples/trader/app/query/transaction/TransactionEntry.java b/...rc/main/java/org/axonframework/samples/trader/app/query/transaction/TransactionEntry.java
@@ -38,7 +38,7 @@ public long getAmountOfExecutedItems() {
         return amountOfExecutedItems;
     }
 
-    public void setAmountOfExecutedItems(int amountOfExecutedItems) {
+    public void setAmountOfExecutedItems(long amountOfExecutedItems) {
         this.amountOfExecutedItems = amountOfExecutedItems;
     }
 

diff --git a/...java/org/axonframework/samples/trader/app/query/transaction/TransactionEventListener.java b/...java/org/axonframework/samples/trader/app/query/transaction/TransactionEventListener.java
@@ -88,17 +88,27 @@ public void handleEvent(SellTransactionPartiallyExecutedEvent event) {
 
     private void partiallyExecuteTransaction(AbstractTransactionPartiallyExecutedEvent event) {
         TransactionEntry transactionEntry = transactionQueryRepository.findOne(event.getTransactionIdentifier().asString());
+
+        long value = transactionEntry.getAmountOfExecutedItems() * transactionEntry.getPricePerItem();
+        long additionalValue = event.getAmountOfExecutedItems() * event.getItemPrice();
+        long newPrice = (value + additionalValue) / event.getTotalOfExecutedItems();
+
         transactionEntry.setState(PARTIALLYEXECUTED);
-        transactionEntry.setAmountOfExecutedItems((int) event.getTotalOfExecutedItems());
+        transactionEntry.setAmountOfExecutedItems(event.getTotalOfExecutedItems());
-        transactionEntry.setPricePerItem(event.getItemPrice());
+        transactionEntry.setPricePerItem(newPrice);
         transactionQueryRepository.save(transactionEntry);
     }
 
     private void executeTransaction(AbstractTransactionExecutedEvent event) {
         TransactionEntry transactionEntry = transactionQueryRepository.findOne(event.getTransactionIdentifier().asString());
+
+        long value = transactionEntry.getAmountOfExecutedItems() * transactionEntry.getPricePerItem();
+        long additionalValue = event.getAmountOfItems() * event.getItemPrice();
+        long newPrice = (value + additionalValue) / transactionEntry.getAmountOfItems();
+
         transactionEntry.setState(EXECUTED);
-        transactionEntry.setAmountOfExecutedItems((int) event.getAmountOfItems());
+        transactionEntry.setAmountOfExecutedItems(transactionEntry.getAmountOfItems());
-        transactionEntry.setPricePerItem(event.getItemPrice());
+        transactionEntry.setPricePerItem(newPrice);
         transactionQueryRepository.save(transactionEntry);
     }