Merge pull request 'feature/export-data-campaign-transaction' (#80 ) from feature/export-data-campaign-transaction into feature/campaign

Reviewed-on: #80
2022-11-24 02:40:27 +00:00
49 changed files with 196 additions and 1490 deletions
--- a/client/affiliate.go
+++ b/client/affiliate.go
@ -1,36 +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"
-)
-
-// Affiliate ...
-type Affiliate struct{}
-
-// GetAffiliate ...
-func GetAffiliate() Affiliate {
-	return Affiliate{}
-}
-
-// GetTransactions ...
-func (w Affiliate) GetTransactions(p model.GetTransactionsRequest) (*model.GetTransactionsResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Affiliate.GetTransactions, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  *model.GetTransactionsResponse `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
-}
--- a/client/campaign.go
+++ b/client/campaign.go
@ -11,11 +11,6 @@ import (
 // Campaign ...
 type Campaign struct{}

-// GetCampaign ...
-func GetCampaign() Campaign {
-	return Campaign{}
-}
-
 // GetCampaignTransaction ...
 func (c Campaign) GetCampaignTransaction(p model.GetCampaignTransactionsRequest) (*model.ResponseCampaignTransactionAll, error) {
 	msg, err := natsio.GetServer().Request(subject.Campaign.GetListCampaignTransactionAdminInfoByIDs, toBytes(p))
@ -34,25 +29,3 @@ func (c Campaign) GetCampaignTransaction(p model.GetCampaignTransactionsRequest)
 	}
 	return r.Data, nil
 }
-
-// GetCampaignSellerStatistic ....
-func (c Campaign) GetCampaignSellerStatistic(req model.GetCampaignSellerStatisticBySellerIDs) (*model.ResponseCampaignSellerStatisticList, error) {
-	msg, err := natsio.GetServer().Request(subject.Campaign.GetCampaignSellerStatisticBySellerIDs, toBytes(req))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseCampaignSellerStatisticList `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
-}
--- a/client/location.go
+++ b/client/location.go
@ -19,7 +19,7 @@ func GetLocation() Location {

 // GetLocationByCode ...
 func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*model.ResponseLocationAddress, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCodeFromLocationService, toBytes(payload))
+	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCode, toBytes(payload))
 	if err != nil {
 		return nil, err
 	}
@ -28,7 +28,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
 		Data  *model.ResponseLocationAddress `json:"data"`
 		Error string                         `json:"error"`
 	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
+	if err := json.Unmarshal(msg.Data, &r); err != nil {
 		return nil, err
 	}

@ -38,40 +38,19 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
 	return r.Data, nil
 }

-// GetLocationByWardCode ...
-func (l Location) GetLocationByWardCode(payload model.RequestCondition) (*model.ResponseLocationAddress, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByWardCode, toBytes(payload))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseLocationAddress `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
-}
-
-// GetProvincesByCodes ...
+// GetProvincesByCodes ... ...
 func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodesFromLocationService, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodes, toBytes(p))
 	if err != nil {
 		return nil, err
 	}

 	var r struct {
-		Data  *model.LocationProvinceResponse `json:"data"`
+		Data  *model.LocationProvinceResponse `json:"data"'`
 		Error string                          `json:"error"`
 	}

-	if err = json.Unmarshal(msg.Data, &r); err != nil {
+	if err := json.Unmarshal(msg.Data, &r); err != nil {
 		return nil, err
 	}

@ -83,7 +62,7 @@ func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.Lo

 // GetDistrictsByCodes ...
 func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.LocationDistrictResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodesFromLocationService, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodes, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@ -92,7 +71,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
 		Error string                          `json:"error"`
 	}

-	if err = json.Unmarshal(msg.Data, &r); err != nil {
+	if err := json.Unmarshal(msg.Data, &r); err != nil {
 		return nil, err
 	}

@ -105,7 +84,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo

 // GetWardsByCodes ...
 func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWardResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodesFromLocationService, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodes, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@ -115,7 +94,7 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
 		Error string                      `json:"error"`
 	}

-	if err = json.Unmarshal(msg.Data, &r); err != nil {
+	if err := json.Unmarshal(msg.Data, &r); err != nil {
 		return nil, err
 	}

@ -125,211 +104,3 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa

 	return r.Data, nil
 }
