From 0580606373958bc1a0b1c42d28a77f49bc649849 Mon Sep 17 00:00:00 2001
From: QuanTT0110 <quantran@selly.vn>
Date: Tue, 8 Nov 2022 18:00:24 +0700
Subject: [PATCH] get-bank-info

---
 client/bank.go               | 11 +++++-----
 model/bank_branch_reponse.go | 11 ----------
 model/bank_branch_request.go |  6 ------
 model/bank_request.go        | 11 ++++++++++
 model/bank_response.go       | 39 +++++++++++++++++++++++++++---------
 subject/bank.go              |  8 +++-----
 6 files changed, 49 insertions(+), 37 deletions(-)
 delete mode 100644 model/bank_branch_reponse.go
 delete mode 100644 model/bank_branch_request.go
 create mode 100644 model/bank_request.go

diff --git a/client/bank.go b/client/bank.go
index 3391911..27eac4e 100644
--- a/client/bank.go
+++ b/client/bank.go
@@ -17,15 +17,16 @@ func GetBank() Bank {
 	return Bank{}
 }
 
-func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankById, toBytes(bankID))
+// 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.BankBrief `json:"data"`
-		Error string           `json:"error"`
+		Data  []*model.ResponseBankInfo `json:"data"`
+		Error string                    `json:"error"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
@@ -38,7 +39,7 @@ func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
 	return r.Data, nil
 }
 
-func (s Bank) CheckBankAndBranchByID(p model.BankBranchRequest) bool {
+func (s Bank) CheckBankAndBranchByID(p model.CheckBankAndBranchByIDRequest) bool {
 	msg, err := natsio.GetServer().Request(subject.Bank.CheckBankAndBranchByID, toBytes(p))
 	if err != nil {
 		return false
diff --git a/model/bank_branch_reponse.go b/model/bank_branch_reponse.go
deleted file mode 100644
index 1fa1432..0000000
--- a/model/bank_branch_reponse.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package model
-
-// BankBranchBrief ...
-type BankBranchBrief struct {
-	ID       string `json:"_id"`
-	City     string `json:"city"`
-	BankCode string `json:"bankCode"`
-	Bank     string `json:"bank"`
-	Active   bool   `json:"active"`
-	Name     string `json:"name"`
-}
diff --git a/model/bank_branch_request.go b/model/bank_branch_request.go
deleted file mode 100644
index 6de1216..0000000
--- a/model/bank_branch_request.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package model
-
-type BankBranchRequest struct {
-	BankID   string `json:"bankId"`
-	BranchID string `json:"branchId"`
-}
diff --git a/model/bank_request.go b/model/bank_request.go
new file mode 100644
index 0000000..3b76615
--- /dev/null
+++ b/model/bank_request.go
@@ -0,0 +1,11 @@
+package model
+
+type CheckBankAndBranchByIDRequest struct {
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
+}
+
+type GetBankInfoRequest struct {
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
+}
diff --git a/model/bank_response.go b/model/bank_response.go
index 74fc10e..4880d03 100644
--- a/model/bank_response.go
+++ b/model/bank_response.go
@@ -1,21 +1,40 @@
 package model
 
+import "time"
+
 // MultiLang ...
 type MultiLang struct {
 	En string `json:"en"`
 	Vi string `json:"vi"`
 }
 
+// BankBranchBrief ...
+type BranchBrief struct {
+	ID       string `json:"_id"`
+	City     string `json:"city"`
+	BankCode string `json:"bankCode"`
+	BankID   string `json:"bankId"`
+	Active   bool   `json:"active"`
+	Name     string `json:"name"`
+}
+
 // BankBrief ...
 type BankBrief struct {
-	ID                       string    `json:"_id"`
-	Name                     MultiLang `json:"name"`
-	ShortName                string    `json:"shortName"`
-	Active                   bool      `json:"active"`
-	BenBankName              string    `json:"benBankName"`
-	BankCode                 int       `json:"bankCode"`
-	IsBranchRequired         bool      `json:"isBranchRequired"`
-	SearchString             string    `json:"searchString"`
-	BeneficiaryForVietinbank string    `json:"beneficiaryForVietinbank"`
-	CreatedBy                string    `json:"createdBy,omitempty"`
+	ID                       string      `json:"_id"`
+	Name                     MultiLang   `json:"name"`
+	ShortName                string      `json:"shortName"`
+	Active                   bool        `json:"active"`
+	BenBankName              string      `json:"benBankName"`
+	BankCode                 int         `json:"bankCode"`
+	IsBranchRequired         bool        `json:"isBranchRequired"`
+	BeneficiaryForVietinbank string      `json:"beneficiaryForVietinbank"`
+	CreatedBy                string      `json:"createdBy,omitempty"`
+	CreatedAt                time.Time   `json:"createdAt"`
+	BranchTotal              int64       `json:"branchTotal"`
+	Logo                     interface{} `json:"logo"`
+}
+
+type ResponseBankInfo struct {
+	Bank   BankBrief   `json:"bank"`
+	Branch BranchBrief `json:"branch"`
 }
diff --git a/subject/bank.go b/subject/bank.go
index 9f7f8bb..601ecb4 100644
--- a/subject/bank.go
+++ b/subject/bank.go
@@ -7,11 +7,9 @@ func getBankValue(val string) string {
 }
 
 var Bank = struct {
-	GetBankById            string
-	GetBankBranchById      string
+	GetBankInfo            string
 	CheckBankAndBranchByID string
 }{
-	GetBankById:            getBankValue("get_bank_by_id"),
-	GetBankBranchById:      getBankValue("get_bank_branch_by_id"),
-	CheckBankAndBranchByID: getBankValue("check_bank_and_brach_by_id"),
+	GetBankInfo:            getBankValue("get_bank_info"),
+	CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
 }