From 389a26ad6f8076bcef850a7445e2f6a187803dd8 Mon Sep 17 00:00:00 2001
From: QuanTT0110 <quantran@selly.vn>
Date: Thu, 27 Oct 2022 11:30:17 +0700
Subject: [PATCH 1/2] fix get bank info

---
 client/bank.go         | 9 +++++----
 model/bank_request.go  | 5 +++--
 model/bank_response.go | 6 +++---
 subject/bank.go        | 8 ++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/client/bank.go b/client/bank.go
index 69e6d26..9a6fc30 100644
--- a/client/bank.go
+++ b/client/bank.go
@@ -17,15 +17,16 @@ func GetBank() Bank {
 	return Bank{}
 }
 
-func (s Bank) GetBankAndBranchByBankIDs(p model.GetBankAndBranchesRequest) ([]*model.ResponseBankAndBranches, error) {
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankAndBranchesByBankIDs, toBytes(p))
+// GetBankInfo ...
+func (s Bank) GetBankInfo(p model.GetBankInfoRequest) (*model.ResponseBankInfo, error) {
+	msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfo, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  []*model.ResponseBankAndBranches `json:"data"`
-		Error string                           `json:"error"`
+		Data  *model.ResponseBankInfo `json:"data"`
+		Error string                  `json:"error"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
diff --git a/model/bank_request.go b/model/bank_request.go
index f53b794..3b76615 100644
--- a/model/bank_request.go
+++ b/model/bank_request.go
@@ -5,6 +5,7 @@ type CheckBankAndBranchByIDRequest struct {
 	BranchID string `json:"branchId"`
 }
 
-type GetBankAndBranchesRequest struct {
-	BankIDs []string `json:"bankIds"`
+type GetBankInfoRequest struct {
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
 }
diff --git a/model/bank_response.go b/model/bank_response.go
index 565cf21..4880d03 100644
--- a/model/bank_response.go
+++ b/model/bank_response.go
@@ -34,7 +34,7 @@ type BankBrief struct {
 	Logo                     interface{} `json:"logo"`
 }
 
-type ResponseBankAndBranches struct {
-	Bank     BankBrief     `json:"bank"`
-	Branches []BranchBrief `json:"branches"`
+type ResponseBankInfo struct {
+	Bank   BankBrief   `json:"bank"`
+	Branch BranchBrief `json:"branch"`
 }
diff --git a/subject/bank.go b/subject/bank.go
index caf8fa1..601ecb4 100644
--- a/subject/bank.go
+++ b/subject/bank.go
@@ -7,9 +7,9 @@ func getBankValue(val string) string {
 }
 
 var Bank = struct {
-	GetBankAndBranchesByBankIDs string
-	CheckBankAndBranchByID      string
+	GetBankInfo            string
+	CheckBankAndBranchByID string
 }{
-	GetBankAndBranchesByBankIDs: getBankValue("get_bank_and_branches_by_bank_ids"),
-	CheckBankAndBranchByID:      getBankValue("check_bank_and_branch_by_id"),
+	GetBankInfo:            getBankValue("get_bank_info"),
+	CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
 }

From 72aaea5b878eba5a3d75bffe61d5cbd2f1d9ca88 Mon Sep 17 00:00:00 2001
From: QuanTT0110 <quantran@selly.vn>
Date: Thu, 27 Oct 2022 11:58:19 +0700
Subject: [PATCH 2/2] fix get bank info

---
 client/bank.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/bank.go b/client/bank.go
index 9a6fc30..27eac4e 100644
--- a/client/bank.go
+++ b/client/bank.go
@@ -18,15 +18,15 @@ func GetBank() Bank {
 }
 
 // GetBankInfo ...
-func (s Bank) GetBankInfo(p model.GetBankInfoRequest) (*model.ResponseBankInfo, error) {
+func (s Bank) GetBankInfo(p []model.GetBankInfoRequest) ([]*model.ResponseBankInfo, error) {
 	msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfo, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  *model.ResponseBankInfo `json:"data"`
-		Error string                  `json:"error"`
+		Data  []*model.ResponseBankInfo `json:"data"`
+		Error string                    `json:"error"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {