.gitignore

@@ -15,4 +15,3 @@
 # vendor/
 
 .idea
-*.DS_Store

client/promotion.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"
-)
-
-type Promotion struct{}
-
-func GetPromotion() Promotion {
-	return Promotion{}
-}
-
-func (s Promotion) GenerateVoucherPromotion(p model.GenerateVoucherPromotionRequest) (*model.ResponseGenerateVoucherPromotion, error) {
-	msg, err := natsio.GetServer().Request(subject.Promotion.GenerateVoucherPromotion, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseGenerateVoucherPromotion `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/seller.go

@@ -9,12 +9,15 @@ import (
 	"git.selly.red/Selly-Modules/natsio/subject"
 )
 
+// Seller ...
 type Seller struct{}
 
+// GetSeller ...
 func GetSeller() Seller {
 	return Seller{}
 }
 
+// GetSellerInfoByID ...
 func (s Seller) GetSellerInfoByID(p model.GetSellerByIDRequest) (*model.ResponseSellerInfo, error) {
 	msg, err := natsio.GetServer().Request(subject.Seller.GetSellerInfoByID, toBytes(p))
 	if err != nil {
@@ -37,6 +40,7 @@ func (s Seller) GetSellerInfoByID(p model.GetSellerByIDRequest) (*model.Response
 	return r.Data, nil
 }
 
+// GetListSellerInfoByIDs ...
 func (s Seller) GetListSellerInfoByIDs(p model.GetListSellerByIDsRequest) (*model.ResponseListSellerInfo, error) {
 	msg, err := natsio.GetServer().Request(subject.Seller.GetListSellerInfoByIDs, toBytes(p))
 
@@ -60,6 +64,7 @@ func (s Seller) GetListSellerInfoByIDs(p model.GetListSellerByIDsRequest) (*mode
 	return r.Data, nil
 }
 
+// GetListSellerInfoSupportChatByIDs ...
 func (s Seller) GetListSellerInfoSupportChatByIDs(p model.GetListSellerSupportChatByIDsRequest) (*model.ResponseListSellerInfoSupportChat, error) {
 	msg, err := natsio.GetServer().Request(subject.SupportChat.GetListSellerInfoSupportChatByIDs, toBytes(p))
 	if err != nil {
@@ -80,69 +85,3 @@ func (s Seller) GetListSellerInfoSupportChatByIDs(p model.GetListSellerSupportCh
 	}
 	return r.Data, nil
 }
-
-func (s Seller) CheckAndInsertCashflows(p model.CheckAndInsertCashflowsRequest) (*model.ResponseCheckAndInsertCashflows, error) {
-	msg, err := natsio.GetServer().Request(subject.Seller.CheckAndInsertCashflows, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseCheckAndInsertCashflows `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 Seller) UpdateSellerAffiliateStatistic(p model.UpdateSellerAffiliateStatisticRequest) (*model.ResponseUpdateSellerAffiliateStatistic, error) {
-	msg, err := natsio.GetServer().Request(subject.Seller.UpdateSellerAffiliateStatistic, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseUpdateSellerAffiliateStatistic `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 Seller) UpdateSellerSavingCampaignStatistic(p model.UpdateSellerSavingCampaignStatisticRequest) (*model.ResponseUpdateSellerSavingCampaignStatistic, error) {
-	msg, err := natsio.GetServer().Request(subject.Seller.UpdateSellerSavingCampaignStatistic, toBytes(p))
-	if err != nil {
-		return nil, err
-	}
-
-	var r struct {
-		Data  *model.ResponseUpdateSellerSavingCampaignStatistic `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/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))
@@ -221,23 +202,3 @@ func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWare
 	}
 	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
-}

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
-}

model/common_request.go

@@ -43,14 +43,3 @@ type RequestCondition struct {
 	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
-}

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 ...

model/location_response.go

@@ -32,13 +32,6 @@ type (
 		Name string `json:"name"`
 		Code int    `json:"code"`
 		Slug string `json:"slug"`
-		Location *GEOLocation `json:"location"`
-	}
-
-	// GEOLocation ...
-	GEOLocation struct {
-		Type        string    `bson:"type" json:"type"`
-		Coordinates []float64 `bson:"coordinates" json:"coordinates"`
 	}
 
 	// LocationProvinceResponse ...
@@ -90,6 +83,5 @@ type (
 		Code         int      `json:"code"`
 		DistrictCode int      `json:"districtCode"`
 		ProvinceCode int      `json:"provinceCode"`
-		Location     *GEOLocation `json:"location"`
 	}
 )

