Persistent storage

src/main/java/edu/ntnu/idi/idatt/Launcher.java

@@ -1,6 +1,5 @@
 package edu.ntnu.idi.idatt;
 
-import edu.ntnu.idi.idatt.storage.CSVtoJSON;
 import edu.ntnu.idi.idatt.view.SceneManager;
 import edu.ntnu.idi.idatt.view.entry.StartController;
 import edu.ntnu.idi.idatt.view.entry.StartModel;
@@ -34,8 +33,6 @@ public void start(Stage stage) {
 
       SceneManager.init(stage, view.getInstance());
       stage.show();
-      CSVtoJSON ja = new CSVtoJSON();
-      ja.csvFile();
     }
 
   }

src/main/java/edu/ntnu/idi/idatt/model/Exchange.java

@@ -1,6 +1,5 @@
 package edu.ntnu.idi.idatt.model;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -10,7 +9,6 @@
 import edu.ntnu.idi.idatt.model.transaction.Purchase;
 import edu.ntnu.idi.idatt.model.transaction.Sale;
 import edu.ntnu.idi.idatt.model.transaction.Transaction;
-import edu.ntnu.idi.idatt.storage.ExchangeLoader;
 
 /**
  * Exchange class
@@ -22,29 +20,23 @@
  * </p>
  * 
  */
-public class Exchange extends ExchangeLoader {
+public class Exchange {
 
   private final String name;
   private int week;
   private HashMap<String, Stock> stockMap = new HashMap<>();
-  private Random random = new Random();
 
   /**
    * Constructor for Exchange class
    *
-   * @param name - Name of the current stock Exchange
-   * @param path - Path to .csv file.
+   * @param name   - Name of the current stock Exchange
+   * @param stocks - List of stocks for this exchange
    */
-  public Exchange(String name, String path) {
-    super(path);
+  public Exchange(String name, List<Stock> stocks) {
     this.name = name;
     this.week = 1;
 
-    try {
-      this.load().forEach(stock -> stockMap.put(stock.getSymbol(), stock));
-    } catch (IOException e) {
-      throw new IllegalArgumentException("Problem loading [" + name + "] exchange : " + e);
-    }
+    stocks.forEach(stock -> stockMap.put(stock.getSymbol(), stock));
 
   }
 
@@ -164,7 +156,8 @@ public List<Stock> getLosers(int limit) {
    * @see Transaction
    */
   public Transaction buy(String symbol, BigDecimal quantity, Player player) {
-    Share share = new Share(getStock(symbol), quantity, BigDecimal.valueOf(random.nextDouble()));
+    Stock stock = getStock(symbol);
+    Share share = new Share(stock, quantity, stock.getSalesPrice());
     Purchase purchase = new Purchase(share, this.week);
     purchase.commit(player);
     return player.getTransactionArchive().getPurchases(this.week).getLast();
@@ -201,16 +194,6 @@ public Transaction sell(Share share, Player player) {
    * @see Stock
    */
   public void advance() {
-    for (Stock stocks : stockMap.values()) {
-      stocks.addNewSalesPrice(BigDecimal.valueOf(random.nextDouble()));
-
-      // TODO: Move this to JavaFx on Window close?
-      try {
-        this.save(stockMap.values().stream().toList());
-      } catch (IOException e) {
-        throw new IllegalArgumentException("Problem loading [" + name + "] exchange : " + e);
-      }
-    }
   }
 
 }

src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java

@@ -91,7 +91,7 @@ public BigDecimal getLatestPriceChange() {
   }
 
   /**
-   * Getter for sale price
+   * Getter for current sale price
    *
    * @return - BigDecimal with current (newest in array) stock price.
    */

src/main/java/edu/ntnu/idi/idatt/session/UserSession.java

@@ -1,5 +1,6 @@
 package edu.ntnu.idi.idatt.session;
 
+import edu.ntnu.idi.idatt.model.Exchange;
 import edu.ntnu.idi.idatt.model.player.Player;
 
 public class UserSession {
@@ -19,6 +20,7 @@ public static UserSession getInstance() {
   }
 
   private Player player;
+  private Exchange exchange;
 
   public Player getPlayer() {
     return player;
@@ -28,4 +30,36 @@ public void setPlayer(Player player) {
     this.player = player;
   }
 
+  public Exchange getExchange() {
+    return exchange;
+  }
+
+  public void setExchange(Exchange exchange) {
+    this.exchange = exchange;
+  }
+
+  public SessionBundle getSession() {
+    return new SessionBundle(player, exchange);
+  }
+
+  public class SessionBundle {
+
+    private Player player;
+    private Exchange exchange;
+
+    public SessionBundle(Player player, Exchange exchange) {
+      this.player = player;
+      this.exchange = exchange;
+    }
+
+    public Player getPlayer() {
+      return player;
+    }
+
+    public Exchange getExchange() {
+      return exchange;
+    }
+
+  }
+
 }