Merge pull request 'add-field-store-code-warehouse' (#177) from feature/add-field-store-code-warehouse into master

Reviewed-on: #177

README.md

@@ -1 +1 @@
-# natsio module
+# natsio

client/auth_sms.go

@@ -1,37 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-// AuthSMS ...
-type AuthSMS struct{}
-
-// GetAuthSMS ...
-func GetAuthSMS() AuthSMS {
-	return AuthSMS{}
-}
-
-func (s AuthSMS) CheckPermission(p model.CheckPermissionRequest) error {
-	msg, err := natsio.GetServer().Request(subject.AuthSMS.CheckPermission, toBytes(p))
-	if err != nil {
-		return err
-	}
-
-	var r struct {
-		Error string `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return err
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-
-	return nil
-}

client/bank.go

@@ -17,16 +17,15 @@ func GetBank() Bank {
 	return Bank{}
 }
 
-// GetBankInfo ...
+func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
-func (s Bank) GetBankInfo(p []model.GetBankInfoRequest) ([]*model.ResponseBankInfo, error) {
+	msg, err := natsio.GetServer().Request(subject.Bank.GetBankById, toBytes(bankID))
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfo, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
 
 	var r struct {
-		Data  []*model.ResponseBankInfo `json:"data"`
+		Data  *model.BankBrief `json:"data"`
-		Error string                    `json:"error"`
+		Error string           `json:"error"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
@@ -39,40 +38,18 @@ func (s Bank) GetBankInfo(p []model.GetBankInfoRequest) ([]*model.ResponseBankIn
 	return r.Data, nil
 }
 
-func (s Bank) CheckBankAndBranchByID(p model.CheckBankAndBranchByIDRequest) bool {
+func (s Bank) CheckBankAndBranchByID(p model.BankBranchRequest) bool {
 	msg, err := natsio.GetServer().Request(subject.Bank.CheckBankAndBranchByID, toBytes(p))
 	if err != nil {
 		return false
 	}
 
 	var r struct {
-		Data bool `json:"data"`
+		Error string `json:"error"`
 	}
 
 	if err = json.Unmarshal(msg.Data, &r); err != nil {
 		return false
 	}
-	return r.Data
+	return r.Error == ""
-}
-
-// GetBankAndBranchDetail ...
-func (s Bank) GetBankAndBranchDetail(p model.GetBankInfoRequest) (*model.ResponseBankInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfoDetail, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseBankInfo `json:"data"`
-		Error string                  `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
 }

client/bank_branch.go

@@ -0,0 +1,39 @@
+package client
+
+import (
+	"encoding/json"
+	"errors"
+
+	"git.selly.red/Selly-Modules/natsio"
+	"git.selly.red/Selly-Modules/natsio/model"
+	"git.selly.red/Selly-Modules/natsio/subject"
+)
+
+// BankBranch ...
+type BankBranch struct{}
+
+// GetBankBranch ...
+func GetBankBranch() BankBranch {
+	return BankBranch{}
+}
+
+func (s BankBranch) GetBankBranchById(bankBranchID string) (*model.BankBranchBrief, error) {
+	msg, err := natsio.GetServer().Request(subject.Bank.GetBankBranchById, toBytes(bankBranchID))
+	if err != nil {
+		return nil, err
+	}
+
+	var r struct {
+		Data  *model.BankBranchBrief `json:"data"`
+		Error string                 `json:"error"`
+	}
+
+	if err = json.Unmarshal(msg.Data, &r); err != nil {
+		return nil, err
+	}
+	if r.Error != "" {
+		return nil, errors.New(r.Error)
+	}
+
+	return r.Data, nil
+}

client/email.go

@@ -1,30 +0,0 @@
-package client
-
-// Email ...
-type Email struct{}
-
-// GetEmail ...
-func GetEmail() Email {
-	return Email{}
-}
-
-// func (s Email) Send(p model.GetEmailRequest) ([]*model.ResponseEmailInfo, error) {
-// 	msg, err := natsio.GetServer().Request(subject.Email.GetListEmailInfo, toBytes(p))
-// 	if err != nil {
-// 		return nil, err
-// 	}
-//
-// 	var r struct {
-// 		Data  []*model.ResponseEmailInfo `json:"data"`
-// 		Error string                     `json:"error"`
-// 	}
-//
-// 	if err := json.Unmarshal(msg.Data, &r); err != nil {
-// 		return nil, err
-// 	}
-// 	if r.Error != "" {
-// 		return nil, errors.New(r.Error)
-// 	}
-//
-// 	return r.Data, nil
-// }

client/notification.go

@@ -1,31 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-func GetNotification() Notification {
-	return Notification{}
-}
-
-type Notification struct{}
-
-func (n Notification) SupplierChangeBalanceRequestApproved(p model.NotificationSupplierChangeBalanceRequestApprovedReq) error {
-	msg, err := natsio.GetServer().Request(subject.Notification.SupplierChangeBalanceRequestApproved, toBytes(p))
-	if err != nil {
-		return err
-	}
-	var r model.CommonResponseData
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return err
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-	return nil
-}

client/order.go

@@ -120,27 +120,6 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd
 	return &r.Data, nil
 }
 
-// GetSupplierCash ...
-func (o Order) GetSupplierCash(p model.OrderSupplierCashReq) (*model.OrderSupplierCashRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Order.GetSupplierCash, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var (
-		r struct {
-			Data  model.OrderSupplierCashRes `json:"data"`
-			Error string                     `json:"error"`
-		}
-	)
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-	return &r.Data, nil
-}
-
 // GetUserTotalWarningOrder ...
 func (o Order) GetUserTotalWarningOrder(p model.OrderGetTotalWarningPayload) (*model.OrderGetTotalWarningRes, error) {
 	msg, err := natsio.GetServer().Request(subject.Order.GetUserTotalWarningOrders, toBytes(p))

client/supplier.go

@@ -3,7 +3,6 @@ package client
 import (
 	"encoding/json"
 	"errors"
-	"go.mongodb.org/mongo-driver/bson"
 
 	"git.selly.red/Selly-Modules/natsio"
 	"git.selly.red/Selly-Modules/natsio/model"
@@ -166,9 +165,9 @@ func (s Supplier) Count(req model.SupplierCountReq) (*model.SupplierCountRes, er
 	return r.Data, nil
 }
 
-// SyncWarehouseIntoServiceSupplier ...
+// CreateWarehouseIntoServiceSupplier ...
-func (s Supplier) SyncWarehouseIntoServiceSupplier(p model.SyncSupplierWarehousePayload) error {
+func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWarehousePayload) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.SyncWarehouseIntoServiceSupplier, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Warehouse.CreateWarehouseIntoServiceSupplier, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -184,104 +183,9 @@ func (s Supplier) SyncWarehouseIntoServiceSupplier(p model.SyncSupplierWarehouse
 	return nil
 }
 
-// GetListWarehouseFreeShip ...
+// UpdateWarehouseIntoServiceSupplier ...
-func (s Supplier) GetListWarehouseFreeShip() (*model.SupplierListWarehouseFreeShipResponse, error) {
+func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWarehousePayload) error {
-	msg, err := natsio.GetServer().Request(subject.Supplier.GetListWarehouseFreeShip, toBytes(bson.M{}))
+	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateWarehouseIntoServiceSupplier, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.SupplierListWarehouseFreeShipResponse `json:"data"`
-		Error string                                       `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
-// GetFreeShipInfo ...
-func (s Supplier) GetFreeShipInfo(p model.SupplierFreeShipInfoRequestPayload) ([]*model.SupplierFreeShipInfoResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.GetFreeShipInfo, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  []*model.SupplierFreeShipInfoResponse `json:"data"`
-		Error string                                `json:"error"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-// CreateCashflow ...
-func (s Supplier) CreateCashflow(p model.SupplierCashflowCreatePayload) (*model.SupplierCashflowCreateResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.CreateCashflow, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Error string                                `json:"error"`
-		Data  *model.SupplierCashflowCreateResponse `json:"data"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-func (s Supplier) UpdateBalance(p model.SupplierUpdateBalanceReq) (*model.SupplierUpdateBalanceRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.UpdateBalance, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Error string                          `json:"error"`
-		Data  *model.SupplierUpdateBalanceRes `json:"data"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-func (s Supplier) GetCurrentBalance(p model.SupplierGetCurrentBalanceReq) (*model.SupplierGetCurrentBalanceRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.GetCurrentBalance, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Error string                              `json:"error"`
-		Data  *model.SupplierGetCurrentBalanceRes `json:"data"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-func (s Supplier) DeleteCashflow(p model.SupplierDeleteCashflowReq) error {
-	msg, err := natsio.GetServer().Request(subject.Supplier.DeleteCashflow, toBytes(p))
 	if err != nil {
 		return err
 	}

client/supplier_permission.go

@@ -1,79 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-// SupplierPermission ...
-type SupplierPermission struct{}
-
-// GetSupplierPermission ...
-func GetSupplierPermission() SupplierPermission {
-	return SupplierPermission{}
-}
-
-func (s SupplierPermission) GetListPermission(p model.GetListPermissionRequest) (*model.GetListPermissionResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierPermission.GetList, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.GetListPermissionResponse `json:"data"`
-		Error string                           `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
-func (s SupplierPermission) CreatePermission(p model.CreatePermissionRequest) (*model.CreatePermissionResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierPermission.Create, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.CreatePermissionResponse `json:"data"`
-		Error string                          `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
-func (s SupplierPermission) UpdatePermission(p model.UpdatePermissionRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierPermission.Update, toBytes(p))
-	if err != nil {
-		return err
-	}
-
-	var r struct {
-		Error string `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return err
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-
-	return nil
-}

client/supplier_role.go

@@ -16,28 +16,8 @@ func GetSupplierRole() SupplierRole {
 	return SupplierRole{}
 }
 
-func (s SupplierRole) GetListRole(p model.GetListRoleRequest) (*model.GetListRoleResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierRole.GetList, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.GetListRoleResponse `json:"data"`
-		Error string                     `json:"error"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
 func (s SupplierRole) CreateRole(p model.CreateRoleRequest) (*model.CreateRoleResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierRole.Create, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@@ -76,24 +56,3 @@ func (s SupplierRole) UpdateRole(p model.UpdateRoleRequest) error {
 
 	return nil
 }
-
-func (s SupplierRole) DetailRole(p model.DetailRoleRequest) (*model.RoleBrief, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierRole.Detail, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.RoleBrief `json:"data"`
-		Error string           `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}

client/supplier_user.go

@@ -16,89 +16,6 @@ func GetSupplierUser() SupplierUser {
 	return SupplierUser{}
 }
 
-func (s SupplierUser) LoginUser(p model.LoginUserRequest) (*model.LoginUserResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.LoginUser, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.LoginUserResponse `json:"data"`
-		Error string                   `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
-func (s SupplierUser) Logout(p model.LogoutRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.Logout, toBytes(p))
-	if err != nil {
-		return err
-	}
-
-	var r struct {
-		Error string `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return err
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-
-	return nil
-}
-
-func (s SupplierUser) GetListUser(p model.GetListUserRequest) (*model.GetListUserResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListUser, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.GetListUserResponse `json:"data"`
-		Error string                     `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
-func (s SupplierUser) DetailUser(p model.DetailUserRequest) (*model.SupplierUserBrief, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.DetailUser, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.SupplierUserBrief `json:"data"`
-		Error string                   `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-
-	return r.Data, nil
-}
-
 func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*model.CreateOwnerResponse, error) {
 	msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
 	if err != nil {
@@ -182,7 +99,7 @@ func (s SupplierUser) UpdateSupplierStaffUsers(p model.UpdateStaffRequest) error
 }
 
 func (s SupplierUser) UpdateStatus(p model.UpdateStatusRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStaff, toBytes(p))
 	if err != nil {
 		return err
 	}
@@ -222,26 +139,6 @@ func (s SupplierUser) ResetPassword(p model.ResetPasswordRequest) (*model.ResetP
 	return r.Data, nil
 }
 
-func (s SupplierUser) ChangePassword(p model.ChangePasswordRequest) error {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, toBytes(p))
-	if err != nil {
-		return err
-	}
-
-	var r struct {
-		Error string `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return err
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-
-	return nil
-}
-
 // CheckTokenSupplierUser ...
 func (s SupplierUser) CheckTokenSupplierUser(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) {
 	msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckTokenSupplierUser, toBytes(p))

client/withdraw.go

@@ -1,39 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-// Withdraw ...
-type Withdraw struct{}
-
-// GetWithdraw ...
-func GetWithdraw() Withdraw {
-	return Withdraw{}
-}
-
-// GetSupplierCash ...
-func (o Withdraw) GetSupplierCash(p model.WithdrawSupplierCashReq) (*model.WithdrawSupplierCashRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Withdraw.GetSupplierCash, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var (
-		r struct {
-			Data  model.WithdrawSupplierCashRes `json:"data"`
-			Error string                        `json:"error"`
-		}
-	)
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return nil, err
-	}
-	if r.Error != "" {
-		return nil, errors.New(r.Error)
-	}
-	return &r.Data, nil
-}

js/model/selly.go

@@ -75,14 +75,6 @@ type CashFlowOptions struct {
 	SavingCampaignItemName string `json:"savingCampaignItemName,omitempty"`
 }
 
-// SubscriberNotificationTopic ...
-type SubscriberNotificationTopic struct {
-	User     string `json:"user"`
-	Topic    string `json:"topic"`
-	DeviceId string `json:"deviceId"`
-	FCMToken string `json:"fcmToken"`
-}
-
 // PayloadUpdateSellerSavingCampaignStatistic ...
 type PayloadUpdateSellerSavingCampaignStatistic struct {
 	SellerID  string                        `json:"sellerId"`
@@ -108,3 +100,11 @@ type GenerateVoucherPromotion struct {
 type GenerateVoucherPromotionOptions struct {
 	Title string `json:"title"`
 }
+
+// SubscriberNotificationTopic ...
+type SubscriberNotificationTopic struct {
+	User     string `json:"user"`
+	Topic    string `json:"topic"`
+	DeviceId string `json:"deviceId"`
+	FCMToken string `json:"fcmToken"`
+}

model/auth_sms_request.go

@@ -1,7 +0,0 @@
-package model
-
-type CheckPermissionRequest struct {
-	Value    []string `json:"value"`
-	ID       string   `json:"_id"`
-	DeviceID string   `json:"deviceId"`
-}

model/auth_sms_response.go

@@ -1 +0,0 @@
-package model

model/bank_branch_reponse.go

@@ -0,0 +1,11 @@
+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"`
+}

model/bank_branch_request.go

@@ -0,0 +1,6 @@
+package model
+
+type BankBranchRequest struct {
+	BankID   string `json:"bankId"`
+	BranchID string `json:"branchId"`
+}

model/bank_request.go

@@ -1,11 +0,0 @@
-package model
-
-type CheckBankAndBranchByIDRequest struct {
-	BankID   string `json:"bankId"`
-	BranchID string `json:"branchId"`
-}
-
-type GetBankInfoRequest struct {
-	BankID   string `json:"bankId"`
-	BranchID string `json:"branchId"`
-}

model/bank_response.go

@@ -1,40 +1,21 @@
 package model
 
-import "time"
-
 // MultiLang ...
 type MultiLang struct {
 	En string `json:"en"`
 	Vi string `json:"vi"`
 }
 
-// BranchBrief ...
-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"`
+	ID                       string    `json:"_id"`
-	Name                     MultiLang   `json:"name"`
+	Name                     MultiLang `json:"name"`
-	ShortName                string      `json:"shortName"`
+	ShortName                string    `json:"shortName"`
-	Active                   bool        `json:"active"`
+	Active                   bool      `json:"active"`
-	BenBankName              string      `json:"benBankName"`
+	BenBankName              string    `json:"benBankName"`
-	BankCode                 int         `json:"bankCode"`
+	BankCode                 int       `json:"bankCode"`
-	IsBranchRequired         bool        `json:"isBranchRequired"`
+	IsBranchRequired         bool      `json:"isBranchRequired"`
-	BeneficiaryForVietinbank string      `json:"beneficiaryForVietinbank"`
+	SearchString             string    `json:"searchString"`
-	CreatedBy                string      `json:"createdBy,omitempty"`
+	BeneficiaryForVietinbank string    `json:"beneficiaryForVietinbank"`
-	CreatedAt                time.Time   `json:"createdAt"`
+	CreatedBy                string    `json:"createdBy,omitempty"`
-	BranchTotal              int64       `json:"branchTotal"`
-	Logo                     interface{} `json:"logo"`
-}
-
-type ResponseBankInfo struct {
-	Bank   BankBrief   `json:"bank"`
-	Branch BranchBrief `json:"branch"`
 }

model/common_request.go

@@ -21,12 +21,6 @@ type ActionBy struct {
 	Name string `json:"name"`
 }
 
-// ClickAction ...
-type ClickAction struct {
-	Type  string `json:"type"`
-	Value string `json:"value"`
-}
-
 // RequestCondition ...
 type RequestCondition struct {
 	Code         int   `json:"code"`

model/notification_request.go

@@ -1,7 +0,0 @@
-package model
-
-type NotificationSupplierChangeBalanceRequestApprovedReq struct {
-	SupplierID string  `json:"supplierId"`
-	Cash       float64 `json:"cash"`
-	Reason     string  `json:"reason"`
-}

model/notification_response.go

@@ -1 +0,0 @@
-package model

model/order_request.go

@@ -50,10 +50,6 @@ type OrderSupplierQuery struct {
 	WarehouseIDs []string `json:"warehouseIDs"`
 }
 
-type OrderSupplierCashReq struct {
-	SupplierID string `json:"supplierId"`
-}
-
 type OrderGetTotalWarningPayload struct {
 	UserID string `json:"userId"`
 }

model/order_response.go

@@ -34,12 +34,6 @@ type SupplierOrderDelivery struct {
 	TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
 }
 
-type OrderSupplierCashRes struct {
-	PendingCash             float64 `json:"pendingCash"`
-	WaitingForReconcileCash float64 `json:"waitingForReconcileCash"`
-	ReconciledCash          float64 `json:"reconciledCash"`
-}
-
 // OrderGetTotalWarningRes ...
 type OrderGetTotalWarningRes struct {
 	UserID            string     `json:"userId"`

model/product_request.go

@@ -4,11 +4,11 @@ type ProductApplyRequestPayload struct {
 	RequestID string `json:"requestId"`
 }
 
+type ProductCreateStepsPayload struct {
+	RequestID string `json:"requestId"`
+}
+
 type ProductRequestChangeStatus struct {
 	RequestID string `json:"requestId"`
 	Status    string `json:"status"`
 }
-
-type ProductCreateStepsPayload struct {
-	RequestID string `json:"requestId"`
-}

model/supplier_device_request.go

@@ -1 +0,0 @@
-package model

model/supplier_device_response.go

@@ -1 +0,0 @@
-package model

model/supplier_permission_request.go

@@ -1,24 +0,0 @@
-package model
-
-type GetListPermissionRequest struct {
-	Page  int    `json:"page"`
-	Limit int    `json:"limit"`
-	Group string `json:"group"`
-}
-
-type DetailPermissionRequest struct {
-	ID string `json:"_id"`
-}
-
-type CreatePermissionRequest struct {
-	Name  string `json:"name"`
-	Code  string `json:"code"`
-	Group string `json:"group"`
-}
-
-type UpdatePermissionRequest struct {
-	ID    string `json:"_id"`
-	Name  string `json:"name"`
-	Code  string `json:"code"`
-	Group string `json:"group"`
-}

model/supplier_permission_response.go

@@ -1,26 +0,0 @@
-package model
-
-type GetListPermissionResponse struct {
-	Permissions []PermissionBrief `json:"permissions"`
-	Total       int64             `json:"total"`
-}
-
-type PermissionBrief struct {
-	ID        string `json:"_id"`
-	Name      string `json:"name"`
-	Code      string `json:"code"`
-	Group     string `json:"group"`
-	CreatedAt string `json:"createdAt"`
-	UpdatedAt string `json:"updatedAt"`
-}
-
-type CreatePermissionResponse struct {
-	ID string `json:"_id"`
-}
-
-type PermissionShort struct {
-	ID    string `json:"_id"`
-	Name  string `json:"name"`
-	Code  string `json:"code"`
-	Group string `json:"group"`
-}

model/supplier_request.go

@@ -28,30 +28,20 @@ type SupplierRequestPayload struct {
 	ContractStatus string
 }
 
-// SupplierCashflowCreatePayload ...
+type CreateSupplierWarehousePayload struct {
-type SupplierCashflowCreatePayload struct {
+	Supplier     string `json:"supplier"`
-	Supplier    string       `json:"supplier"`
+	Warehouse    string `json:"warehouse"`
-	Action      string       `json:"action"`
+	ProvinceCode int    `json:"provinceCode"`
-	Name        string       `json:"name"`
+	DistrictCode int    `json:"districtCode"`
-	TargetID    string       `json:"targetId"`
+	WardCode     int    `json:"wardCode"`
-	Value       float64      `json:"value"`
-	ClickAction *ClickAction `json:"clickAction"`
 }
 
-type SupplierFreeShipInfoRequestPayload struct {
+type UpdateSupplierWarehousePayload struct {
-	SupplierIDs []string `json:"supplierIds"`
+	Supplier     string `json:"supplier"`
-}
+	Warehouse    string `json:"warehouse"`
-
+	ProvinceCode int    `json:"provinceCode"`
-type SupplierUpdateBalanceReq struct {
+	DistrictCode int    `json:"districtCode"`
-	SupplierID string `json:"supplierId"`
+	WardCode     int    `json:"wardCode"`
-}
-
-type SupplierGetCurrentBalanceReq struct {
-	SupplierID string `json:"supplierId"`
-}
-
-type SupplierDeleteCashflowReq struct {
-	CashflowID string `json:"cashflowId"`
 }
 
 type SupplierFindAllReq struct {

model/supplier_response.go

@@ -2,58 +2,10 @@ package model
 
 // ResponseSupplierInfo ...
 type ResponseSupplierInfo struct {
-	ID           string            `json:"id"`
+	ID           string `json:"id"`
-	Name         string            `json:"name"`
+	Name         string `json:"name"`
-	BusinessType string            `json:"businessType"`
+	BusinessType string `json:"businessType"`
-	Statistic    SupplierStatistic `json:"statistic"`
+	IsSellyMall  bool   `json:"isSellyMall"`
-	Rating       float64           `json:"rating"`
-	Inventories  []*SKUCommonInfo  `json:"inventories"`
-	Active       bool              `json:"active"`
-	IsSellyMall  bool              `json:"isSellyMall"`
-}
-
-// SupplierStatistic ...
-type SupplierStatistic struct {
-	TotalInventory      int64   `json:"totalInventory"`
-	TotalQuantitySale   int64   `json:"totalQuantitySale"`
-	TotalProduct        int64   `json:"totalProduct"`
-	TotalHasOrderSeller int64   `json:"totalHasOrderSeller"`
-	TotalFollower       int64   `json:"totalFollower"`
-	SalesTotal          float64 `json:"salesTotal"`
-	SalesWeekTotal      float64 `json:"salesWeekTotal"`
-	SalesMonthTotal     float64 `json:"salesMonthTotal"`
-	SalesTwoMonthTotal  float64 `json:"salesTwoMonthTotal"`
-	SalesYearTotal      float64 `json:"salesYearTotal"`
-	SalesSuccess        float64 `json:"salesSuccess"`
-	SalesPending        float64 `json:"salesPending"`
-	SalesCancelled      float64 `json:"salesCancelled"`
-}
-
-// SKUCommonInfo ...
-type SKUCommonInfo struct {
-	Code         int                `json:"id,omitempty" bson:"id,omitempty"`
-	ID           string             `json:"_id" bson:"_id"`
-	Name         string             `json:"name" bson:"name"`
-	SearchString string             `json:"-" bson:"searchString,omitempty"`
-	Location     *LocationInventory `json:"location,omitempty" bson:"location,omitempty"`
-	MinimumValue float64            `json:"minimumValue,omitempty" bson:"-"`
-}
-
-// LocationInventory ...
-type LocationInventory struct {
-	Address      string         `bson:"address" json:"address"`
-	Province     string         `bson:"province" json:"province"`
-	ProvinceName string         `bson:"provinceName,omitempty" json:"provinceName,omitempty"`
-	District     string         `bson:"district" json:"district"`
-	Ward         string         `bson:"ward" json:"ward"`
-	FullAddress  string         `bson:"fullAddress,omitempty" json:"fullAddress,omitempty"`
-	Location     *MongoLocation `bson:"location" json:"location"`
-}
-
-// MongoLocation ...
-type MongoLocation struct {
-	Type        string    `bson:"type"`
-	Coordinates []float64 `bson:"coordinates"`
 }
 
 // ResponseSupplierContract ...
@@ -79,57 +31,6 @@ type SupplierAll struct {
 	Total     int64           `json:"total"`
 }
 
-type SupplierListWarehouseFreeShipResponse struct {
-	Warehouses []string `json:"warehouses"`
-}
-
-type SupplierCashflowCreateResponse struct {
-	ID string `json:"id"`
-}
-
-type FreeShip struct {
-	ID                string   `json:"_id"`
-	ShortName         string   `json:"shortName"`
-	ListMilestoneText []string `json:"milestoneText"`
-	Order             int      `json:"-"`
-}
-
-type SupplierFreeShipInfoResponse struct {
-	SupplierID string     `json:"supplierId"`
-	FreeShips  []FreeShip `json:"freeShips"`
-}
-
-type SupplierShort struct {
-	ID   string      `json:"_id"`
-	Name string      `json:"name"`
-	Logo interface{} `json:"logo"`
-}
-
-type SupplierUpdateBalanceRes struct {
-	CurrentCash                  float64 `json:"currentCash"`
-	TotalPendingCash             float64 `json:"totalPendingCash"`
-	OrderPendingCash             float64 `json:"orderPendingCash"`
-	OrderWaitingForReconcileCash float64 `json:"orderWaitingForReconcileCash"`
-	OrderReconciledCash          float64 `json:"orderReconciledCash"`
-	WithdrawPendingCash          float64 `json:"withdrawPendingCash"`
-	WithdrawSuccessCash          float64 `json:"withdrawSuccessCash"`
-	WithdrawRejectCash           float64 `json:"withdrawRejectCash"`
-	ChangeBalanceRequestApproved float64 `json:"changeBalanceRequestApproved"`
-	UpdatedAt                    string  `json:"updatedAt"`
-}
-
-type SupplierGetCurrentBalanceRes struct {
-	CurrentCash float64 `json:"currentCash"`
-}
-
-type SyncSupplierWarehousePayload struct {
-	Supplier     string `json:"supplier"`
-	Warehouse    string `json:"warehouse"`
-	ProvinceCode int    `json:"provinceCode"`
-	DistrictCode int    `json:"districtCode"`
-	WardCode     int    `json:"wardCode"`
-}
-
 type SupplierCountRes struct {
 	Total int64 `json:"total"`
 }

model/supplier_role_request.go

@@ -1,29 +1,14 @@
 package model
 
-type GetListRoleRequest struct {
-	Page       int    `json:"page"`
-	Limit      int    `json:"limit"`
-	Type       string `json:"type"`
-	SupplierID string `json:"supplierId"`
-}
-
-type DetailRoleRequest struct {
-	ID string `json:"_id"`
-}
-
 type CreateRoleRequest struct {
-	Name        string   `json:"name"`
+	Name string `json:"name"`
-	Code        string   `json:"code"`
+	Code string `json:"code"`
-	Type        string   `json:"type"`
+	Type string `json:"type"`
-	SupplierID  string   `json:"supplierId"`
-	Permissions []string `json:"permissions"`
 }
 
 type UpdateRoleRequest struct {
-	ID          string   `json:"_id"`
+	ID   string `json:"_id"`
-	Name        string   `json:"name"`
+	Name string `json:"name"`
-	Code        string   `json:"code"`
+	Code string `json:"code"`
-	Type        string   `json:"type"`
+	Type string `json:"type"`
-	SupplierID  string   `json:"supplierId"`
-	Permissions []string `json:"permissions"`
 }

model/supplier_role_response.go

@@ -1,29 +1,5 @@
 package model
 
-type GetListRoleResponse struct {
-	Roles []RoleBrief `json:"roles"`
-	Total int64       `json:"total"`
-}
-
-type RoleBrief struct {
-	ID          string            `json:"_id"`
-	Name        string            `json:"name"`
-	Code        string            `json:"code"`
-	Type        string            `json:"type"`
-	Permissions []PermissionShort `json:"permissions"`
-	SupplierId  string            `json:"supplierId"`
-	CreatedAt   string            `json:"createdAt"`
-	UpdatedAt   string            `json:"updatedAt"`
-}
-
 type CreateRoleResponse struct {
 	ID string `json:"_id"`
 }
-
-type RoleShort struct {
-	ID         string `json:"_id"`
-	Name       string `json:"name"`
-	Code       string `json:"code"`
-	Type       string `json:"type"`
-	SupplierId string `json:"supplierId"`
-}

model/supplier_user_request.go

@@ -1,44 +1,12 @@
 package model
 
-type LoginUserRequest struct {
-	Email        string `json:"email"`
-	Password     string `json:"password"`
-	DeviceID     string `json:"deviceId"`
-	AppVersion   string `json:"appVersion"`
-	UserAgent    string `json:"userAgent"`
-	Model        string `json:"model"`
-	Manufacturer string `json:"manufacturer"`
-	IP           string `json:"ip"`
-	Language     string `json:"language"`
-	FCMToken     string `json:"FCMToken"`
-	AuthToken    string `json:"authToken"`
-	OsName       string `json:"osName"`
-	OsVersion    string `json:"osVersion"`
-	IsMobile     bool   `json:"isMobile"`
-}
-
-type LogoutRequest struct {
-	ID string `json:"_id"`
-}
-
-type GetListUserRequest struct {
-	Page       int    `json:"page"`
-	Limit      int    `json:"limit"`
-	Status     string `json:"status"`
-	Type       string `json:"type"`
-	SupplierID string `json:"supplierId"`
-}
-
-type DetailUserRequest struct {
-	ID string `json:"_id"`
-}
-
 type CreateOwnerRequest struct {
 	Name       string `json:"name"`
 	Phone      string `json:"phone"`
 	Email      string `json:"email"`
 	SupplierID string `json:"supplierId"`
 	RoleID     string `json:"roleId"`
+	Password   string `json:"password"`
 }
 
 type UpdateOwnerRequest struct {
@@ -56,6 +24,7 @@ type CreateStaffRequest struct {
 	Email      string   `json:"email"`
 	SupplierID string   `json:"supplierId"`
 	RoleID     string   `json:"roleId"`
+	Password   string   `json:"password"`
 	Warehouses []string `json:"warehouses"`
 }
 
@@ -77,10 +46,6 @@ type UpdateStatusRequest struct {
 }
 
 type ResetPasswordRequest struct {
-	ID string `json:"_id"`
-}
-
-type ChangePasswordRequest struct {
 	ID       string `json:"_id"`
 	Password string `json:"password"`
 }

model/supplier_user_response.go

@@ -1,33 +1,5 @@
 package model
 
-// LoginUserResponse ...
-type LoginUserResponse struct {
-	ID                      string `json:"_id"`
-	RequireToChangePassword bool   `json:"requireToChangePassword"`
-	SupplierID              string `json:"supplierId"`
-	Name                    string `json:"name"`
-}
-
-type GetListUserResponse struct {
-	SupplierUsers []SupplierUserBrief `json:"supplierUsers"`
-	Total         int64               `json:"total"`
-}
-
-type SupplierUserBrief struct {
-	ID         string      `json:"_id"`
-	Role       RoleShort   `json:"role"`
-	SupplierID string      `json:"supplierId"`
-	Name       string      `json:"name"`
-	Phone      string      `json:"phone"`
-	Email      string      `json:"email"`
-	Status     string      `json:"status"`
-	Avatar     interface{} `json:"avatar"`
-	Type       string      `json:"type"`
-	Warehouses []string    `json:"warehouses"`
-	CreatedAt  string      `json:"createdAt"`
-	UpdatedAt  string      `json:"updatedAt"`
-}
-
 type CreateOwnerResponse struct {
 	ID string `json:"_id"`
 }

model/warehouse_response.go

@@ -131,7 +131,6 @@ type CommonLocation struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
 	Code int    `json:"code"`
-	Slug string `json:"slug"`
 }
 
 // ResponseLatLng ...

model/withdraw_request.go

@@ -1,5 +0,0 @@
-package model
-
-type WithdrawSupplierCashReq struct {
-	SupplierID string `json:"supplierId"`
-}

model/withdraw_response.go

@@ -1,7 +0,0 @@
-package model
-
-type WithdrawSupplierCashRes struct {
-	PendingCash float64 `json:"pendingCash"`
-	SuccessCash float64 `json:"successCash"`
-	RejectCash  float64 `json:"rejectCash"`
-}

subject/auth_sms.go

@@ -1,15 +0,0 @@
-package subject
-
-import "fmt"
-
-func getAuthSMSValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.AuthSMS, val)
-}
-
-var AuthSMS = struct {
-	// AuthSMS
-	CheckPermission string
-}{
-	// Users
-	CheckPermission: getAuthSMSValue("check_permission"),
-}

subject/bank.go

@@ -7,11 +7,11 @@ func getBankValue(val string) string {
 }
 
 var Bank = struct {
-	GetBankInfo            string
+	GetBankById            string
-	GetBankInfoDetail      string
+	GetBankBranchById      string
 	CheckBankAndBranchByID string
 }{
-	GetBankInfo:            getBankValue("get_bank_info"),
+	GetBankById:            getBankValue("get_bank_by_id"),
-	GetBankInfoDetail:      getBankValue("get_bank_info_detail"),
+	GetBankBranchById:      getBankValue("get_bank_branch_by_id"),
-	CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
+	CheckBankAndBranchByID: getBankValue("check_bank_and_brach_by_id"),
 }

subject/config.go

@@ -1,51 +1,41 @@
 package subject
 
 var prefixes = struct {
-	Communication      string
+	Communication string
-	Order              string
+	Order         string
-	News               string
+	News          string
-	Warehouse          string
+	Warehouse     string
-	Location           string
+	Location      string
-	Bank               string
+	Bank          string
-	Supplier           string
+	Supplier      string
-	Seller             string
+	Seller        string
-	AuthSMS            string
+	SupplierUser  string
-	Selly              string
+	SupplierRole  string
-	SupplierPermission string
+	SocialPost    string
-	Withdraw           string
+	Staff         string
-	Notification       string
+	Segment       string
-	SocialPost         string
+	Product       string
-	Staff              string
+	Queue         string
-	Segment            string
+	Campaign      string
-	SupplierUser       string
+	Affiliate     string
-	SupplierRole       string
+	Socket        string
-	Campaign           string
-	Affiliate          string
-	Product            string
-	Queue              string
-	Socket             string
 }{
-	Communication:      "communication",
+	Communication: "communication",
-	Order:              "order",
+	Order:         "order",
-	News:               "news",
+	News:          "news",
-	Warehouse:          "warehouse",
+	Warehouse:     "warehouse",
-	Location:           "location",
+	Location:      "location",
-	Supplier:           "supplier",
+	Supplier:      "supplier",
-	Bank:               "bank",
+	Bank:          "bank",
-	Seller:             "seller",
+	Seller:        "seller",
-	AuthSMS:            "auth_sms",
+	SupplierUser:  "supplier_user",
-	Selly:              "selly",
+	SupplierRole:  "supplier_role",
-	SupplierUser:       "supplier_user",
+	SocialPost:    "social_post",
-	SupplierRole:       "supplier_role",
+	Staff:         "staff",
-	SupplierPermission: "supplier_permission",
+	Segment:       "segment",
-	Withdraw:           "withdraw",
+	Product:       "product",
-	Notification:       "notification",
+	Queue:         "queue",
-	SocialPost:         "social_post",
+	Campaign:      "campaign",
-	Staff:              "staff",
+	Affiliate:     "affiliate",
-	Segment:            "segment",
+	Socket:        "socket",
-	Campaign:           "campaign",
-	Affiliate:          "affiliate",
-	Product:            "product",
-	Queue:              "queue",
-	Socket:             "socket",
 }

subject/notification.go

@@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getNotificationValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Notification, val)
-}
-
-var Notification = struct {
-	SupplierChangeBalanceRequestApproved string
-}{
-	SupplierChangeBalanceRequestApproved: getNotificationValue("supplier_change_balance_request_approved"),
-}

subject/order.go

@@ -14,7 +14,6 @@ var Order = struct {
 	UpdateLogisticInfoFailed  string
 	ORNotUpdateStatus         string
 	GetSupplierOrders         string
-	GetSupplierCash           string
 }{
 	UpdateORStatus:            getOrderValue("update_outbound_request_status"),
 	GetUserTotalWarningOrders: getOrderValue("get_user_total_warning_orders"),
@@ -23,5 +22,4 @@ var Order = struct {
 	UpdateLogisticInfoFailed:  getOrderValue("update_logistic_info_failed"),
 	ORNotUpdateStatus:         getOrderValue("outbound_request_not_update_status"),
 	GetSupplierOrders:         getOrderValue("get_supplier_orders"),
-	GetSupplierCash:           getOrderValue("get_supplier_cash"),
 }

subject/supplier.go

@@ -11,12 +11,6 @@ var Supplier = struct {
 	GetDetailSupplierInfo           string
 	GetSupplierContractBySupplierID string
 	FindAll                         string
-	GetListWarehouseFreeShip        string
-	CreateCashflow                  string
-	DeleteCashflow                  string
-	UpdateBalance                   string
-	GetCurrentBalance               string
-	GetFreeShipInfo                 string
 	FindAllOld                      string
 	Count                           string
 }{
@@ -24,12 +18,6 @@ var Supplier = struct {
 	GetDetailSupplierInfo:           getSupplierValue("get_detail_supplier_info"),
 	GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
 	FindAll:                         getSupplierValue("find_all"),
-	GetListWarehouseFreeShip:        getSupplierValue("get_list_warehouse_free_ship"),
-	CreateCashflow:                  getSupplierValue("create_cashflow"),
-	DeleteCashflow:                  getSupplierValue("delete_cashflow"),
-	UpdateBalance:                   getSupplierValue("update_balance"),
-	GetCurrentBalance:               getSupplierValue("get_current_balance"),
-	GetFreeShipInfo:                 getSupplierValue("get_free_ship_info"),
 	FindAllOld:                      getSupplierValue("find_all_old"),
 	Count:                           getSupplierValue("count"),
 }

subject/supplier_permission.go

@@ -1,17 +0,0 @@
-package subject
-
-import "fmt"
-
-func getPermissionValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.SupplierPermission, val)
-}
-
-var SupplierPermission = struct {
-	GetList string
-	Create  string
-	Update  string
-}{
-	GetList: getPermissionValue("get_list"),
-	Create:  getPermissionValue("create"),
-	Update:  getPermissionValue("update"),
-}

subject/supplier_role.go

@@ -7,15 +7,9 @@ func getRoleValue(val string) string {
 }
 
 var SupplierRole = struct {
-	GetList             string
+	Create string
-	Detail              string
+	Update string
-	Create              string
-	Update              string
-	GetListBySupplierID string
 }{
-	GetList:             getRoleValue("get_list"),
+	Create: getRoleValue("create"),
-	Detail:              getRoleValue("detail"),
+	Update: getRoleValue("update"),
-	Create:              getRoleValue("create"),
-	Update:              getRoleValue("update"),
-	GetListBySupplierID: getRoleValue("get_list_by_supplierId"),
 }

subject/supplier_user.go

@@ -8,30 +8,20 @@ func getSupplierUserValue(val string) string {
 
 var SupplierUser = struct {
 	// Users
-	LoginUser              string
-	Logout                 string
-	GetListUser            string
-	DetailUser             string
 	CreateOwner            string
 	UpdateOwner            string
 	CreateStaff            string
 	UpdateStaff            string
 	UpdateStatus           string
 	ResetPassword          string
-	ChangePassword         string
 	CheckTokenSupplierUser string
 }{
 	// Users
-	LoginUser:              getSupplierUserValue("login_user"),
-	Logout:                 getSupplierUserValue("logout"),
-	GetListUser:            getSupplierUserValue("get_list_user"),
-	DetailUser:             getSupplierUserValue("detail_user"),
 	CreateOwner:            getSupplierUserValue("create_owner"),
 	UpdateOwner:            getSupplierUserValue("update_owner"),
 	CreateStaff:            getSupplierUserValue("create_staff"),
 	UpdateStaff:            getSupplierUserValue("update_staff"),
 	UpdateStatus:           getSupplierUserValue("update_status"),
 	ResetPassword:          getSupplierUserValue("reset_password"),
-	ChangePassword:         getSupplierUserValue("change_password"),
 	CheckTokenSupplierUser: getSupplierUserValue("check_token_supplier_user"),
 }

subject/warehouse.go

@@ -9,7 +9,6 @@ func getWarehouseValue(val string) string {
 }
 
 var Warehouse = struct {
-	SyncWarehouseIntoServiceSupplier     string
 	CreateWarehouseIntoServiceSupplier   string
 	UpdateWarehouseIntoServiceSupplier   string
 	CreateOutboundRequest                string
@@ -18,7 +17,6 @@ var Warehouse = struct {
 	GetConfiguration                     string
 	SyncORStatus                         string
 	WebhookTNC                           string
-	WebhookShiip                         string
 	WebhookGlobalCare                    string
 	WebhookOnPoint                       string
 	WebhookViettelFFM                    string
@@ -37,7 +35,6 @@ var Warehouse = struct {
 	BulkWriteWarehouseConfig             string
 	GetListWarehouseConfig               string
 }{
-	SyncWarehouseIntoServiceSupplier:     getWarehouseValue("sync_warehouse_into_service_supplier"),
 	CreateWarehouseIntoServiceSupplier:   getWarehouseValue("create_warehouse_into_service_supplier"),
 	UpdateWarehouseIntoServiceSupplier:   getWarehouseValue("update_warehouse_into_service_supplier"),
 	AfterCreateWarehouse:                 getWarehouseValue("after_create_warehouse"),
@@ -48,7 +45,6 @@ var Warehouse = struct {
 	GetConfiguration:                     getWarehouseValue("get_configuration"),
 	SyncORStatus:                         getWarehouseValue("sync_or_status"),
 	WebhookTNC:                           getWarehouseValue("webhook_tnc"),
-	WebhookShiip:                         getWarehouseValue("webhook_shiip"),
 	WebhookGlobalCare:                    getWarehouseValue("webhook_global_care"),
 	WebhookOnPoint:                       getWarehouseValue("webhook_on_point"),
 	WebhookViettelFFM:                    getWarehouseValue("webhook_viettel_ffm"),
@@ -59,7 +55,7 @@ var Warehouse = struct {
 	UpdateIsClosedSupplier:               getWarehouseValue("update_is_closed_supplier"),
 	GetWarehouses:                        getWarehouseValue("get_warehouses"),
 	UpdateORDeliveryStatus:               getWarehouseValue("update_or_delivery_status"),
-	UpdateStatusWarehousePendingInactive: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
+	UpdateStatusWarehousePendingInactive: getWarehouseValue("update_status_warehouse_pending_inactive"),
 	UpdateIsSellyMall:                    getWarehouseValue("update_is_selly_mall"),
 	UpdateWarehouseConfig:                getWarehouseValue("update_warehouse_config"),
 	BulkWriteWarehouseConfig:             getWarehouseValue("bulk_write_warehouse_config"),

subject/withdraw.go

@@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getWithdrawValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Withdraw, val)
-}
-
-var Withdraw = struct {
-	GetSupplierCash string
-}{
-	GetSupplierCash: getWithdrawValue("get_supplier_cash"),
-}