model/promotion_response.go

@@ -1,20 +0,0 @@
-package model
-
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
-type GenerateVoucherPromotionRequest struct {
-	Cash       float64                         `json:"cash"`
-	TargetID   primitive.ObjectID              `json:"targetId"`
-	TargetType string                          `json:"targetType"`
-	Options    GenerateVoucherPromotionOptions `json:"options"`
-	Seller     primitive.ObjectID              `json:"seller"`
-}
-
-type GenerateVoucherPromotionOptions struct {
-	Title string `json:"title"`
-}
-
-type ResponseGenerateVoucherPromotion struct {
-	Success bool   `json:"success"`
-	Error   string `json:"error"`
-}

model/seller_request.go

@@ -2,73 +2,17 @@ package model
 
 import "go.mongodb.org/mongo-driver/bson/primitive"
 
+// GetSellerByIDRequest ...
 type GetSellerByIDRequest struct {
 	SellerID primitive.ObjectID `json:"sellerId"`
 }
 
+// GetListSellerByIDsRequest ...
 type GetListSellerByIDsRequest struct {
 	SellerIDs []primitive.ObjectID `json:"sellerIds"`
 }
 
+// GetListSellerSupportChatByIDsRequest ...
 type GetListSellerSupportChatByIDsRequest struct {
 	SellerIDs []primitive.ObjectID `json:"sellerIds"`
 }
-
-type CheckAndInsertCashflowsRequest struct {
-	SellerID string           `json:"sellerId"`
-	List     []CashflowSeller `json:"list"`
-}
-
-type CashflowSeller struct {
-	Value      float64          `json:"value"`
-	Action     string           `json:"action"`
-	Category   string           `json:"category"`
-	TargetID   string           `json:"targetId"`
-	TargetType string           `json:"targetType"`
-	Options    *CashFlowOptions `json:"options"`
-}
-
-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"`
-}
-
-type UpdateSellerAffiliateStatisticRequest struct {
-	SellerID  string                   `json:"sellerId"`
-	Statistic SellerAffiliateStatistic `json:"statistic"`
-}
-
-type SellerAffiliateStatistic struct {
-	TransactionTotal              int     `json:"transactionTotal"`
-	TransactionCashback           int     `json:"transactionCashback"`
-	TransactionPending            int     `json:"transactionPending"`
-	TransactionApproved           int     `json:"transactionApproved"`
-	TransactionRejected           int     `json:"transactionRejected"`
-	CommissionTransactionTotal    float64 `json:"commissionTransactionTotal"`
-	CommissionTransactionCashback float64 `json:"commissionTransactionCashback"`
-	CommissionTransactionApproved float64 `json:"commissionTransactionApproved"`
-	CommissionTransactionPending  float64 `json:"commissionTransactionPending"`
-	CommissionTransactionRejected float64 `json:"commissionTransactionRejected"`
-}
-
-type UpdateSellerSavingCampaignStatisticRequest struct {
-	SellerID  string                        `json:"sellerId"`
-	Statistic SellerSavingCampaignStatistic `json:"statistic"`
-}
-
-type SellerSavingCampaignStatistic struct {
-	SavingCampaignCashPending   float64 `json:"savingCampaignCashPending"`
-	SavingCampaignCashCompleted float64 `json:"savingCampaignCashCompleted"`
-}

model/seller_response.go

@@ -90,18 +90,3 @@ type SellerMembershipInfo struct {
 	Level int    `json:"level"`
 	Name  string `json:"name"`
 }
-
-type ResponseCheckAndInsertCashflows struct {
-	Success bool   `json:"success"`
-	Error   string `json:"error"`
-}
-
-type ResponseUpdateSellerAffiliateStatistic struct {
-	Success bool   `json:"success"`
-	Error   string `json:"error"`
-}
-
-type ResponseUpdateSellerSavingCampaignStatistic struct {
-	Success bool   `json:"success"`
-	Error   string `json:"error"`
-}

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 ...

model/warehouse_request.go

@@ -42,7 +42,6 @@ type OutboundRequestItem struct {
 	UnitCode    string  `json:"unitCode"`
 	Price       float64 `json:"price"`
 	Name        string  `json:"name"`
-	PartnerProductCode string  `json:"partnerProductCode"`
 }
 
 // CustomerInfo ...