-
-// GetProvinceByCondition ...
-func (l Location) GetProvinceByCondition(p model.RequestCondition) (*model.LocationProvinceDetailResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetProvinceByCondition, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.LocationProvinceDetailResponse `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
-}
-
-// GetProvincesByCondition ...
-func (l Location) GetProvincesByCondition(p model.RequestCondition) ([]*model.LocationProvinceDetailResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCondition, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  []*model.LocationProvinceDetailResponse `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
-}
-
-// GetDistrictByCondition ...
-func (l Location) GetDistrictByCondition(p model.RequestCondition) (*model.LocationDistrictDetailResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictByCondition, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.LocationDistrictDetailResponse `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
-}
-
-// GetDistrictsByCondition ...
-func (l Location) GetDistrictsByCondition(p model.RequestCondition) ([]*model.LocationDistrictDetailResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCondition, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  []*model.LocationDistrictDetailResponse `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
-}
-
-// GetWardByCondition ...
-func (l Location) GetWardByCondition(p model.RequestCondition) (*model.LocationWardDetailResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetWardByCondition, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.LocationWardDetailResponse `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
-}
-
-// GetWardsByCondition ...
-func (l Location) GetWardsByCondition(p model.RequestCondition) ([]*model.LocationWardDetailResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCondition, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  []*model.LocationWardDetailResponse `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
-}
-
-// CountProvinceByCondition ...
-func (l Location) CountProvinceByCondition(p model.RequestCondition) (int64, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.CountProvinceByCondition, toBytes(p))
-	if err != nil {
-		return 0, err
-	}
-	var r struct {
-		Data  int64  `json:"data"`
-		Error string `json:"error"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return 0, err
-	}
-	if r.Error != "" {
-		return 0, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-// CountDistrictByCondition ...
-func (l Location) CountDistrictByCondition(p model.RequestCondition) (int64, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.CountDistrictByCondition, toBytes(p))
-	if err != nil {
-		return 0, err
-	}
-	var r struct {
-		Data  int64  `json:"data"`
-		Error string `json:"error"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return 0, err
-	}
-	if r.Error != "" {
-		return 0, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-// CountWardByCondition ...
-func (l Location) CountWardByCondition(p model.RequestCondition) (int64, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.CountWardByCondition, toBytes(p))
-	if err != nil {
-		return 0, err
-	}
-	var r struct {
-		Data  int64  `json:"data"`
-		Error string `json:"error"`
-	}
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return 0, err
-	}
-	if r.Error != "" {
-		return 0, errors.New(r.Error)
-	}
-	return r.Data, nil
-}
-
-// DistinctWithField ...
-func (l Location) DistinctWithField(p model.ProvinceDistinctWithField) ([]interface{}, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.ProvinceDistinctWithField, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  []interface{} `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
-}
--- a/client/order.go
+++ b/client/order.go
@ -119,22 +119,3 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd
 	}
 	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))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  model.OrderGetTotalWarningRes `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
-}
--- a/client/product.go
+++ b/client/product.go
@ -1,86 +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"
-)
-
-// Product ...
-type Product struct{}
-
-// GetProduct ...
-func GetProduct() Product {
-	return Product{}
-}
-
-func (c Product) ApplyRequest(p model.ProductApplyRequestPayload) error {
-	msg, err := natsio.GetServer().Request(subject.Product.ApplyRequest, 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 (c Product) CreateRequestSteps(p model.ProductCreateStepsPayload) error {
-	msg, err := natsio.GetServer().Request(subject.Product.CreateRequestStep, 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 (c Product) ProcessApplyRequest(p model.ProductApplyRequestPayload) error {
-	msg, err := natsio.GetServer().Request(subject.Product.ProcessApplyRequest, 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 (c Product) RequestChangeStatus(p model.ProductRequestChangeStatus) error {
-	msg, err := natsio.GetServer().Request(subject.Product.RequestChangeStatus, 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
-}
--- a/client/queue.go
+++ b/client/queue.go
@ -1,35 +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"
-)
-
-// Queue ...
-type Queue struct{}
-
-// GetQueue ...
-func GetQueue() Queue {
-	return Queue{}
-}
-
-func (c Queue) ScheduleTask(p model.QueueScheduleTaskRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Queue.ScheduleTask, 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
-}
--- a/client/segmnet.go
+++ b/client/segmnet.go
@ -1,41 +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"
-)
-
-// Segment ...
-type Segment struct{}
-
-// GetSegment ...
-func GetSegment() Segment {
-	return Segment{}
-}
-
-// GetListSegmentInfoByIds ...
-func (s Segment) GetListSegmentInfoByIds(p model.GetListSegmentRequest) (*model.ResponseListSegmentInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Segment.GetListSegmentInfo, toBytes(p))
-
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseListSegmentInfo `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
-}
--- a/client/socket.go
+++ b/client/socket.go
@ -1,27 +0,0 @@
-package client
-
-import (
-	"git.selly.red/Selly-Modules/natsio"
-	"git.selly.red/Selly-Modules/natsio/model"
-	"git.selly.red/Selly-Modules/natsio/subject"
-)
-
-// Socket ...
-type Socket struct{}
-
-// GetSocket ...
-func GetSocket() Socket {
-	return Socket{}
-}
-
-// EmitSocketEventDataReward ...
-func (s Socket) EmitSocketEventDataReward(p model.PayloadEmitSocketEvent) error {
-	_, err := natsio.GetServer().Request(subject.Socket.EmitEventReward, toBytes(p))
-	return err
-}
-
-// EmitEventToUser ...
-func (s Socket) EmitEventToUser(p model.PayloadEmitSocketEvent) error {
-	_, err := natsio.GetServer().Request(subject.Socket.EmitEventToUser, toBytes(p))
-	return err
-}
--- a/client/supplier.go
+++ b/client/supplier.go
@ -38,28 +38,6 @@ func (s Supplier) GetListSupplierInfo(p model.GetSupplierRequest) ([]*model.Resp
 	return r.Data, nil
 }

-// GetDetailSupplierInfo ...
-func (s Supplier) GetDetailSupplierInfo(p model.GetDetailSupplierRequest) (*model.ResponseSupplierInfo, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.GetDetailSupplierInfo, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseSupplierInfo `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 Supplier) GetSupplierContractBySupplierID(p model.GetSupplierContractRequest) (*model.ResponseSupplierContract, error) {
 	msg, err := natsio.GetServer().Request(subject.Supplier.GetSupplierContractBySupplierID, toBytes(p))
 	if err != nil {
@ -102,27 +80,6 @@ func (s Supplier) FindAll(supplierID model.SupplierRequestPayload) (*model.Suppl
 	return r.Data, nil
 }

-func (s Supplier) FindAllOld(req model.SupplierFindAllReq) (*model.SupplierAll, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.FindAllOld, toBytes(req))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.SupplierAll `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 Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*model.SupplierAll, error) {
 	msg, err := natsio.GetServer().Request(subject.Supplier.FindAll, toBytes(supplierID))
 	if err != nil {
@ -144,27 +101,6 @@ func (s Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*mod
 	return r.Data, nil
 }

-func (s Supplier) Count(req model.SupplierCountReq) (*model.SupplierCountRes, error) {
-	msg, err := natsio.GetServer().Request(subject.Supplier.Count, toBytes(req))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.SupplierCountRes `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
-}
-
 // CreateWarehouseIntoServiceSupplier ...
 func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWarehousePayload) error {
 	msg, err := natsio.GetServer().Request(subject.Warehouse.CreateWarehouseIntoServiceSupplier, toBytes(p))
--- a/client/supplier_user.go
+++ b/client/supplier_user.go
@ -138,23 +138,3 @@ func (s SupplierUser) ResetPassword(p model.ResetPasswordRequest) (*model.ResetP

 	return r.Data, nil
 }
-
-// CheckTokenSupplierUser ...
-func (s SupplierUser) CheckTokenSupplierUser(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) {
-	msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckTokenSupplierUser, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Error string                                `json:"error"`
-		Data  *model.ResponseCheckTokenSupplierUser `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
-}
--- a/client/warehouse.go
+++ b/client/warehouse.go
@ -146,25 +146,6 @@ func (w Warehouse) GetConfigByWarehouseID(warehouseID string) (*model.WarehouseC
 	return r.Data, nil
 }

-// GetListConfig ...
-func (w Warehouse) GetListConfig(req model.GetListWarehouseConfigReq) ([]*model.WarehouseConfiguration, error) {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.GetListWarehouseConfig, toBytes(req))
-	if err != nil {
-		return nil, err
-	}
-	var r struct {
-		Data  []*model.WarehouseConfiguration `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
-}
-
 // GetWarehouses ...
 func (w Warehouse) GetWarehouses(p model.GetWarehousesRequest) (*model.GetWarehousesResponse, error) {
 	msg, err := natsio.GetServer().Request(subject.Warehouse.GetWarehouses, toBytes(p))
@ -201,43 +182,3 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu
 	}
 	return nil
 }
-
-// UpdateStatusWarehousePendingInactive ...
-func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWarehousePendingInactiveRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateStatusWarehousePendingInactive, toBytes(p))
-	if err != nil {
-		return err
-	}
-
-	var r struct {
-		Error string `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return fmt.Errorf("nats: update_status_warehouse_pending_inactive %v", err)
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-	return nil
-}
-
-// UpdateIsSellyMall ...
-func (w Warehouse) UpdateIsSellyMall(p model.UpdateIsSellyMallRequest) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateIsSellyMall, toBytes(p))
-	if err != nil {
-		return err
-	}
-
-	var r struct {
-		Error string `json:"error"`
-	}
-
-	if err = json.Unmarshal(msg.Data, &r); err != nil {
-		return fmt.Errorf("nats: update_is_selly_mall %v", err)
-	}
-	if r.Error != "" {
-		return errors.New(r.Error)
-	}
-	return nil
-}
--- a/client/warehouse_dao.go
+++ b/client/warehouse_dao.go
@ -3,7 +3,6 @@ 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"
@ -84,39 +83,3 @@ func (w Warehouse) FindByCondition(p model.FindWithCondition) ([]*model.Warehous
 	}
 	return r.Data, nil
 }
-
-// UpdateWarehouseConfig ...
-func (w Warehouse) UpdateWarehouseConfig(p model.UpdatePayload) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateWarehouseConfig, bsonToBytes(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
-}
-
-// BulkWriteWarehouseConfig ...
-func (w Warehouse) BulkWriteWarehouseConfig(p model.UpdatePayload) error {
-	msg, err := natsio.GetServer().Request(subject.Warehouse.BulkWriteWarehouseConfig, bsonToBytes(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
-}
--- a/js/consumer/selly.go
+++ b/js/consumer/selly.go
@ -2,17 +2,11 @@ package jsconsumer

 // Selly ...
 var Selly = struct {
-	PushNotification                    string
-	UpdateSellerAffiliateStatistic      string
-	CheckAnDInsertCashflowBySeller      string
-	SubscriberTopic                     string
-	UpdateSellerSavingCampaignStatistic string
-	GenerateVoucherPromotion            string
+	PushNotification               string
+	UpdateSellerAffiliateStatistic string
+	CheckAnDInsertCashflowBySeller string
 }{
-	PushNotification:                    "PULL_PUSH_NOTIFICATION",
-	UpdateSellerAffiliateStatistic:      "PULL_UPDATE_SELLER_AFFILIATE_STATISTIC",
-	CheckAnDInsertCashflowBySeller:      "PULL_CHECK_AND_INSERT_CASHFLOW_BY_SELLER",
-	SubscriberTopic:                     "PULL_SUBSCRIBER_TOPIC",
-	UpdateSellerSavingCampaignStatistic: "PULL_UPDATE_SELLER_SAVING_CAMPAIGN_STATISTIC",
-	GenerateVoucherPromotion:            "PULL_GENERATE_VOUCHER_PROMOTION",
+	PushNotification:               "PULL_PUSH_NOTIFICATION",
+	UpdateSellerAffiliateStatistic: "PULL_UPDATE_SELLER_AFFILIATE_STATISTIC",
+	CheckAnDInsertCashflowBySeller: "PULL_CHECK_AND_INSERT_CASHFLOW_BY_SELLER",
 }
--- a/js/model/selly.go
+++ b/js/model/selly.go
@ -1,7 +1,5 @@
 package jsmodel

-import "go.mongodb.org/mongo-driver/bson/primitive"
-
 // PushNotification ...
 type PushNotification struct {
 	User        string              `json:"user"`
@ -14,11 +12,9 @@ type PushNotification struct {

 // NotificationOptions ...
 type NotificationOptions struct {
-	Title                      string `json:"title"`
-	Content                    string `json:"content"`
-	CampaignID                 string `json:"campaignId,omitempty"`
-	SellerSavingCampaignID     string `json:"sellerSavingCampaignId,omitempty"`
-	SellerSavingCampaignStatus string `json:"sellerSavingCampaignStatus,omitempty"`
+	Title      string `json:"title"`
+	Content    string `json:"content"`
+	CampaignID string `json:"campaignId,omitempty"`
 }

 // PayloadUpdateSellerAffiliateStatistic ...
@ -62,49 +58,4 @@ type CashFlowOptions struct {
 	AffiliateTransactionCode string `json:"affiliateTransactionCode,omitempty"`
 	AffiliateCampaignID      string `json:"affiliateCampaignId,omitempty"`
 	AffiliateCampaignName    string `json:"affiliateCampaignName,omitempty"`
-
-	// Campaign
-	CampaignID   string `json:"campaignId,omitempty"`
-	CampaignName string `json:"campaignName,omitempty"`
-
-	// SavingCampaign
-	SavingCampaignID   string `json:"savingCampaignId,omitempty"`
-	SavingCampaignName string `json:"savingCampaignName,omitempty"`
-
-	SavingCampaignItemID   string `json:"savingCampaignItemId,omitempty"`
-	SavingCampaignItemName string `json:"savingCampaignItemName,omitempty"`
-}
-
-// PayloadUpdateSellerSavingCampaignStatistic ...
-type PayloadUpdateSellerSavingCampaignStatistic struct {
-	SellerID  string                        `json:"sellerId"`
-	Statistic SellerSavingCampaignStatistic `json:"statistic"`
-}
-
-// SellerSavingCampaignStatistic ...
-type SellerSavingCampaignStatistic struct {
-	SavingCampaignCashPending   float64 `json:"savingCampaignCashPending"`
-	SavingCampaignCashCompleted float64 `json:"savingCampaignCashCompleted"`
-}
-
-// GenerateVoucherPromotion ...
-type GenerateVoucherPromotion struct {
-	Cash       float64                         `json:"cash"`
-	TargetID   primitive.ObjectID              `json:"targetId"`
-	TargetType string                          `json:"targetType"`
-	Options    GenerateVoucherPromotionOptions `json:"options"`
-	Seller     primitive.ObjectID              `json:"seller"`
-}
-
-// GenerateVoucherPromotionOptions ...
-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"`
 }
--- a/js/subject/selly.go
+++ b/js/subject/selly.go
@ -11,17 +11,11 @@ func getSellyValue(val string) string {

 // Selly ...
 var Selly = struct {
-	PushNotification                    string
-	UpdateSellerAffiliateStatistic      string
-	CheckAnDInsertCashflowBySeller      string
-	SubscriberTopic                     string
-	UpdateSellerSavingCampaignStatistic string
-	GenerateVoucherPromotion            string
+	PushNotification               string
+	UpdateSellerAffiliateStatistic string
+	CheckAnDInsertCashflowBySeller string
 }{
-	PushNotification:                    getSellyValue("push_notifications"),
-	UpdateSellerAffiliateStatistic:      getSellyValue("update_seller_affiliate_statistic"),
-	CheckAnDInsertCashflowBySeller:      getSellyValue("check_and_insert_cashflow_statistic"),
-	SubscriberTopic:                     getSellyValue("subscriber_topic"),
-	UpdateSellerSavingCampaignStatistic: getSellyValue("update_seller_saving_campaign_statistic"),
-	GenerateVoucherPromotion:            getSellyValue("generate_voucher_promotion"),
+	PushNotification:               getSellyValue("push_notifications"),
+	UpdateSellerAffiliateStatistic: getSellyValue("update_seller_affiliate_statistic"),
+	CheckAnDInsertCashflowBySeller: getSellyValue("check_and_insert_cashflow_statistic"),
 }
--- a/model/affiliate_request.go
+++ b/model/affiliate_request.go
@ -1,16 +0,0 @@
-package model
-
-import "time"
-
-// GetTransactionsRequest ...
-type GetTransactionsRequest struct {
-	Page     int64     `json:"page"`
-	Limit    int64     `json:"limit"`
-	Keyword  string    `json:"keyword"`
-	Status   string    `json:"status"`
-	Source   string    `json:"source"`
-	Campaign string    `json:"campaign"`
-	Seller   string    `json:"seller"`
-	FromAt   time.Time `json:"fromAt"`
-	ToAt     time.Time `json:"toAt"`
-}
--- a/model/affiliate_response.go
+++ b/model/affiliate_response.go
@ -1,38 +0,0 @@
-package model
-
-// GetTransactionsResponse ...
-type GetTransactionsResponse struct {
-	Total int64             `json:"total"`
-	Limit int64             `json:"limit"`
-	List  []TransactionInfo `json:"list"`
-}
-
-// TransactionInfo ...
-type TransactionInfo struct {
-	ID                       string                     `json:"_id"`
-	Code                     string                     `json:"code"`
-	Campaign                 ResponseCampaignShort      `json:"campaign"`
-	Seller                   ResponseSellerInfo         `json:"seller"`
-	Source                   string                     `json:"source"`
-	Commission               ResponseCampaignCommission `json:"commission"`
-	EstimateSellerCommission float64                    `json:"estimateSellerCommission"`
-	TransactionTime          string                     `json:"transactionTime"`
-	Status                   string                     `json:"status"`
-	RejectedReason           string                     `json:"rejectedReason"`
-	EstimateCashbackAt       string                     `json:"estimateCashbackAt"`
-}
-
-// ResponseCampaignCommission ...
-type ResponseCampaignCommission struct {
-	Real          float64 `json:"real"`
-	SellerPercent float64 `json:"sellerPercent"`
-	Selly         float64 `json:"selly"`
-	Seller        float64 `json:"seller"`
-}
-
-// ResponseCampaignShort ...
-type ResponseCampaignShort struct {
-	ID   string     `json:"_id"`
-	Name string     `json:"name"`
-	Logo *FilePhoto `json:"logo"`
-}
--- a/model/campaign_request.go
+++ b/model/campaign_request.go
@ -1,9 +1,6 @@
 package model

-import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"time"
-)
+import "time"

 // GetCampaignTransactionsRequest ...
 type GetCampaignTransactionsRequest struct {
@ -15,8 +12,3 @@ type GetCampaignTransactionsRequest struct {
 	Page     int64     `json:"page"`
 	Limit    int64     `json:"limit"`
 }
-
-// GetCampaignSellerStatisticBySellerIDs ...
-type GetCampaignSellerStatisticBySellerIDs struct {
-	SellerIDs []primitive.ObjectID
-}
--- a/model/campaign_response.go
+++ b/model/campaign_response.go
@ -1,7 +1,5 @@
 package model

-import "go.mongodb.org/mongo-driver/bson/primitive"
-
 // ResponseCampaignTransactionAll ...
 type ResponseCampaignTransactionAll struct {
 	List  []ResponseNatsCampaignTransaction `json:"list"`
@ -11,24 +9,19 @@ type ResponseCampaignTransactionAll struct {

 // ResponseNatsCampaignTransaction ...
 type ResponseNatsCampaignTransaction struct {
-	ID               string                                       `json:"_id"`
-	Cash             float64                                      `json:"cash"`
-	Campaign         ResponseCampaignShortInfo                    `json:"campaign"`
-	Options          ResponseCampaignTransactionOptions           `json:"options"`
-	Seller           primitive.ObjectID                           `json:"seller"`
-	Type             string                                       `json:"type"`
-	Status           string                                       `json:"status"`
-	RejectedReason   string                                       `json:"rejectedReason"`
-	CreatedAt        string                                       `json:"createdAt"`
-	UpdatedAt        string                                       `json:"updatedAt"`
-	Item             *ResponseCampaignItemShortInfo               `json:"item"`
-	ApprovedBy       primitive.ObjectID                           `json:"approvedBy,omitempty"`
-	RejectedBy       primitive.ObjectID                           `json:"rejectedBy,omitempty"`
-	ApprovedAt       string                                       `json:"approvedAt,omitempty"`
-	RejectedAt       string                                       `json:"rejectedAt,omitempty"`
-	CompletedAt      string                                       `json:"completedAt,omitempty"`
-	RejectReason     string                                       `json:"rejectReason,omitempty"`
-	AdminConfirmData *ResponseCampaignTransactionAdminConfirmData `json:"adminConfirmData,omitempty"`
+	ID             string                         `json:"_id"`
+	Cash           float64                        `json:"cash"`
+	Campaign       ResponseCampaignShortInfo      `json:"campaign"`
+	Seller         ResponseSellerInfo             `json:"seller"`
+	Type           string                         `json:"type"`
+	RejectedReason string                         `json:"rejectedReason"`
+	CreatedAt      string                         `json:"createdAt"`
+	UpdatedAt      string                         `json:"updatedAt"`
+	Item           *ResponseCampaignItemShortInfo `json:"item"`
+	ApprovedBy     *ResponseStaffInfo             `json:"approvedBy,omitempty"`
+	RejectedBy     *ResponseStaffInfo             `json:"rejectedBy,omitempty"`
+	ApprovedAt     string                         `json:"approvedAt,omitempty"`
+	RejectedAt     string                         `json:"rejectedAt,omitempty"`
 }

 // ResponseCampaignShortInfo ...
@ -44,45 +37,3 @@ type ResponseCampaignItemShortInfo struct {
 	Name   string `json:"name"`
 	Status string `json:"status"`
 }
-
-// ResponseCampaignTransactionOptions ...
-type ResponseCampaignTransactionOptions struct {
-	Link           string `json:"link"`
-	SocialChannel  string `json:"socialChannel"`
-	Milestone      int64  `json:"milestone"`
-	MilestoneTitle string `json:"milestoneTitle"`
-}
-
-// ResponseCampaignTransactionAdminConfirmData ...
-type ResponseCampaignTransactionAdminConfirmData struct {
-	FriendPublicTotal int64 `json:"friendPublicTotal"`
-}
-
-// ResponseCampaignSellerStatisticList ...
-type ResponseCampaignSellerStatisticList struct {
-	List []ResponseCampaignSellerStatistic `json:"list"`
-}
-
-// ResponseCampaignSellerStatistic ...
-type ResponseCampaignSellerStatistic struct {
-	SellerID  primitive.ObjectID      `json:"sellerId"`
-	Statistic CampaignSellerStatistic `json:"Statistic"`
-}
-
-// CampaignSellerStatistic ...
-type CampaignSellerStatistic struct {
-	TotalNotRejected     int64   `bson:"totalNotRejected" json:"totalNotRejected"`
-	CashTotalNotRejected float64 `bson:"cashTotalNotRejected" json:"cashTotalNotRejected"`
-
-	TotalCompleted     int64   `bson:"totalCompleted" json:"totalCompleted"`
-	CashTotalCompleted float64 `bson:"cashTotalCompleted" json:"cashTotalCompleted"`
-
-	TotalPending     int64   `bson:"totalPending" json:"totalPending"`
-	CashTotalPending float64 `bson:"cashTotalPending" json:"cashTotalPending"`
-
-	TotalApproved     int64   `bson:"totalApproved" json:"totalApproved"`
-	CashTotalApproved float64 `bson:"cashTotalApproved" json:"cashTotalApproved"`
-
-	TotalRejected     int64   `bson:"totalRejected" json:"totalRejected"`
-	CashTotalRejected float64 `bson:"cashTotalRejected" json:"cashTotalRejected"`
-}
--- a/model/common_request.go
+++ b/model/common_request.go
@ -20,37 +20,3 @@ type ActionBy struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
 }
-
-// RequestCondition ...
-type RequestCondition struct {
-	Code         int   `json:"code"`
-	Codes        []int `json:"codes"`
-	DistrictCode int   `json:"districtCode"`
-	ProvinceCode int   `json:"provinceCode"`
-
-	Slug    string `json:"slug"`
-	OldSlug string `json:"oldSlug"`
-
-	Slugs    []string `json:"slugs"`
-	OldSlugs []string `json:"oldSlugs"`
-
-	DistrictSlug string `json:"districtSlug"`
-	ProvinceSlug string `json:"provinceSlug"`
-
-	Keyword string `json:"keyword"`
-	Region  string `json:"region"`
-
-	Page  int64 `json:"page"`
-	Limit int64 `json:"limit"`
-}
-
-type UpdatePayload struct {
-	Conditions interface{}              `json:"conditions"`
-	Payload    interface{}              `json:"payload"`
-	Opts       []*options.UpdateOptions `json:"opts"`
-}
-
-type WebhookPayloadV2 struct {
-	Path string `json:"path"` // request URL path from external
-	Data string `json:"data"` // request body
-}
--- a/model/communication_request.go
+++ b/model/communication_request.go
@ -5,9 +5,6 @@ type CommunicationRequestHttp struct {
 	ResponseImmediately bool        `json:"responseImmediately"`
 	Authentication      string      `json:"authentication"`
 	Payload             HttpRequest `json:"payload"`
-
-	// collection to store log data, will be prepended with log-, default it stored in logs collections
-	LogTarget string `json:"logTarget"`
 }

 // HttpRequest ...
--- a/model/location_request.go
+++ b/model/location_request.go
@ -1,66 +1,23 @@
 package model

 // LocationRequestPayload ...
-type (
-	// LocationRequestPayload ...
-	LocationRequestPayload struct {
-		Province int `json:"province"`
-		District int `json:"district"`
-		Ward     int `json:"ward"`
-	}
+type LocationRequestPayload struct {
+	Province int `json:"province"`
+	District int `json:"district"`
+	Ward     int `json:"ward"`
+}

-	// ProvinceRequestPayload ...
-	ProvinceRequestPayload struct {
-		Codes []int `json:"codes"`
-	}
+// ProvinceRequestPayload ...
+type ProvinceRequestPayload struct {
+	Codes []int `json:"codes"`
+}

-	// ProvinceRequestCondition ...
-	ProvinceRequestCondition struct {
-		Code    int      `json:"code"`
-		Codes   []int    `json:"codes"`
-		Slug    string   `json:"slug"`
-		Slugs   []string `json:"slugs"`
-		Keyword string   `json:"keyword"`
-		Region  string   `json:"region"`
-	}
+// DistrictRequestPayload ...
+type DistrictRequestPayload struct {
+	Codes []int `json:"codes"`
+}

-	// DistrictRequestPayload ...
-	DistrictRequestPayload struct {
-		Codes []int `json:"codes"`
-	}
-
-	// DistrictRequestCondition ...
-	DistrictRequestCondition struct {
-		Code         int    `json:"code"`
-		Codes        []int  `json:"codes"`
-		ProvinceCode int    `json:"provinceCode"`
-		Slug         string `json:"slug"`
-		ProvinceSlug string `json:"provinceSlug"`
-		Keyword      string `json:"keyword"`
-	}
-
-	// WardRequestPayload ...
-	WardRequestPayload struct {
-		Codes []int `json:"codes"`
-	}
-
-	// WardRequestCondition ...
-	WardRequestCondition struct {
-		Code         int    `json:"code"`
-		Codes        []int  `json:"codes"`
-		DistrictCode int    `json:"districtCode"`
-		ProvinceCode int    `json:"provinceCode"`
-		Slug         string `json:"slug"`
-		DistrictSlug string `json:"districtSlug"`
-		ProvinceSlug string `json:"provinceSlug"`
-		Keyword      string `json:"keyword"`
-	}
-
-	// ProvinceDistinctWithField ...
-	ProvinceDistinctWithField struct {
-		Conditions struct {
-			Region string `json:"region"`
-		} `json:"conditions"`
-		Field string `json:"filed"`
-	}
-)
+// WardRequestPayload ...
+type WardRequestPayload struct {
+	Codes []int `json:"codes"`
+}
--- a/model/location_response.go
+++ b/model/location_response.go
@ -1,95 +1,43 @@
 package model

-type (
-	// ResponseLocationAddress ...
-	ResponseLocationAddress struct {
-		Province LocationProvince `json:"province"`
-		District LocationDistrict `json:"district"`
-		Ward     LocationWard     `json:"ward"`
-	}
+type ResponseLocationAddress struct {
+	Province LocationProvince `json:"province"`
+	District LocationDistrict `json:"district"`
+	Ward     LocationWard     `json:"ward"`
+}

-	// LocationProvince ...
-	LocationProvince struct {
-		ID             string `json:"id"`
-		Name           string `json:"name"`
-		Code           int    `json:"code"`
-		Slug           string `json:"slug"`
-		RegionCode     string `json:"regionCode"`
-		MainRegionCode string `json:"mainRegionCode"`
-	}
+// LocationProvince ...
+type LocationProvince struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+	Code int    `json:"code"`
+}

-	// LocationDistrict ...
-	LocationDistrict struct {
-		ID   string `json:"id"`
-		Name string `json:"name"`
-		Code int    `json:"code"`
-		Slug string `json:"slug"`
-	}
+// LocationDistrict ...
+type LocationDistrict struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+	Code int    `json:"code"`
+}

-	// LocationWard ...
-	LocationWard struct {
-		ID       string       `json:"id"`
-		Name     string       `json:"name"`
-		Code     int          `json:"code"`
-		Slug     string       `json:"slug"`
-		Location *GEOLocation `json:"location"`
-	}
+// LocationWard ...
+type LocationWard struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+	Code int    `json:"code"`
+}

-	// GEOLocation ...
-	GEOLocation struct {
-		Type        string    `bson:"type" json:"type"`
-		Coordinates []float64 `bson:"coordinates" json:"coordinates"`
-	}
+// LocationProvinceResponse ...
+type LocationProvinceResponse struct {
+	Provinces []LocationProvince `json:"provinces"`
+}

-	// LocationProvinceResponse ...
-	LocationProvinceResponse struct {
-		Provinces []LocationProvince `json:"provinces"`
-	}
+// LocationDistrictResponse ...
+type LocationDistrictResponse struct {
+	Districts []LocationDistrict `json:"districts"`
+}

-	// LocationDistrictResponse ...
-	LocationDistrictResponse struct {
-		Districts []LocationDistrict `json:"districts"`
-	}
-
-	// LocationWardResponse ...
-	LocationWardResponse struct {
-		Wards []LocationWard `json:"wards"`
-	}
-
-	// LocationProvinceDetailResponse ...
-	LocationProvinceDetailResponse struct {
-		ID             string `json:"_id"`
-		Name           string `json:"name"`
-		Slug           string `json:"slug"`
-		Code           int    `json:"code"`
-		CountryCode    string `json:"countryCode"`
-		RegionCode     string `json:"regionCode"`
-		MainRegionCode string `json:"mainRegionCode"`
-		TotalDistricts int    `json:"totalDistricts"`
-		TotalWards     int    `json:"totalWards"`
-	}
-
-	// LocationDistrictDetailResponse ...
-	LocationDistrictDetailResponse struct {
-		ID           string   `json:"_id"`
-		Name         string   `json:"name"`
-		OldSlugs     []string `json:"oldSlugs"`
-		Slug         string   `json:"slug"`
-		Code         int      `json:"code"`
-		ProvinceCode int      `json:"provinceCode"`
-		Area         int      `json:"area"`
-		TotalWards   int      `json:"totalWards"`
-	}
-
-	// LocationWardDetailResponse ...
-	LocationWardDetailResponse struct {
-		ID           string       `json:"_id"`
-		Name         string       `json:"name"`
-		OldSlugs     []string     `json:"oldSlugs"`
-		Slug         string       `json:"slug"`
-		Code         int          `json:"code"`
-		DistrictCode int          `json:"districtCode"`
-		ProvinceCode int          `json:"provinceCode"`
-		Location     *GEOLocation `json:"location"`
-	}
-)
+// LocationWardResponse ...
+type LocationWardResponse struct {
+	Wards []LocationWard `json:"wards"`
+}
--- a/model/order_request.go
+++ b/model/order_request.go
@ -49,7 +49,3 @@ type OrderSupplierQuery struct {
 	SupplierID   string   `json:"supplierId"`
 	WarehouseIDs []string `json:"warehouseIDs"`
 }
-
-type OrderGetTotalWarningPayload struct {
-	UserID string `json:"userId"`
-}
--- a/model/order_response.go
+++ b/model/order_response.go
@ -33,10 +33,3 @@ type SupplierOrderDelivery struct {
 	Status  string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"`
 	TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
 }
-
-// OrderGetTotalWarningRes ...
-type OrderGetTotalWarningRes struct {
-	UserID            string     `json:"userId"`
-	TotalWarningOrder int64      `json:"totalWarningOrder"`
-	Action            ActionType `json:"action"`
-}
--- a/model/product_request.go
+++ b/model/product_request.go
@ -1,14 +0,0 @@
-package model
-
-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"`
-}
--- a/model/queue_request.go
+++ b/model/queue_request.go
@ -1,8 +0,0 @@
-package model
-
-type QueueScheduleTaskRequest struct {
-	ID          string `json:"id"`
-	NatsSubject string `json:"natsSubject"`
-	Data        string `json:"data"`
-	StartAt     int64  `json:"startAt"` // unix
-}
--- a/model/segment_request.go
+++ b/model/segment_request.go
@ -1,6 +0,0 @@
-package model
-
-// GetListSegmentRequest ...
-type GetListSegmentRequest struct {
-	SegmentIds []string `json:"segmentIds"`
-}
--- a/model/segment_response.go
+++ b/model/segment_response.go
@ -1,12 +0,0 @@
-package model
-
-// ResponseSegmentInfo ...
-type ResponseSegmentInfo struct {
-	ID   string `json:"_id"`
-	Name string `json:"name"`
-}
-
-// ResponseListSegmentInfo ...
-type ResponseListSegmentInfo struct {
-	Segments []ResponseSegmentInfo `json:"segments"`
-}
--- a/model/seller_response.go
+++ b/model/seller_response.go
@ -4,11 +4,9 @@ import "time"

 // ResponseSellerInfo ...
 type ResponseSellerInfo struct {
-	ID            string  `json:"_id"`
-	Name          string  `json:"name"`
-	Code          string  `json:"code"`
-	IsAccountPro  bool    `json:"isAccountPro"`
-	CashRemaining float64 `json:"cashRemaining"`
+	ID   string `json:"_id"`
+	Name string `json:"name"`
+	Code string `json:"code"`
 }

 // ResponseListSellerInfo ...
--- a/model/socket.go
+++ b/model/socket.go
@ -1,19 +0,0 @@
-package model
-
-// PayloadEmitSocketEvent ...
-type PayloadEmitSocketEvent struct {
-	User        string `json:"user"`
-	Message     string `json:"message"`
-	Data        string `json:"data"`
-	IsNotRemove bool   `json:"isNotRemove"`
-}
-
-// PayloadEventSocketReward ...
-type PayloadEventSocketReward struct {
-	Type    string      `json:"type"`
-	Title   string      `json:"title"`
-	Cash    float64     `json:"cash"`
-	Message string      `json:"message"`
-	Photo   interface{} `json:"photo"`
-	Action  *ActionType `json:"action"`
-}
--- a/model/supplier_request.go
+++ b/model/supplier_request.go
@ -9,11 +9,6 @@ type GetSupplierRequest struct {
 	ListID []primitive.ObjectID `json:"listID"`
 }

-// GetDetailSupplierRequest ...
-type GetDetailSupplierRequest struct {
-	Supplier string `json:"supplier"`
-}
-
 type GetSupplierContractRequest struct {
 	SupplierID primitive.ObjectID `json:"supplierID"`
 }
@ -43,17 +38,3 @@ type UpdateSupplierWarehousePayload struct {
 	DistrictCode int    `json:"districtCode"`
 	WardCode     int    `json:"wardCode"`
 }
-
-type SupplierFindAllReq struct {
-	Page    int64    `json:"page"`
-	Limit   int64    `json:"limit"`
-	Segment string   `json:"segment"`
-	IDs     []string `json:"ids"`
-	Status  string   `json:"status"` // active,inactive
-}
-
-type SupplierCountReq struct {
-	Segment string   `json:"segment"`
-	IDs     []string `json:"ids"`
-	Status  string   `json:"status"` // active,inactive
-}
--- a/model/supplier_response.go
+++ b/model/supplier_response.go
@ -5,7 +5,6 @@ type ResponseSupplierInfo struct {
 	ID           string `json:"id"`
 	Name         string `json:"name"`
 	BusinessType string `json:"businessType"`
-	IsSellyMall  bool   `json:"isSellyMall"`
 }

 // ResponseSupplierContract ...
@ -30,7 +29,3 @@ type SupplierAll struct {
 	Suppliers []SupplierBrief `json:"suppliers"`
 	Total     int64           `json:"total"`
 }
-
-type SupplierCountRes struct {
-	Total int64 `json:"total"`
-}
--- a/model/supplier_user_request.go
+++ b/model/supplier_user_request.go
@ -49,9 +49,3 @@ type ResetPasswordRequest struct {
 	ID       string `json:"_id"`
 	Password string `json:"password"`
 }
-
-// CheckTokenSupplierUserPayload ...
-type CheckTokenSupplierUserPayload struct {
-	Token       string   `json:"token"`
-	Permissions []string `json:"permissions"`
-}
--- a/model/supplier_user_response.go
+++ b/model/supplier_user_response.go
@ -11,16 +11,3 @@ type CreateStaffResponse struct {
 type ResetPasswordResponse struct {
 	Password string `json:"password"`
 }
-
-// ResponseCheckTokenSupplierUser ...
-type ResponseCheckTokenSupplierUser struct {
-	IsValid bool                     `json:"isValid"`
-	Reason  string                   `json:"reason"`
-	User    ResponseSupplierUserInfo `json:"supplier"`
-}
-
-type ResponseSupplierUserInfo struct {
-	ID         string `json:"_id"`
-	Name       string `json:"name"`
-	SupplierID string `json:"supplierId"`
-}
--- a/model/warehouse_request.go
+++ b/model/warehouse_request.go
@ -37,12 +37,11 @@ type InsuranceOpts struct {

 // OutboundRequestItem ...
 type OutboundRequestItem struct {
-	SupplierSKU        string  `json:"supplierSKU"`
-	Quantity           int64   `json:"quantity"`
-	UnitCode           string  `json:"unitCode"`
-	Price              float64 `json:"price"`
-	Name               string  `json:"name"`
-	PartnerProductCode string  `json:"partnerProductCode"`
+	SupplierSKU string  `json:"supplierSKU"`
+	Quantity    int64   `json:"quantity"`
+	UnitCode    string  `json:"unitCode"`
+	Price       float64 `json:"price"`
+	Name        string  `json:"name"`
 }

 // CustomerInfo ...
@ -64,12 +63,11 @@ type AddressDetail struct {

 // UpdateOutboundRequestLogisticInfoPayload ...
 type UpdateOutboundRequestLogisticInfoPayload struct {
-	ShippingLabel  string `json:"shippingLabel,omitempty"`
-	TrackingCode   string `json:"trackingCode,omitempty"`
-	ORCode         string `json:"orCode,omitempty"`
-	TPLCode        string `json:"tplCode,omitempty"`
-	OrderID        string `json:"orderId"`
-	DeliveryStatus string `json:"deliveryStatus,omitempty"`
+	ShippingLabel string `json:"shippingLabel"`
+	TrackingCode  string `json:"trackingCode"`
+	ORCode        string `json:"orCode"`
+	TPLCode       string `json:"tplCode"`
+	OrderID       string `json:"orderId"`
 }

 // CancelOutboundRequest ...
@ -99,11 +97,10 @@ type SupplierIsClosed struct {

 // GetWarehousesRequest ...
 type GetWarehousesRequest struct {
-	Keyword      string   `json:"keyword"`
-	Status       string   `json:"status"`
-	Supplier     string   `json:"supplier"`
-	BusinessType string   `json:"businessType"`
-	IDs          []string `json:"ids"`
+	Keyword      string `json:"keyword"`
+	Status       string `json:"status"`
+	Supplier     string `json:"supplier"`
+	BusinessType string `json:"businessType"`

 	Page  int64 `json:"page"`
 	Limit int64 `json:"limit"`
@ -116,24 +113,3 @@ type WarehouseORUpdateDeliveryStatus struct {
 	OrderID        string `json:"orderId"`
 	DeliveryStatus string `json:"deliveryStatus"`
 }
-
-// UpdateStatusWarehousePendingInactiveRequest ...
-type UpdateStatusWarehousePendingInactiveRequest struct {
-	Warehouses []UpdateStatusWarehousePendingInactive `json:"warehouses"`
-}
-
-// UpdateIsSellyMallRequest ...
-type UpdateIsSellyMallRequest struct {
-	SupplierID string `json:"supplier"`
-}
-
-// UpdateStatusWarehousePendingInactive ...
-type UpdateStatusWarehousePendingInactive struct {
-	WarehouseID     string `json:"warehouse"`
-	PendingInactive bool   `json:"pendingInactive"`
-}
-
-type GetListWarehouseConfigReq struct {
-	PartnerCode         string `json:"partnerCode"`
-	PartnerIdentityCode string `json:"partnerIdentityCode"`
-}
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@ -61,28 +61,16 @@ type WarehouseSupplier struct {

 // WarehouseOrder ...
 type WarehouseOrder struct {
-	MinimumValue                   float64                         `json:"minimumValue"`
-	PaymentMethod                  WarehousePaymentMethod          `json:"paymentMethod"`
-	IsLimitNumberOfPurchases       bool                            `json:"isLimitNumberOfPurchases"`
-	LimitNumberOfPurchases         int64                           `json:"limitNumberOfPurchases"`
-	NotifyOnNewOrder               WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"`
-	LabelSize                      string                          `json:"labelSize"`
-	MaximumOrderValue              float64                         `json:"maximumOrderValue"`
-	MaximumNumberPerBuyerEachMonth int64                           `json:"maximumNumberPerBuyerEachMonth"`
-}
-
-// WarehouseConfigNotifyOnNewOrder ...
-type WarehouseConfigNotifyOnNewOrder struct {
-	Enable  bool   `bson:"enable" json:"enable"`
-	Channel string `bson:"channel" json:"channel"`
-	RoomID  string `bson:"roomId" json:"roomId"`
+	MinimumValue             float64                `json:"minimumValue"`
+	PaymentMethod            WarehousePaymentMethod `json:"paymentMethod"`
+	IsLimitNumberOfPurchases bool                   `json:"isLimitNumberOfPurchases"`
+	LimitNumberOfPurchases   int64                  `json:"limitNumberOfPurchases"`
 }

 // WarehousePaymentMethod ...
 type WarehousePaymentMethod struct {
 	Cod          bool `json:"cod"`
 	BankTransfer bool `json:"bankTransfer"`
-	Fundiin      bool `json:"fundiin"`
 }

 // WarehouseDelivery ...
@ -141,23 +129,19 @@ type ResponseLatLng struct {

 // WarehouseNatsResponse ...
 type WarehouseNatsResponse struct {
-	ID                    string                    `json:"_id"`
-	Staff                 string                    `json:"staff"`
-	BusinessType          string                    `json:"businessType"`
-	Name                  string                    `json:"name"`
-	SearchString          string                    `json:"searchString"`
-	Slug                  string                    `json:"slug"`
-	Status                string                    `json:"status"`
-	Supplier              string                    `json:"supplier"`
-	Contact               ResponseWarehouseContact  `json:"contact"`
-	Location              ResponseWarehouseLocation `json:"location"`
-	Configurations        WarehouseConfiguration    `json:"configurations"`
-	CreatedAt             time.Time                 `json:"createdAt"`
-	UpdatedAt             time.Time                 `json:"updatedAt"`
-	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
-	IsPendingInactive     bool                      `json:"isPendingInactive"`
-	IsFromInternational   bool                      `json:"isFromInternational"`
-	StoreCode             string                    `json:"storeCode"`
+	ID             string                    `json:"_id"`
+	Staff          string                    `json:"staff"`
+	BusinessType   string                    `json:"businessType"`
+	Name           string                    `json:"name"`
+	SearchString   string                    `json:"searchString"`
+	Slug           string                    `json:"slug"`
+	Status         string                    `json:"status"`
+	Supplier       string                    `json:"supplier"`
+	Contact        ResponseWarehouseContact  `json:"contact"`
+	Location       ResponseWarehouseLocation `json:"location"`
+	Configurations WarehouseConfiguration    `json:"configurations"`
+	CreatedAt      time.Time                 `json:"createdAt"`
+	UpdatedAt      time.Time                 `json:"updatedAt"`
 }

 // WarehouseInfo ...
@ -186,9 +170,3 @@ type GetWarehousesResponse struct {
 	Limit int64           `json:"limit"`
 	List  []WarehouseInfo `json:"list"`
 }
-
-type GetListWarehouseConfigRes struct {
-	Total int64                    `json:"total"`
-	Limit int64                    `json:"limit"`
-	List  []WarehouseConfiguration `json:"list"`
-}
--- a/subject/affiliate.go
+++ b/subject/affiliate.go
@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getAffiliateValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Affiliate, val)
-}
-
-var Affiliate = struct {
-	GetTransactions string
-}{
-	GetTransactions: getAffiliateValue("get_transactions"),
-}
--- a/subject/campaign.go
+++ b/subject/campaign.go
@ -10,8 +10,6 @@ func getCampaignValue(val string) string {
 // Campaign ...
 var Campaign = struct {
 	GetListCampaignTransactionAdminInfoByIDs string
-	GetCampaignSellerStatisticBySellerIDs    string
 }{
 	GetListCampaignTransactionAdminInfoByIDs: getCampaignValue("get_list_campaign_transaction_admin_info_by_ids"),
-	GetCampaignSellerStatisticBySellerIDs:    getCampaignValue("get_campaign_seller_statistic_by_seller_ids"),
 }
--- a/subject/config.go
+++ b/subject/config.go
@ -13,12 +13,7 @@ var prefixes = struct {
 	SupplierRole  string
 	SocialPost    string
 	Staff         string
-	Segment       string
-	Product       string
-	Queue         string
 	Campaign      string
-	Affiliate     string
-	Socket        string
 }{
 	Communication: "communication",
 	Order:         "order",
@ -32,10 +27,5 @@ var prefixes = struct {
 	SupplierRole:  "supplier_role",
 	SocialPost:    "social_post",
 	Staff:         "staff",
-	Segment:       "segment",
-	Product:       "product",
-	Queue:         "queue",
 	Campaign:      "campaign",
-	Affiliate:     "affiliate",
-	Socket:        "socket",
 }
--- a/subject/location.go
+++ b/subject/location.go
@ -7,43 +7,13 @@ func getLocationValue(val string) string {
 }

 var Location = struct {
-	GetLocationByCode                      string
-	GetLocationByCodeFromLocationService   string
-	GetLocationByWardCode                  string
-	GetProvincesByCodes                    string
-	GetProvincesByCodesFromLocationService string
-	GetDistrictsByCodes                    string
-	GetDistrictsByCodesFromLocationService string
-	GetWardsByCodes                        string
-	GetWardsByCodesFromLocationService     string
-	GetProvinceByCondition                 string
-	GetProvincesByCondition                string
-	GetDistrictByCondition                 string
-	GetDistrictsByCondition                string
-	GetWardByCondition                     string
-	GetWardsByCondition                    string
-	CountProvinceByCondition               string
-	CountDistrictByCondition               string
-	CountWardByCondition                   string
-	ProvinceDistinctWithField              string
+	GetLocationByCode   string
+	GetProvincesByCodes string
+	GetDistrictsByCodes string
+	GetWardsByCodes     string
 }{
-	GetLocationByCode:                      getLocationValue("get_location_warehouse"),
-	GetLocationByCodeFromLocationService:   getLocationValue("get_location_warehouse_from_location_service"),
-	GetLocationByWardCode:                  getLocationValue("get_location_by_ward_code"),
-	GetProvincesByCodes:                    getLocationValue("get_provinces_by_codes"),
-	GetProvincesByCodesFromLocationService: getLocationValue("get_provinces_by_codes_from_location_service"),
-	GetDistrictsByCodes:                    getLocationValue("get_districts_by_codes"),
-	GetDistrictsByCodesFromLocationService: getLocationValue("get_districts_by_codes_from_location_service"),
-	GetWardsByCodes:                        getLocationValue("get_wards_by_codes"),
-	GetWardsByCodesFromLocationService:     getLocationValue("get_wards_by_codes_from_location_service"),
-	GetProvinceByCondition:                 getLocationValue("get_province_by_condition"),
-	GetProvincesByCondition:                getLocationValue("get_provinces_by_condition"),
-	GetDistrictByCondition:                 getLocationValue("get_district_by_condition"),
-	GetDistrictsByCondition:                getLocationValue("get_districts_byCondition"),
-	GetWardByCondition:                     getLocationValue("get_ward_by_condition"),
-	GetWardsByCondition:                    getLocationValue("get_wards_by_condition"),
-	CountProvinceByCondition:               getLocationValue("count_province_by_condition"),
-	CountDistrictByCondition:               getLocationValue("count_district_by_condition"),
-	CountWardByCondition:                   getLocationValue("count_ward_by_condition"),
-	ProvinceDistinctWithField:              getLocationValue("province_distinct_with_field"),
+	GetLocationByCode:   getLocationValue("get_location_warehouse"),
+	GetProvincesByCodes: getLocationValue("get_provinces_by_codes"),
+	GetDistrictsByCodes: getLocationValue("get_districts_by_codes"),
+	GetWardsByCodes:     getLocationValue("get_wards_by_codes"),
 }
--- a/subject/order.go
+++ b/subject/order.go
@ -7,19 +7,17 @@ func getOrderValue(val string) string {
 }

 var Order = struct {
-	UpdateORStatus            string
-	GetUserTotalWarningOrders string
-	CancelDelivery            string
-	ChangeDeliveryStatus      string
-	UpdateLogisticInfoFailed  string
-	ORNotUpdateStatus         string
-	GetSupplierOrders         string
+	UpdateORStatus           string
+	CancelDelivery           string
+	ChangeDeliveryStatus     string
+	UpdateLogisticInfoFailed string
+	ORNotUpdateStatus        string
+	GetSupplierOrders        string
 }{
-	UpdateORStatus:            getOrderValue("update_outbound_request_status"),
-	GetUserTotalWarningOrders: getOrderValue("get_user_total_warning_orders"),
-	CancelDelivery:            getOrderValue("cancel_delivery"),
-	ChangeDeliveryStatus:      getOrderValue("change_delivery_status"),
-	UpdateLogisticInfoFailed:  getOrderValue("update_logistic_info_failed"),
-	ORNotUpdateStatus:         getOrderValue("outbound_request_not_update_status"),
-	GetSupplierOrders:         getOrderValue("get_supplier_orders"),
+	UpdateORStatus:           getOrderValue("update_outbound_request_status"),
+	CancelDelivery:           getOrderValue("cancel_delivery"),
+	ChangeDeliveryStatus:     getOrderValue("change_delivery_status"),
+	UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),
+	ORNotUpdateStatus:        getOrderValue("outbound_request_not_update_status"),
+	GetSupplierOrders:        getOrderValue("get_supplier_orders"),
 }
--- a/subject/product.go
+++ b/subject/product.go
@ -1,26 +0,0 @@
-package subject
-
-import "fmt"
-
-// getSegmentValue ...
-func getProductValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Product, val)
-}
-
-var Product = struct {
-	ApplyRequest                                        string
-	CreateRequestStep                                   string
-	ProcessApplyRequest                                 string
-	RequestChangeStatus                                 string
-	WebhookStockUpdate                                  string // WebhookStockUpdate Kiotviet queue
-	OPWebhookStockUpdate                                string // OPWebhookStockUpdate Onpoint queue
-	OrderPaymentBankTransferWebhookCheckAndUpdateStatus string
-}{
-	ApplyRequest:         getProductValue("apply_request"),
-	CreateRequestStep:    getProductValue("create_request_step"),
-	ProcessApplyRequest:  getProductValue("process_apply_request"),
-	RequestChangeStatus:  getProductValue("request_change_status"),
-	WebhookStockUpdate:   getProductValue("webhook_stock_update"),
-	OPWebhookStockUpdate: getProductValue("op_webhook_stock_update"),
-	OrderPaymentBankTransferWebhookCheckAndUpdateStatus: getProductValue("order_payment_bank_transfer_webhook_check_and_update_status"),
-}
--- a/subject/queue.go
+++ b/subject/queue.go
@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getQueueValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Queue, val)
-}
-
-var Queue = struct {
-	ScheduleTask string
-}{
-	ScheduleTask: getQueueValue("schedule_task"),
-}
--- a/subject/segment.go
+++ b/subject/segment.go
@ -1,15 +0,0 @@
-package subject
-
-import "fmt"
-
-// getSegmentValue ...
-func getSegmentValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Segment, val)
-}
-
-// Segment ...
-var Segment = struct {
-	GetListSegmentInfo string
-}{
-	GetListSegmentInfo: getSegmentValue("get_list_segment_info"),
-}
--- a/subject/socket.go
+++ b/subject/socket.go
@ -1,16 +0,0 @@
-package subject
-
-import "fmt"
-
-func getSocketValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Socket, val)
-}
-
-// Socket ...
-var Socket = struct {
-	EmitEventReward string
-	EmitEventToUser string
-}{
-	EmitEventReward: getSocketValue("emit_event_reward"),
-	EmitEventToUser: "send_message_to_socket",
-}
--- a/subject/supplier.go
+++ b/subject/supplier.go
@ -8,16 +8,10 @@ func getSupplierValue(val string) string {

 var Supplier = struct {
 	GetListSupplierInfo             string
-	GetDetailSupplierInfo           string
 	GetSupplierContractBySupplierID string
 	FindAll                         string
-	FindAllOld                      string
-	Count                           string
 }{
 	GetListSupplierInfo:             getSupplierValue("get_list_supplier_info"),
-	GetDetailSupplierInfo:           getSupplierValue("get_detail_supplier_info"),
 	GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
 	FindAll:                         getSupplierValue("find_all"),
-	FindAllOld:                      getSupplierValue("find_all_old"),
-	Count:                           getSupplierValue("count"),
 }
--- a/subject/supplier_user.go
+++ b/subject/supplier_user.go
@ -8,20 +8,18 @@ func getSupplierUserValue(val string) string {

 var SupplierUser = struct {
 	// Users
-	CreateOwner            string
-	UpdateOwner            string
-	CreateStaff            string
-	UpdateStaff            string
-	UpdateStatus           string
-	ResetPassword          string
-	CheckTokenSupplierUser string
+	CreateOwner   string
+	UpdateOwner   string
+	CreateStaff   string
+	UpdateStaff   string
+	UpdateStatus  string
+	ResetPassword string
 }{
 	// Users
-	CreateOwner:            getSupplierUserValue("create_owner"),
-	UpdateOwner:            getSupplierUserValue("update_owner"),
-	CreateStaff:            getSupplierUserValue("create_staff"),
-	UpdateStaff:            getSupplierUserValue("update_staff"),
-	UpdateStatus:           getSupplierUserValue("update_status"),
-	ResetPassword:          getSupplierUserValue("reset_password"),
-	CheckTokenSupplierUser: getSupplierUserValue("check_token_supplier_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"),
 }
--- a/subject/warehouse.go
+++ b/subject/warehouse.go
@ -1,63 +1,49 @@
 package subject

-import (
-	"fmt"
-)
+import "fmt"

 func getWarehouseValue(val string) string {
 	return fmt.Sprintf("%s.%s", prefixes.Warehouse, val)
 }

 var Warehouse = struct {
-	CreateWarehouseIntoServiceSupplier   string
-	UpdateWarehouseIntoServiceSupplier   string
-	CreateOutboundRequest                string
-	UpdateOutboundRequestLogistic        string
-	CancelOutboundRequest                string
-	GetConfiguration                     string
-	SyncORStatus                         string
-	WebhookTNC                           string
-	WebhookGlobalCare                    string
-	WebhookOnPoint                       string
-	WebhookViettelFFM                    string
-	FindOne                              string
-	FindByCondition                      string
-	Distinct                             string
-	Count                                string
-	AfterUpdateWarehouse                 string
-	AfterCreateWarehouse                 string
-	UpdateIsClosedSupplier               string
-	GetWarehouses                        string
-	UpdateORDeliveryStatus               string
-	UpdateStatusWarehousePendingInactive string
-	UpdateIsSellyMall                    string
-	UpdateWarehouseConfig                string
-	BulkWriteWarehouseConfig             string
-	GetListWarehouseConfig               string
+	CreateWarehouseIntoServiceSupplier string
+	UpdateWarehouseIntoServiceSupplier string
+	CreateOutboundRequest              string
+	UpdateOutboundRequestLogistic      string
+	CancelOutboundRequest              string
+	GetConfiguration                   string
+	SyncORStatus                       string
+	WebhookTNC                         string
+	WebhookGlobalCare                  string
+	WebhookOnPoint                     string
+	FindOne                            string
+	FindByCondition                    string
+	Distinct                           string
+	Count                              string
+	AfterUpdateWarehouse               string
+	AfterCreateWarehouse               string
+	UpdateIsClosedSupplier             string
+	GetWarehouses                      string
+	UpdateORDeliveryStatus             string
 }{
-	CreateWarehouseIntoServiceSupplier:   getWarehouseValue("create_warehouse_into_service_supplier"),
-	UpdateWarehouseIntoServiceSupplier:   getWarehouseValue("update_warehouse_into_service_supplier"),
-	AfterCreateWarehouse:                 getWarehouseValue("after_create_warehouse"),
-	AfterUpdateWarehouse:                 getWarehouseValue("after_update_warehouse"),
-	CreateOutboundRequest:                getWarehouseValue("create_outbound_request"),
-	UpdateOutboundRequestLogistic:        getWarehouseValue("update_outbound_request_logistic_info"),
-	CancelOutboundRequest:                getWarehouseValue("cancel_outbound_request"),
-	GetConfiguration:                     getWarehouseValue("get_configuration"),
-	SyncORStatus:                         getWarehouseValue("sync_or_status"),
-	WebhookTNC:                           getWarehouseValue("webhook_tnc"),
-	WebhookGlobalCare:                    getWarehouseValue("webhook_global_care"),
-	WebhookOnPoint:                       getWarehouseValue("webhook_on_point"),
-	WebhookViettelFFM:                    getWarehouseValue("webhook_viettel_ffm"),
-	FindOne:                              getWarehouseValue("find_one"),
-	FindByCondition:                      getWarehouseValue("find_all_by_condition"),
-	Distinct:                             getWarehouseValue("distinct"),
-	Count:                                getWarehouseValue("count"),
-	UpdateIsClosedSupplier:               getWarehouseValue("update_is_closed_supplier"),
-	GetWarehouses:                        getWarehouseValue("get_warehouses"),
-	UpdateORDeliveryStatus:               getWarehouseValue("update_or_delivery_status"),
-	UpdateStatusWarehousePendingInactive: getWarehouseValue("update_status_warehouse_pending_inactive"),
-	UpdateIsSellyMall:                    getWarehouseValue("update_is_selly_mall"),
-	UpdateWarehouseConfig:                getWarehouseValue("update_warehouse_config"),
-	BulkWriteWarehouseConfig:             getWarehouseValue("bulk_write_warehouse_config"),
-	GetListWarehouseConfig:               getWarehouseValue("get_list_warehouse_config"),
+	CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
+	UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
+	AfterCreateWarehouse:               getWarehouseValue("after_create_warehouse"),
+	AfterUpdateWarehouse:               getWarehouseValue("after_update_warehouse"),
+	CreateOutboundRequest:              getWarehouseValue("create_outbound_request"),
+	UpdateOutboundRequestLogistic:      getWarehouseValue("update_outbound_request_logistic_info"),
+	CancelOutboundRequest:              getWarehouseValue("cancel_outbound_request"),
+	GetConfiguration:                   getWarehouseValue("get_configuration"),
+	SyncORStatus:                       getWarehouseValue("sync_or_status"),
+	WebhookTNC:                         getWarehouseValue("webhook_tnc"),
+	WebhookGlobalCare:                  getWarehouseValue("webhook_global_care"),
+	WebhookOnPoint:                     getWarehouseValue("webhook_on_point"),
+	FindOne:                            getWarehouseValue("find_one"),
+	FindByCondition:                    getWarehouseValue("find_all_by_condition"),
+	Distinct:                           getWarehouseValue("distinct"),
+	Count:                              getWarehouseValue("count"),
+	UpdateIsClosedSupplier:             getWarehouseValue("update_is_closed_supplier"),
+	GetWarehouses:                      getWarehouseValue("get_warehouses"),
+	UpdateORDeliveryStatus:             getWarehouseValue("update_or_delivery_status"),
 }