From 5c86b15ad5c0b277a1c4010c49680f19f6e30d84 Mon Sep 17 00:00:00 2001 From: PawelSapula Date: Mon, 25 May 2026 15:47:42 +0200 Subject: [PATCH] refactor: Model classes based on test results. --- src/main/java/edu/ntnu/idi/idatt/model/market/Newspaper.java | 2 -- src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java | 4 ++-- .../java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java | 3 --- .../idi/idatt/view/components/elements/StockComponent.java | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/ntnu/idi/idatt/model/market/Newspaper.java b/src/main/java/edu/ntnu/idi/idatt/model/market/Newspaper.java index 95681cf..a8ad9a7 100644 --- a/src/main/java/edu/ntnu/idi/idatt/model/market/Newspaper.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/market/Newspaper.java @@ -6,8 +6,6 @@ import edu.ntnu.idi.idatt.model.enums.NewspaperEnum; -//TODO: junit - /** * Newspaper class * diff --git a/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java b/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java index 92fddbd..077174c 100644 --- a/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java @@ -123,8 +123,8 @@ public BigDecimal getLatestPriceChangePercent() { return BigDecimal.ZERO; } - return (getLatestPriceChange().divide(prices.get(prices.size() - 2), 2, RoundingMode.HALF_UP)) - .multiply(new BigDecimal("100")); + return (getLatestPriceChange().multiply(new BigDecimal("100")) + .divide(prices.get(prices.size() - 2), 2, RoundingMode.HALF_UP)); } /** diff --git a/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java index 1d37e10..9ba3bdc 100644 --- a/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java @@ -142,9 +142,6 @@ public BigDecimal getChangeFromStock() { BigDecimal costTotal = getShares().stream().map(s -> s.getTotalPurchasePrice()) .reduce(BigDecimal.ZERO, BigDecimal::add); - if (costTotal.compareTo(BigDecimal.ZERO) <= 0) - return BigDecimal.ZERO; - return profitTotal.divide(costTotal, 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java index 4298b60..4bc55a9 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java @@ -54,7 +54,7 @@ public StockComponent(Stock stock) { CssUtils.apply(title, CssUtils.BIG_TEXT_32); labels.forEach(l -> CssUtils.apply(l, CssUtils.MED_TEXT_16)); - String color = CssUtils.generateValueColors(stock.getLatestPriceChange().doubleValue()); + String color = CssUtils.generateValueColors(stock.getLatestPriceChange()); CssUtils.apply(changeValue, color); CssUtils.apply(changeValuePercent, color);