Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop

client/bank.go

@@ -17,14 +17,15 @@ func GetBank() Bank {
 	return Bank{}
 }
 
-func (s Bank) GetBankAndBranchByBankIDs(p model.GetBankAndBranchesRequest) ([]*model.ResponseBankAndBranches, error) {
+// GetBankInfo ...
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankAndBranchesByBankIDs, toBytes(p))
+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"`
+		Data  []*model.ResponseBankInfo `json:"data"`
 		Error string                    `json:"error"`
 	}
 

model/bank_request.go

@@ -5,6 +5,7 @@ type CheckBankAndBranchByIDRequest struct {
 	BranchID string `json:"branchId"`
 }
 
-type GetBankAndBranchesRequest struct {
+type GetBankInfoRequest struct {
-	BankIDs []string `json:"bankIds"`
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
 }

model/bank_response.go

@@ -34,7 +34,7 @@ type BankBrief struct {
 	Logo                     interface{} `json:"logo"`
 }
 
-type ResponseBankAndBranches struct {
+type ResponseBankInfo struct {
 	Bank   BankBrief   `json:"bank"`
-	Branches []BranchBrief `json:"branches"`
+	Branch BranchBrief `json:"branch"`
 }

subject/bank.go

@@ -7,9 +7,9 @@ func getBankValue(val string) string {
 }
 
 var Bank = struct {
-	GetBankAndBranchesByBankIDs string
+	GetBankInfo            string
 	CheckBankAndBranchByID string
 }{
-	GetBankAndBranchesByBankIDs: getBankValue("get_bank_and_branches_by_bank_ids"),
+	GetBankInfo:            getBankValue("get_bank_info"),
 	CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
 }