Fix buy interactor issue 158 (#161)

* fix 158 * switched logic to extend fix to sell * fixed faulty logic with base stock interactor
awesominat · Nov 29, 2023 · f1f6a57 · f1f6a57
1 parent 70dddec
commit f1f6a57
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/entities/CommonUser.java b/src/main/java/entities/CommonUser.java
@@ -25,14 +25,6 @@ public Boolean isInPortfolio(String ticker) {
         return portfolio.containsKey(ticker);
     }
 
-
-        public void updatePortfolio(String ticker, Double amount) {
-        if (amount == 0) {
-            portfolio.remove(ticker);
-            return;
-        }
-        portfolio.put(ticker, amount);
-    }
     public Double getStockOwned(String ticker) {
         return portfolio.get(ticker);
     }

diff --git a/src/main/java/use_cases/BaseStockInteractor.java b/src/main/java/use_cases/BaseStockInteractor.java
@@ -23,8 +23,13 @@ protected TransactionHistory initHistory(String ticker, Double boughtAt) {
         return new TransactionHistory(newStock, transactions);
     }
     protected void updatePortfolio(User user, String ticker, Double amount) {
-        if (amount == 0 && user.isInPortfolio(ticker)) {
-            user.removeFromPortfolio(ticker);
+        if (user.isInPortfolio(ticker)) {
+            Double currentlyOwned = user.getStockOwned(ticker);
+            if (currentlyOwned + amount <= 0.0) {
+                user.removeFromPortfolio(ticker);
+            } else {
+                user.addToPortfolio(ticker, currentlyOwned + amount);
+            }
         } else {
             user.addToPortfolio(ticker, amount);
         }

diff --git a/src/main/java/use_cases/Buy/BuyInteractor.java b/src/main/java/use_cases/Buy/BuyInteractor.java
@@ -35,13 +35,13 @@ public void execute(BuyInputData buyInputData) {
             buyPresenter.prepareSuccessView(buyOutputData);
             return;
         }
+        HashMap<String, Double> portfolio = user.getPortfolio();
 
         if (amount == null) {
             try {
                 CompanyInformation companyInformation = driverAPI.getCompanyProfile(ticker);
                 Double currentPrice = driverAPI.getCurrentPrice(ticker).getPrice();
 
-                HashMap<String, Double> portfolio = user.getPortfolio();
                 Double currentlyHeld = 0.0;
                 if (portfolio.containsKey(ticker)) {
                     currentlyHeld = portfolio.get(ticker);

diff --git a/src/main/java/use_cases/Sell/SellInteractor.java b/src/main/java/use_cases/Sell/SellInteractor.java
@@ -43,7 +43,6 @@ public void execute(SellInputData sellInputData) {
             }
 
             Double currentPrice = driverAPI.getCurrentPrice(ticker).getPrice();
-            Double currentlyOwned = user.getStockOwned(ticker);
 
             user.addBalance(currentPrice * amount);
             HashMap<String, TransactionHistory> userHistory = user.getHistory();
@@ -57,7 +56,7 @@ public void execute(SellInputData sellInputData) {
             super.updatePortfolio(
                     user,
                     ticker,
-                    currentlyOwned - amount
+                    -amount
             );
 
             super.addToHistory(