Feat: Updated validation for Transaction

Team-40-IDATT2003 · May 25, 2026 · ada261d · ada261d
1 parent 1c015f8
commit ada261d
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Transaction.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Transaction.java
@@ -1,6 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
 
 /**
  * Transaction abstract class.
@@ -40,14 +41,22 @@ public abstract class Transaction {
 
   protected Transaction(final Share share, final int week,
                         final TransactionCalculator calculator)
-          throws IllegalArgumentException{
-    if (share == null || calculator == null) {
-      throw new IllegalArgumentException("Invalid stock or calculator!");
-    } else {
-      this.share = share;
-      this.week = week;
-      this.calculator = calculator;
+          throws IllegalArgumentException {
+    if (share == null
+        || calculator == null) {
+      throw new IllegalArgumentException(
+              "Invalid configuration for transaction!"
+      );
     }
+    if (!Validator.VALID_WEEK.isValid(Integer.toString(week))) {
+      throw new IllegalArgumentException(
+              Validator.VALID_WEEK.getErrorMessage()
+      );
+    }
+    this.share = share;
+    this.week = week;
+    this.calculator = calculator;
+
   }
 
   /**