Feat: Updated validation for Stock

Team-40-IDATT2003 · May 25, 2026 · 1c015f8 · 1c015f8
1 parent 706db1d
commit 1c015f8
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java
@@ -40,19 +40,26 @@ public final class Stock {
    * @param symbol     the unique stock symbol
    * @param company    the name of the company
    * @param salesPrice the initial sales price of the stock
+   *
+   * @throws IllegalArgumentException if parameters are null or invalid.
    */
   public Stock(final String symbol,
                final String company,
                final BigDecimal salesPrice) throws IllegalArgumentException {
     if (!Validator.VALID_STOCK_SYMBOL.isValid(symbol)) {
       throw new IllegalArgumentException(
               Validator.VALID_STOCK_SYMBOL.getErrorMessage());
-    } else {
-      this.symbol = symbol;
-      this.company = company;
-      this.fortune = 0;
-      prices.add(salesPrice);
     }
+    if (!Validator.NOT_EMPTY.isValid(company)) {
+      throw new IllegalArgumentException(Validator.NOT_EMPTY.getErrorMessage());
+    }
+    if (salesPrice == null || salesPrice.compareTo(BigDecimal.ZERO) <= 0) {
+      throw new IllegalArgumentException("Sales price of cannot be negative or zero!");
+    }
+    this.symbol = symbol;
+    this.company = company;
+    this.fortune = 0;
+    prices.add(salesPrice);
   }
 
   /**
@@ -109,11 +116,11 @@ public BigDecimal getSalesPrice() {
    */
   public void addNewSalesPrice(final BigDecimal price)
           throws IllegalArgumentException {
-    if (price != null && price.intValue() != 0) {
-      prices.add(price);
-    } else {
-      throw new IllegalArgumentException("Invalid price to add to stock: " + getSymbol());
+    if (price == null || price.compareTo(BigDecimal.ZERO) <= 0) {
+      throw new IllegalArgumentException("Invalid price to add to stock: "
+              + getSymbol());
     }
+    prices.add(price);
   }
 
   /**