From 292c7733f0a8484d8243c473370009fc0704f66c Mon Sep 17 00:00:00 2001 From: anbuiselly <105765792+anbuiselly@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:15:27 +0700 Subject: [PATCH] edit struct update_status_warehouse_pending_inactive --- client/warehouse.go | 8 ++-- model/warehouse_request.go | 12 ++++-- subject/warehouse.go | 80 +++++++++++++++++++------------------- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/client/warehouse.go b/client/warehouse.go index e0abf1c..61639bb 100644 --- a/client/warehouse.go +++ b/client/warehouse.go @@ -183,9 +183,9 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu return nil } -// UpdatePendingInActiveProductByWarehouseIDs ... -func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePendingInActiveProductRequest) error { - msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingInActiveProductByWarehouseIDs, toBytes(p)) +// UpdateStatusWarehousePendingInactive ... +func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWarehousePendingInactiveRequest) error { + msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateStatusWarehousePendingInactive, toBytes(p)) if err != nil { return err } @@ -195,7 +195,7 @@ func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePend } if err = json.Unmarshal(msg.Data, &r); err != nil { - return fmt.Errorf("nats: update_pending_in_active_product_by_warehouse_ids %v", err) + return fmt.Errorf("nats: update_status_warehouse_pending_inactive %v", err) } if r.Error != "" { return errors.New(r.Error) diff --git a/model/warehouse_request.go b/model/warehouse_request.go index 7388d74..1ec7f6d 100644 --- a/model/warehouse_request.go +++ b/model/warehouse_request.go @@ -114,7 +114,13 @@ type WarehouseORUpdateDeliveryStatus struct { DeliveryStatus string `json:"deliveryStatus"` } -// UpdatePendingInActiveProductRequest ... -type UpdatePendingInActiveProductRequest struct { - WarehouseIDs []string `json:"warehouseIDs"` +// UpdateStatusWarehousePendingInactiveRequest ... +type UpdateStatusWarehousePendingInactiveRequest struct { + Warehouses []UpdateStatusWarehousePendingInactive `json:"warehouses"` +} + +// UpdateStatusWarehousePendingInactive ... +type UpdateStatusWarehousePendingInactive struct { + WarehouseID string `json:"warehouse"` + Status string `json:"status"` } diff --git a/subject/warehouse.go b/subject/warehouse.go index 0e6837a..4a63cc0 100644 --- a/subject/warehouse.go +++ b/subject/warehouse.go @@ -9,45 +9,45 @@ func getWarehouseValue(val string) string { } var Warehouse = struct { - 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 - UpdatePendingInActiveProductByWarehouseIDs 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 + UpdateStatusWarehousePendingInactive 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"), - 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"), - UpdatePendingInActiveProductByWarehouseIDs: getWarehouseValue("update_pending_in_active_product_by_warehouse_ids"), + 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"), + UpdateStatusWarehousePendingInactive: getWarehouseValue("update_status_warehouse_pending_inactive"), }