Merge pull request #33 from einaskoi/per/saleCalculator

impliment logic in saleCalculator
einaskoi · Feb 23, 2026 · 81e675f · 81e675f
2 parents 9fa686b + 7149a96
commit 81e675f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Calculator/SaleCalculator.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Calculator/SaleCalculator.java
@@ -16,21 +16,25 @@ public SaleCalculator(Share share) {
 
   @Override
   public BigDecimal calculateGross() {
-    return null;
+    return salesPrice.multiply(quantity);
   }
 
   @Override
   public BigDecimal calculateCommission() {
-    return null;
+    BigDecimal commissionRate = new BigDecimal("0.01");
+    return calculateGross().multiply(commissionRate);
   }
 
   @Override
   public BigDecimal calculateTax() {
-    return null;
+    BigDecimal taxRate = new BigDecimal("0.22");
+    BigDecimal differencePrice = salesPrice.subtract(purchasePrice);
+    BigDecimal difference = differencePrice.multiply(quantity);
+    return difference.multiply(taxRate);
   }
 
   @Override
   public BigDecimal calculateTotal() {
-    return null;
+    return calculateGross().subtract(calculateCommission()).subtract(calculateTax());
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Exchange.java
@@ -1,5 +1,6 @@
 package edu.ntnu.idi.idatt2003.gruppe42.Model;
 
+import edu.ntnu.idi.idatt2003.gruppe42.Model.Calculator.SaleCalculator;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Purchase;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Sale;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Transaction;
@@ -64,11 +65,8 @@ public Transaction buy(String symbol, BigDecimal quantity, Player player) {
   }
 
   public Transaction sell(Share share, Player player) {
-    BigDecimal salesPrice = share.getStock().getSalesPrice();
-    BigDecimal quantity = share.getQuantity();
-
-    player.addMoney(salesPrice.multiply(quantity));
-
+    SaleCalculator saleCalculator = new SaleCalculator(share);
+    player.addMoney(saleCalculator.calculateTotal());
     return new Sale(share, week);
   }