Merge branch 'staging' into 'master'

Staging

See merge request AdvProg/reguler-2022/student/kelas-b/2006527481-Muhammad-Athallah/tutorial-7!1

Author: salmanbruh

src/main/java/id/ac/ui/cs/advprog/tutorial7/service/PaymentService.java

@@ -1,8 +1,9 @@
 package id.ac.ui.cs.advprog.tutorial7.service;
 
-import id.ac.ui.cs.advprog.tutorial7.core.vaapi.VirtualAccount;
 import id.ac.ui.cs.advprog.tutorial7.model.PaymentResponse;
 
+import java.util.concurrent.ExecutionException;
+
 public interface PaymentService {
     String createNewVA(int vaAmount, String bank);
     PaymentResponse pay(String va, int payAmount, String day, String time);

src/main/java/id/ac/ui/cs/advprog/tutorial7/service/PaymentServiceImpl.java

@@ -1,13 +1,18 @@
 package id.ac.ui.cs.advprog.tutorial7.service;
 
+import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
 
 import org.springframework.stereotype.Service;
 
 import id.ac.ui.cs.advprog.tutorial7.core.bankapi.BankApi;
 import id.ac.ui.cs.advprog.tutorial7.core.miscapi.HolidayApi;
 import id.ac.ui.cs.advprog.tutorial7.core.vaapi.VAHelper;
-import id.ac.ui.cs.advprog.tutorial7.core.vaapi.VirtualAccount;
 import id.ac.ui.cs.advprog.tutorial7.model.PaymentResponse;
 
 @Service
@@ -31,30 +36,52 @@ public String createNewVA(int vaAmount, String bank) {
 
     @Override
     public PaymentResponse pay(String va, int payAmount, String day, String time) {
-        
-        if(holidayApi.isHoliday(day)) return new PaymentResponse(0, "Cannot pay on holidays");
+        CompletableFuture<Boolean> isHolidayFuture = CompletableFuture.supplyAsync(() -> holidayApi.isHoliday(day));
+        CompletableFuture<Integer> vaAmountFuture = CompletableFuture.supplyAsync(() -> vaHelper.getVAAmount(va));
+        CompletableFuture<BankApi> bankFuture = CompletableFuture.supplyAsync(() -> vaHelper.getBankByVA(va));
+        CompletableFuture<String> paymentValidateFuture;
+        CompletableFuture<Boolean> bankClosedFuture;
 
         int vaAmount;
         BankApi bankApi;
+        boolean paymentSuccessful = false;
+
         try {
-            vaAmount = vaHelper.getVAAmount(va);
-            bankApi = vaHelper.getBankByVA(va);
-        } catch(NoSuchElementException e) {
-            return new PaymentResponse(0, "VA number not found");
-        }
+            bankApi = bankFuture.get();
+            bankClosedFuture = CompletableFuture.supplyAsync(() -> bankApi.isBankClosed(time, payAmount));
+            vaAmount = vaAmountFuture.get();
+            paymentValidateFuture = CompletableFuture.supplyAsync(() -> vaHelper.validatePayment(va, vaAmount, payAmount));
 
-        if(bankApi.isBankClosed(time, vaAmount)) return new PaymentResponse(0, "Bank already closed, please try again tomorrow");
-        
-        String errorMsg = vaHelper.validatePayment(va, vaAmount, payAmount);
-        if(!errorMsg.equals("")) return new PaymentResponse(0, errorMsg);
+            if (isHolidayFuture.get()) {
+                return new PaymentResponse(0, "Cannot pay on holidays");
+            }
 
-        boolean paymentSuccessfull = bankApi.pay(payAmount);
-        vaHelper.logVAPayment(va, paymentSuccessfull);
-        if(!paymentSuccessfull) return new PaymentResponse(0, "Payment unsuccessfull, please try again");
-        else return new PaymentResponse(1, "Payment successfull");
+            if ((bankClosedFuture.get())) {
+                return new PaymentResponse(0, "Bank already closed, please try again tomorrow");
+            }
 
-        
+            String errorMsg = paymentValidateFuture.get();
+
+            if (!errorMsg.equals("")) {
+                return new PaymentResponse(0, errorMsg);
+            }
 
+            CompletableFuture<Boolean> bankPaymentFuture = CompletableFuture.supplyAsync(() -> bankApi.pay(payAmount));
+            paymentSuccessful = bankPaymentFuture.get();
+
+        } catch (NoSuchElementException e) {
+            return new PaymentResponse(0, "VA number not found");
+        } catch (InterruptedException | ExecutionException ignored){
+
+        }
+
+        boolean paymentSuccessfulFinal = paymentSuccessful;
+        CompletableFuture.runAsync(() -> vaHelper.logVAPayment(va, paymentSuccessfulFinal));
+
+        if (paymentSuccessful) {
+            return new PaymentResponse(1, "Payment successful");
+        }
+        return new PaymentResponse(0, "Payment unsuccessful, please try again");
     }
 
 }