refactor(Portfolio): playerNetValue -> getNetWorth. Fix logic.

danieskj · Mar 25, 2026 · 4c6750c · 4c6750c
1 parent f1247de
commit 4c6750c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import edu.ntnu.idi.idatt.calculator.SaleCalculator;
+
 /**
  * Portfolio class
  *
@@ -70,15 +72,14 @@ public boolean contains(Share share) {
   }
 
   /**
-   * Method for getting the net value of the player.
+   * Method for getting the net value of the portfolio..
    *
-   * @return - Net value of the players shares.
+   * @return - Net value of the portfolio.
    */
-  public BigDecimal playerNetValue(){
-    BigDecimal netValue = shares.stream()
-            .map(Share-> Share.getPurchasePrice().multiply(Share.getQuantity()))
-            .reduce(BigDecimal.ZERO, BigDecimal::add);
-    return netValue;
+  public BigDecimal getNetWorth() {
+    return shares.stream()
+        .map(s -> new SaleCalculator(s).calculateTotal())
+        .reduce(BigDecimal.ZERO, BigDecimal::add);
   }
 
 }
diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java b/src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java
@@ -11,6 +11,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import edu.ntnu.idi.idatt.calculator.SaleCalculator;
+
 public class PortfolioTest {
 
   private Stock stock;
@@ -82,12 +84,13 @@ void NTremoveShare() {
    * Positive test for finding net value of the players shares.
    */
   @Test
-  void PTplayerNetValue(){
+  void PTgetNetWorth() {
     Share share1 = new Share(stock, new BigDecimal("1"), new BigDecimal("135.8"));
     Share share2 = new Share(stock, new BigDecimal("2"), new BigDecimal("254"));
     portfolio.addShare(share1);
     portfolio.addShare(share2);
-    assertEquals(new BigDecimal("643.8"), portfolio.playerNetValue());
+    assertEquals(new SaleCalculator(share1).calculateTotal().add(new SaleCalculator(share2).calculateTotal()),
+        portfolio.getNetWorth());
   }
 
 }