fixed bug implementation

Keith-sys · Feb 8, 2023 · 4a235ed · 4a235ed
1 parent da18287
commit 4a235ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/main/java/org/keith/core/LoanInput.java b/src/main/java/org/keith/core/LoanInput.java
@@ -7,30 +7,38 @@ public class LoanInput{
                     paymentAmount,
                     grossIncome;
     private Double interest;
+    private boolean isRunningterms  = true;
     SingletonScanner singletonScanner = SingletonScanner.getInstance();
     Scanner scanner = singletonScanner.getScanner();
 
-    // Check Terms based on the type of loan
+//     Check Terms based on the type of loan
     private void checkTerms(Integer maxTerms){
-        while(true) {
+        while(isRunningterms) {
             if (mustBeLessThanMaxTerms(maxTerms)) {
                 paymentAmount = getPaymentAmount();
-            } else {
+                isRunningterms = false;
+            } else if(ifGreaterThanMaxTerms(maxTerms)){
                 System.out.println("Maximum allowed term is " + maxTerms + " years");
-                getTermsAmount();
+                terms = getTermsAmount();
             }
-            break;
+//                break;
         }
     }
 
     private Boolean mustBeLessThanMaxTerms(Integer maxTerms){
         return terms <= maxTerms;
     }
 
+    private Boolean ifGreaterThanMaxTerms(Integer maxTerms){
+        return terms >= maxTerms;
+    }
+
     public void getLoanInfo(Integer maxTerms){
         principle = getPrincipleAmount();
         terms = getTermsAmount();
         checkTerms(maxTerms);
+
+
         interest = getInterest();
         grossIncome = getGrossIncome();
         Amortization amortization = new Amortization(principle,
@@ -69,4 +77,4 @@ private Integer getGrossIncome(){
         return Integer.parseInt(scanner.nextLine());
 //        scanner.nextLine();
     }
-}
+}
diff --git a/src/main/java/org/keith/menu/Menu.java b/src/main/java/org/keith/menu/Menu.java
@@ -42,7 +42,7 @@ public void LOGO() {
     LoanInput mi = new LoanInput();
 
     public void getMenuInput(){
-        MAIN_LOOP:while(isRunning){
+        while(isRunning){
             try {
                 getInput();
 
@@ -53,16 +53,14 @@ public void getMenuInput(){
 
                 // Determine the input regardless of it's written in upper case or lower case
                 MenuCommand mc = checkCommand(input.toUpperCase());
-
                 switch (mc) {
                     case MORTGAGE -> mi.getLoanInfo(maxMortgageTerms);
                     case CAR -> mi.getLoanInfo(maxVehicleTerms);
                     case HELP -> showMenu();
-                    case EXIT -> {
-                        break MAIN_LOOP;
-                    }
+                    case EXIT -> isRunning = false;
                     default -> getInput();
                 }
+
             } catch(Exception e){
                 System.out.println("Error: " + e.getMessage() + " caused by " + e.getCause());
             }