Made back instant

src/main/java/data_access/FileUserDataAccessObject.java

@@ -30,7 +30,6 @@ public class FileUserDataAccessObject implements BuyDataAccessInterface, SellDat
 
     public FileUserDataAccessObject(String jsonPath, UserFactory userFactory) throws IOException {
         jsonFile = new File(jsonPath);
-        System.out.println(jsonFile.length());
         if (jsonFile.length() == 0) {
             user = new CommonUser();
             save();

src/main/java/interface_adapters/Dashboard/DashboardController.java

@@ -1,5 +1,6 @@
 package interface_adapters.Dashboard;
 import use_cases.Dashboard.DashboardInputBoundary;
+import use_cases.Dashboard.DashboardInputData;
 
 public class DashboardController {
     final private DashboardInputBoundary dashboardInteractor;
@@ -9,6 +10,9 @@ public DashboardController(DashboardInputBoundary dashboardInteractor) {
     }
 
     public void execute() {
-        dashboardInteractor.execute();
+        dashboardInteractor.execute(new DashboardInputData());
+    }
+    public void execute(Boolean forceRefresh) {
+        dashboardInteractor.execute(new DashboardInputData(forceRefresh));
     }
 }

src/main/java/interface_adapters/GetTransactionHistory/GetTransactionHistoryPresenter.java

@@ -29,7 +29,6 @@ public void prepareSuccessView(GetTransactionHistoryOutputData getTransactionHis
         GetTransactionHistoryState state = getTransactionHistoryViewModel.getState();
 
         state.setUserRecord(getTransactionHistoryOutputData.getUserRecord());
-        System.out.println(state.getUserRecord().toString());
         getTransactionHistoryViewModel.setState(state);
 
         viewManagerModel.setActiveView(getTransactionHistoryViewModel.getViewName());

src/main/java/use_cases/BaseStockInteractor.java

@@ -14,13 +14,11 @@ public BaseStockInteractor(APIAccessInterface apiAccessInterface) {
         this.apiAccessInterface = apiAccessInterface;
     }
 
-    protected TransactionHistory initHistory(User user, String ticker,
-                                             Double amount, Double boughtAt, Transaction transaction) {
+    protected TransactionHistory initHistory(String ticker, Double boughtAt) {
         CompanyInformation companyInformation = apiAccessInterface.getCompanyProfile(ticker);
         Stock newStock = new Stock(boughtAt, companyInformation.getName(), ticker);
 
         List<Transaction> transactions = new ArrayList<>();
-        transactions.add(transaction);
 
         return new TransactionHistory(newStock, transactions);
     }
@@ -33,10 +31,10 @@ protected void updatePortfolio(User user, String ticker, Double amount) {
     }
 
     protected void addToHistory(HashMap<String, TransactionHistory> userHistory, String ticker,
-                                User user, Double amount, Double currentPrice, Transaction transaction) {
+                                Double currentPrice, Transaction transaction) {
         TransactionHistory transactionHistory;
         if (!userHistory.containsKey(ticker)) {
-            transactionHistory = initHistory(user, ticker, amount, currentPrice, transaction);
+            transactionHistory = initHistory(ticker, currentPrice);
         } else {
             transactionHistory = userHistory.get(ticker);
         }

src/main/java/use_cases/Buy/BuyInteractor.java

@@ -78,11 +78,10 @@ public void execute(BuyInputData buyInputData) {
         super.addToHistory(
                 userHistory,
                 ticker,
-                user,
-                amount,
                 currentPrice,
                 transaction
         );
+
         userDataAccessObject.save();
 
         BuyOutputData result = new BuyOutputData(

src/main/java/use_cases/Dashboard/DashboardInputBoundary.java

@@ -1,5 +1,5 @@
 package use_cases.Dashboard;
 
 public interface DashboardInputBoundary {
-    void execute();
+    void execute(DashboardInputData dashboardInputData);
 }

src/main/java/use_cases/Dashboard/DashboardInputData.java

@@ -0,0 +1,20 @@
+package use_cases.Dashboard;
+
+public class DashboardInputData {
+    private Boolean aoiRefresh;
+
+    public DashboardInputData(Boolean aoiRefresh) {
+        this.aoiRefresh = aoiRefresh;
+    }
+    public DashboardInputData() {
+        this.aoiRefresh = false;
+    }
+
+    public Boolean getAoiRefresh() {
+        return aoiRefresh;
+    }
+
+    public void setAoiRefresh(Boolean aoiRefresh) {
+        this.aoiRefresh = aoiRefresh;
+    }
+}

src/main/java/use_cases/Dashboard/DashboardInteractor.java

@@ -29,7 +29,7 @@ public DashboardInteractor(
     }
 
     @Override
-    public void execute() {
+    public void execute(DashboardInputData dashboardInputData) {
         User user = userDataAccessObject.get();
 
         HashMap<String, Double> portfolio = user.getPortfolio();
@@ -45,7 +45,11 @@ public void execute() {
             String key = entry.getKey();
             Double value = entry.getValue();
 
-            prices.put(key, driverAPI.getCurrentPrice(key).getPrice());
+            if (dashboardInputData.getAoiRefresh()) {
+                prices.put(key, driverAPI.getCurrentPrice(key).getPrice());
+            } else {
+                prices.put(key, history.get(key).getStock().getLastSeenPrice());
+            }
             totalAssets += value * prices.get(key);
 
             PortfolioInformation emptyInfo = new PortfolioInformation();
@@ -101,4 +105,4 @@ public void execute() {
         DashboardOutputData result = new DashboardOutputData(userStats, portfolioInformations);
         dashboardPresenter.prepareSuccessView(result);
     }
-}
+}

src/main/java/use_cases/GetTransactionHistory/GetTransactionHistoryInteractor.java

@@ -1,11 +1,12 @@
 package use_cases.GetTransactionHistory;
 
-import entities.*;
+import entities.Transaction;
+import entities.TransactionHistory;
+import entities.User;
 
-import java.time.LocalDate;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class GetTransactionHistoryInteractor implements GetTransactionHistoryInputBoundary{
@@ -38,44 +39,32 @@ public void execute() {
             listOfTransactions.add(historyTransactionsForStock.getTransactions());
         }
 
-
         HashMap<String, List<List<String>>> userRecord = new HashMap<>();
-        for (String stock: stocks) {
+        for (int i = 0; i < stocks.size(); i ++) {
             // List of Transactions of a Particular Stock (List of Transaction)
             List<List<String>> listOfTransactionFacts = new ArrayList<>();
 
-            for (List<Transaction> transactions : listOfTransactions) {
-
-                for (Transaction transaction : transactions) {
-
-                    String type = transaction.getType().toString();
-                    String amount = transaction.getAmount().toString();
-                    String pricePurchasedAt = transaction.getPricePoint().getPrice().toString();
-                    String date = transaction.getPricePoint().getTimeStamp().toString();
-
-                    // List containing Transaction Facts
-                    List<String> Transaction = new ArrayList<>();
+            for (Transaction transaction : listOfTransactions.get(i)) {
 
-                    Transaction.add(type);
-                    Transaction.add(amount);
-                    Transaction.add(pricePurchasedAt);
-                    Transaction.add(date);
-                    listOfTransactionFacts.add(Transaction);
+                String type = transaction.getType().toString();
+                String amount = transaction.getAmount().toString();
+                String pricePurchasedAt = transaction.getPricePoint().getPrice().toString();
+                String date = transaction.getPricePoint().getTimeStamp().toString();
 
-                }
+                // List containing Transaction Facts
+                List<String> Transaction = new ArrayList<>();
 
+                Transaction.add(type);
+                Transaction.add(amount);
+                Transaction.add(pricePurchasedAt);
+                Transaction.add(date);
+                listOfTransactionFacts.add(Transaction);
             }
-            userRecord.put(stock, listOfTransactionFacts);
-
+            userRecord.put(stocks.get(i), listOfTransactionFacts);
         }
 
-
-
-
         GetTransactionHistoryOutputData transactionHistory = new GetTransactionHistoryOutputData(userRecord);
 
         getTransactionHistoryPresenter.prepareSuccessView(transactionHistory);
-
-
     }
 }

src/main/java/use_cases/ResetBalance/ResetBalanceInteractor.java

@@ -31,7 +31,7 @@ public void execute() {
 
         Transaction transaction = new TopupTransaction(curBalance + amountToAdd, new PricePoint(LocalDate.now(), curBalance));
 
-        super.addToHistory(userHistory, "Stonks App", user, curBalance + amountToAdd, curBalance, transaction);
+        super.addToHistory(userHistory, "Stonks App", curBalance, transaction);
         userDataAccessObject.save();
 
         ResetBalanceOutputData result = new ResetBalanceOutputData(curBalance + amountToAdd);

src/main/java/use_cases/Sell/SellInteractor.java

@@ -63,8 +63,6 @@ public void execute(SellInputData sellInputData) {
             super.addToHistory(
                     userHistory,
                     ticker,
-                    user,
-                    amount,
                     currentPrice,
                     transaction
             );

src/main/java/view/DashboardView.java

@@ -1,18 +1,16 @@
 package view;
 
 // Imports for dashboard
+
+import interface_adapters.Buy.BuyViewModel;
 import interface_adapters.Dashboard.DashboardController;
 import interface_adapters.Dashboard.DashboardState;
 import interface_adapters.Dashboard.DashboardViewModel;
-import interface_adapters.ResetBalance.ResetBalanceController;
-import interface_adapters.ViewManagerModel;
-
-// Imports to allow dashboard to switch to other views
-import interface_adapters.Buy.BuyViewModel;
-import interface_adapters.Sell.SellViewModel;
 import interface_adapters.GetNews.GetNewsViewModel;
-import interface_adapters.ResetBalance.ResetBalanceViewModel;
 import interface_adapters.GetTransactionHistory.GetTransactionHistoryViewModel;
+import interface_adapters.ResetBalance.ResetBalanceController;
+import interface_adapters.Sell.SellViewModel;
+import interface_adapters.ViewManagerModel;
 
 import javax.swing.*;
 import java.awt.*;
@@ -88,8 +86,7 @@ public DashboardView(DashboardViewModel dashboardViewModel,
                 new ActionListener() {
                     public void actionPerformed(ActionEvent evt) {
                         if (evt.getSource().equals(refresh)) {
-                            DashboardState currentState = dashboardViewModel.getState();
-                            dashboardController.execute();
+                            dashboardController.execute(true);
                             dashboardViewModel.firePropertyChanged();
                         }
                     }

src/main/java/view/TransactionHistoryView.java

@@ -1,9 +1,5 @@
 package view;
 
-import drivers.TableModel;
-import interface_adapters.Buy.BuyController;
-import interface_adapters.Buy.BuyState;
-import interface_adapters.Buy.BuyViewModel;
 import interface_adapters.Dashboard.DashboardViewModel;
 import interface_adapters.GetTransactionHistory.GetTransactionHistoryController;
 import interface_adapters.GetTransactionHistory.GetTransactionHistoryState;
@@ -15,8 +11,6 @@
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.HashMap;