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

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

@@ -28,17 +28,10 @@ type (
 
 	// LocationWard ...
 	LocationWard struct {
-		ID       string       `json:"id"`
-		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"`
+		ID   string `json:"id"`
+		Name string `json:"name"`
+		Code int    `json:"code"`
+		Slug string `json:"slug"`
 	}
 
 	// LocationProvinceResponse ...
@@ -83,13 +76,12 @@ type (
 
 	// 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"`
+		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"`
 	}
 )

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 ...
@@ -132,8 +130,3 @@ 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

@@ -61,14 +61,11 @@ 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"`
+	MinimumValue             float64                         `json:"minimumValue"`
+	PaymentMethod            WarehousePaymentMethod          `json:"paymentMethod"`
+	IsLimitNumberOfPurchases bool                            `json:"isLimitNumberOfPurchases"`
+	LimitNumberOfPurchases   int64                           `json:"limitNumberOfPurchases"`
+	NotifyOnNewOrder         WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"`
 }
 
 // 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/product.go

@@ -8,19 +8,13 @@ func getProductValue(val string) string {
 }
 
 var Product = struct {
-	ApplyRequest                                        string
-	CreateRequestStep                                   string
-	ProcessApplyRequest                                 string
-	RequestChangeStatus                                 string
-	WebhookStockUpdate                                  string // WebhookStockUpdate Kiotviet queue
-	OPWebhookStockUpdate                                string // OPWebhookStockUpdate Onpoint queue
-	OrderPaymentBankTransferWebhookCheckAndUpdateStatus string
+	ApplyRequest        string
+	CreateRequestStep   string
+	ProcessApplyRequest string
+	RequestChangeStatus 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"),
+	ApplyRequest:        getProductValue("apply_request"),
+	CreateRequestStep:   getProductValue("create_request_step"),
+	ProcessApplyRequest: getProductValue("process_apply_request"),
+	RequestChangeStatus: getProductValue("request_change_status"),
 }

subject/warehouse.go

@@ -19,7 +19,6 @@ var Warehouse = struct {
 	WebhookTNC                           string
 	WebhookGlobalCare                    string
 	WebhookOnPoint                       string
-	WebhookViettelFFM                    string
 	FindOne                              string
 	FindByCondition                      string
 	Distinct                             string
@@ -31,9 +30,6 @@ var Warehouse = struct {
 	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 +43,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"),
@@ -57,7 +52,4 @@ var Warehouse = struct {
 	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"),
 }