From d042a6035a74dffc3d375fb7918c69d5cc4da05a Mon Sep 17 00:00:00 2001
From: Raja Nabeel <nabeelx64@icloud.com>
Date: Wed, 17 Apr 2024 23:44:50 +0500
Subject: [PATCH] webclient + deposit account balance fetched from ciihive

---
 .../uco/config/WebClientconfiguration.java    |  6 ++++++
 .../mfsys/uco/controller/UserController.java  | 19 +++++++++++++------
 .../uco/dto/ViewBalanceRequestModel.java      |  1 +
 .../uco/dto/ViewBalanceResponseModel.java     |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/mfsys/uco/config/WebClientconfiguration.java b/src/main/java/com/mfsys/uco/config/WebClientconfiguration.java
index 121999d..87d73fe 100644
--- a/src/main/java/com/mfsys/uco/config/WebClientconfiguration.java
+++ b/src/main/java/com/mfsys/uco/config/WebClientconfiguration.java
@@ -13,6 +13,12 @@ public class WebClientconfiguration {
     public WebClient.Builder loadBalancedWebClientBuilder() {
         return WebClient.builder();
     }
+
+    @Bean
+    public WebClient webClientDeposit() {
+        return WebClient.create("http://localhost:9095");
+    }
+
 }
 
 
diff --git a/src/main/java/com/mfsys/uco/controller/UserController.java b/src/main/java/com/mfsys/uco/controller/UserController.java
index 317c534..dc62556 100644
--- a/src/main/java/com/mfsys/uco/controller/UserController.java
+++ b/src/main/java/com/mfsys/uco/controller/UserController.java
@@ -6,7 +6,11 @@ import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.Paragraph;
 import com.mfsys.uco.UCOURI;
 import com.mfsys.uco.dto.*;
+import com.mfsys.uco.model.UcoAccount;
+import com.mfsys.uco.repository.UCOAccountRepository;
 import com.mfsys.uco.service.TransactionPinService;
+import com.mfsys.uco.service.TransactionService;
+import com.mfsys.uco.service.UcoAccountService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -23,11 +27,14 @@ import java.util.List;
 public class UserController {
 
     private final TransactionPinService transactionPinService;
+    private final TransactionService transactionService;
+    private final UcoAccountService ucoAccountService;
+
 
     @PostMapping(UCOURI.VIEW_BALANCE)
     public ViewBalanceResponseModel viewBalance(@RequestBody ViewBalanceRequestModel viewBalanceRequestModel) {
         ViewBalanceResponseModel viewBalanceResponseModel = new ViewBalanceResponseModel();
-        viewBalanceResponseModel.setMbmBkmsbalance("100.00");
+        viewBalanceResponseModel.setMbmBkmsbalance(ucoAccountService.fetchAccountBalance(viewBalanceRequestModel.getPorOrgacode(),viewBalanceRequestModel.getMbmBkmsNumber()));
         return viewBalanceResponseModel;
     }
 
@@ -77,18 +84,18 @@ public class UserController {
     @GetMapping(UCOURI.FETCH_ACCOUNT_INQUIRY)
     public AccountInquiryResponse getAccountInquiry(
             @RequestParam String acntTypeCode,
-            @RequestParam String acntTypeValue) {
-
-        return new AccountInquiryResponse("Nabeel Dce");
+            @RequestParam String acntTypeValue,
+            @RequestParam String porOrgacode,
+            @RequestParam String channelCode) {
+        return new AccountInquiryResponse(ucoAccountService.fetchAccountTitile(porOrgacode,acntTypeCode,acntTypeValue));
     }
 
     @PostMapping(UCOURI.GET_TRANSACTION_PIN)
     public TransactionPinResponseModel submitTransaction(@RequestBody TransactionPinRequestModel transactionPinRequestModel) {
         TransactionPinResponseModel response = new TransactionPinResponseModel();
         response.setOtdTranrequestid(123456);
-        response.setPinCode("1234");
         return response;
-    }
+    } // mine
 
     @PostMapping(UCOURI.SUBMIT_TRANSACTION)
     public TransactionResponseModel submitTransaction(@RequestBody TransactionRequestModel transactionRequestModel) {
diff --git a/src/main/java/com/mfsys/uco/dto/ViewBalanceRequestModel.java b/src/main/java/com/mfsys/uco/dto/ViewBalanceRequestModel.java
index 90d6054..a69b672 100644
--- a/src/main/java/com/mfsys/uco/dto/ViewBalanceRequestModel.java
+++ b/src/main/java/com/mfsys/uco/dto/ViewBalanceRequestModel.java
@@ -11,5 +11,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class ViewBalanceRequestModel {
     String cmpCustcode;
+    String porOrgacode;
     String mbmBkmsNumber;
 }
diff --git a/src/main/java/com/mfsys/uco/dto/ViewBalanceResponseModel.java b/src/main/java/com/mfsys/uco/dto/ViewBalanceResponseModel.java
index 3a74fba..e3f82c4 100644
--- a/src/main/java/com/mfsys/uco/dto/ViewBalanceResponseModel.java
+++ b/src/main/java/com/mfsys/uco/dto/ViewBalanceResponseModel.java
@@ -10,5 +10,5 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ViewBalanceResponseModel {
-    private String mbmBkmsbalance;
+    private Double mbmBkmsbalance;
 }