@@ -64,12 +63,11 @@ type AddressDetail struct {
 
 // UpdateOutboundRequestLogisticInfoPayload ...
 type UpdateOutboundRequestLogisticInfoPayload struct {
-	ShippingLabel  string `json:"shippingLabel,omitempty"`
+	ShippingLabel string `json:"shippingLabel"`
-	TrackingCode   string `json:"trackingCode,omitempty"`
+	TrackingCode  string `json:"trackingCode"`
-	ORCode         string `json:"orCode,omitempty"`
+	ORCode        string `json:"orCode"`
-	TPLCode        string `json:"tplCode,omitempty"`
+	TPLCode       string `json:"tplCode"`
 	OrderID       string `json:"orderId"`
-	DeliveryStatus string `json:"deliveryStatus,omitempty"`
 }
 
 // CancelOutboundRequest ...
@@ -122,18 +120,8 @@ 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"`
-}

model/warehouse_response.go

@@ -66,9 +66,6 @@ type WarehouseOrder struct {
 	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 ...
@@ -156,8 +153,6 @@ type WarehouseNatsResponse struct {
 	UpdatedAt             time.Time                 `json:"updatedAt"`
 	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
 	IsPendingInactive     bool                      `json:"isPendingInactive"`
-	IsFromInternational   bool                      `json:"isFromInternational"`
-	StoreCode             string                    `json:"storeCode"`
 }
 
 // WarehouseInfo ...
@@ -186,9 +181,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"`
-}

subject/config.go

@@ -19,7 +19,6 @@ var prefixes = struct {
 	Campaign      string
 	Affiliate     string
 	Socket        string
-	Promotion     string
 }{
 	Communication: "communication",
 	Order:         "order",
@@ -39,5 +38,4 @@ var prefixes = struct {
 	Campaign:      "campaign",
 	Affiliate:     "affiliate",
 	Socket:        "socket",
-	Promotion:     "promotion",
 }

subject/product.go

@@ -12,15 +12,9 @@ var Product = struct {
 	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"),
 }

subject/promotion.go

@@ -1,13 +0,0 @@
-package subject
-
-import "fmt"
-
-func getPromotionValue(val string) string {
-	return fmt.Sprintf("%s.%s", prefixes.Promotion, val)
-}
-
-var Promotion = struct {
-	GenerateVoucherPromotion string
-}{
-	GenerateVoucherPromotion: getPromotionValue("generate_voucher_promotion"),
-}

subject/seller.go

@@ -10,15 +10,9 @@ func getSellerValue(val string) string {
 var Seller = struct {
 	GetSellerInfoByID      string
 	GetListSellerInfoByIDs string
-	CheckAndInsertCashflows             string
-	UpdateSellerAffiliateStatistic      string
-	UpdateSellerSavingCampaignStatistic string
 }{
 	GetSellerInfoByID:      getSellerValue("get_seller_info_by_id"),
 	GetListSellerInfoByIDs: getSellerValue("get_list_seller_info_by_ids"),
-	CheckAndInsertCashflows:             getSellerValue("check_and_insert_cashflows"),
-	UpdateSellerAffiliateStatistic:      getSellerValue("update_seller_affiliate_statistic"),
-	UpdateSellerSavingCampaignStatistic: getSellerValue("update_seller_saving_campaign_statistic"),
 }
 
 // SupportChat ...

subject/warehouse.go

@@ -19,7 +19,6 @@ var Warehouse = struct {
 	WebhookTNC                           string
 	WebhookGlobalCare                    string
 	WebhookOnPoint                       string
-	WebhookViettelFFM                    string
 	FindOne                              string
 	FindByCondition                      string
 	Distinct                             string
@@ -30,10 +29,6 @@ var Warehouse = struct {
 	GetWarehouses                        string
 	UpdateORDeliveryStatus               string
 	UpdateStatusWarehousePendingInactive string
-	UpdateIsSellyMall                    string
-	UpdateWarehouseConfig                string
-	BulkWriteWarehouseConfig             string
-	GetListWarehouseConfig               string
 }{
 	CreateWarehouseIntoServiceSupplier:   getWarehouseValue("create_warehouse_into_service_supplier"),
 	UpdateWarehouseIntoServiceSupplier:   getWarehouseValue("update_warehouse_into_service_supplier"),
@@ -47,7 +42,6 @@ var Warehouse = struct {
 	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"),
@@ -56,8 +50,4 @@ var Warehouse = struct {
 	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"),
 }