From 1cb1e533c135f665e4963f837fc1ecad9fb75669 Mon Sep 17 00:00:00 2001 From: Kollier Martin Date: Wed, 6 Oct 2021 11:01:17 -0400 Subject: [PATCH 1/2] Update AccDAO.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fixed TransferFunds to actually fail --- .../Project 0/src/main/java/DAOs/AccDAO.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Projects/Project 0/src/main/java/DAOs/AccDAO.java b/Projects/Project 0/src/main/java/DAOs/AccDAO.java index 84d0739..8c2bef9 100644 --- a/Projects/Project 0/src/main/java/DAOs/AccDAO.java +++ b/Projects/Project 0/src/main/java/DAOs/AccDAO.java @@ -285,24 +285,25 @@ public boolean depositFunds(int amount, int accID) throws SQLException { */ public boolean transferFunds(int amount, int accID, int otherAccID){ boolean success = false; - withdrawFunds(amount, accID); - NumberFormat formatter = NumberFormat.getCurrencyInstance(Locale.US); - try { - sql = "UPDATE ACCOUNTS " + - "SET BALANCE = (BALANCE + ?) " + - "WHERE ACCOUNT_ID = ?"; - pstmt = conn.prepareStatement(sql); - pstmt.setInt(1, amount); - pstmt.setInt(2, otherAccID); - - if (pstmt.executeUpdate() != 0) { - System.out.println(formatter.format(amount) + " has been deposited to Account: " + otherAccID); - success = true; + if(withdrawFunds(amount, accID)){ + NumberFormat formatter = NumberFormat.getCurrencyInstance(Locale.US); + try { + sql = "UPDATE ACCOUNTS " + + "SET BALANCE = (BALANCE + ?) " + + "WHERE ACCOUNT_ID = ?"; + pstmt = conn.prepareStatement(sql); + pstmt.setInt(1, amount); + pstmt.setInt(2, otherAccID); + + if (pstmt.executeUpdate() != 0) { + System.out.println(formatter.format(amount) + " has been deposited to Account: " + otherAccID); + success = true; + } + } catch (SQLException e) { + System.out.println(NullAccount(otherAccID)); + e.printStackTrace(); + success = false; } - } catch (SQLException e) { - System.out.println(NullAccount(otherAccID)); - e.printStackTrace(); - success = false; } return success; From b05e6245c4393fec224a3cc3d1802176ac4c58a8 Mon Sep 17 00:00:00 2001 From: Kollier Martin Date: Wed, 6 Oct 2021 11:03:47 -0400 Subject: [PATCH 2/2] Update TransferFunds.java WithdrawFunds can not be negative now --- Projects/Project 0/src/main/java/Menu/TransferFunds.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Projects/Project 0/src/main/java/Menu/TransferFunds.java b/Projects/Project 0/src/main/java/Menu/TransferFunds.java index c6362e1..039c020 100644 --- a/Projects/Project 0/src/main/java/Menu/TransferFunds.java +++ b/Projects/Project 0/src/main/java/Menu/TransferFunds.java @@ -78,10 +78,13 @@ public void printMenu() throws SQLException { pm.navigate("class Menu.LoggedIn"); isTransferring = false; } + else{ + pm.navigate("class Menu.LoggedIn"); + isTransferring = false; + } } catch (SQLException e) { e.printStackTrace(); } } - pm.navigate("class Menu.LoggedIn"); } }