From f9b2edb03247903d32c2bb21cc876e77406cf982 Mon Sep 17 00:00:00 2001 From: anbuiselly <105765792+anbuiselly@users.noreply.github.com> Date: Tue, 17 Jan 2023 11:20:27 +0700 Subject: [PATCH 1/4] update_pending_active_product_by_warehouse_ids --- client/warehouse.go | 20 ++++++++++ model/warehouse_request.go | 5 +++ subject/warehouse.go | 82 ++++++++++++++++++++------------------ 3 files changed, 68 insertions(+), 39 deletions(-) diff --git a/client/warehouse.go b/client/warehouse.go index fb391ca..52c08db 100644 --- a/client/warehouse.go +++ b/client/warehouse.go @@ -182,3 +182,23 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu } return nil } + +// UpdatePendingActiveProductByWarehouseIDs ... +func (w Warehouse) UpdatePendingActiveProductByWarehouseIDs(p model.UpdatePendingActiveProductRequest) error { + msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingActiveProductByWarehouseIDs, 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_pending_active_product_by_warehouse_ids %v", err) + } + if r.Error != "" { + return errors.New(r.Error) + } + return nil +} diff --git a/model/warehouse_request.go b/model/warehouse_request.go index b6cecb1..3a9fe6c 100644 --- a/model/warehouse_request.go +++ b/model/warehouse_request.go @@ -113,3 +113,8 @@ type WarehouseORUpdateDeliveryStatus struct { OrderID string `json:"orderId"` DeliveryStatus string `json:"deliveryStatus"` } + +// UpdatePendingActiveProductRequest ... +type UpdatePendingActiveProductRequest struct { + WarehouseIDs []string `json:"warehouseIDs"` +} diff --git a/subject/warehouse.go b/subject/warehouse.go index bb184b5..f031594 100644 --- a/subject/warehouse.go +++ b/subject/warehouse.go @@ -1,49 +1,53 @@ 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 - FindOne string - FindByCondition string - Distinct string - Count string - AfterUpdateWarehouse string - AfterCreateWarehouse string - UpdateIsClosedSupplier string - GetWarehouses string - UpdateORDeliveryStatus 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 + UpdatePendingActiveProductByWarehouseIDs 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"), + 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"), + UpdatePendingActiveProductByWarehouseIDs: getWarehouseValue("update_pending_active_product_by_warehouse_ids"), } From 9a30faa3a2cf10347a39f005513ac9fe89e0ac7e Mon Sep 17 00:00:00 2001 From: anbuiselly <105765792+anbuiselly@users.noreply.github.com> Date: Tue, 17 Jan 2023 11:35:38 +0700 Subject: [PATCH 2/4] edit update update_pending_in_active_product_by_warehouse_ids --- client/warehouse.go | 8 ++-- model/warehouse_request.go | 4 +- subject/warehouse.go | 80 +++++++++++++++++++------------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/client/warehouse.go b/client/warehouse.go index 52c08db..e0abf1c 100644 --- a/client/warehouse.go +++ b/client/warehouse.go @@ -183,9 +183,9 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu return nil } -// UpdatePendingActiveProductByWarehouseIDs ... -func (w Warehouse) UpdatePendingActiveProductByWarehouseIDs(p model.UpdatePendingActiveProductRequest) error { - msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingActiveProductByWarehouseIDs, toBytes(p)) +// UpdatePendingInActiveProductByWarehouseIDs ... +func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePendingInActiveProductRequest) error { + msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingInActiveProductByWarehouseIDs, toBytes(p)) if err != nil { return err } @@ -195,7 +195,7 @@ func (w Warehouse) UpdatePendingActiveProductByWarehouseIDs(p model.UpdatePendin } if err = json.Unmarshal(msg.Data, &r); err != nil { - return fmt.Errorf("nats: update_pending_active_product_by_warehouse_ids %v", err) + return fmt.Errorf("nats: update_pending_in_active_product_by_warehouse_ids %v", err) } if r.Error != "" { return errors.New(r.Error) diff --git a/model/warehouse_request.go b/model/warehouse_request.go index 3a9fe6c..7388d74 100644 --- a/model/warehouse_request.go +++ b/model/warehouse_request.go @@ -114,7 +114,7 @@ type WarehouseORUpdateDeliveryStatus struct { DeliveryStatus string `json:"deliveryStatus"` } -// UpdatePendingActiveProductRequest ... -type UpdatePendingActiveProductRequest struct { +// UpdatePendingInActiveProductRequest ... +type UpdatePendingInActiveProductRequest struct { WarehouseIDs []string `json:"warehouseIDs"` } diff --git a/subject/warehouse.go b/subject/warehouse.go index f031594..0e6837a 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 - UpdatePendingActiveProductByWarehouseIDs 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 + UpdatePendingInActiveProductByWarehouseIDs 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"), - UpdatePendingActiveProductByWarehouseIDs: getWarehouseValue("update_pending_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"), + UpdatePendingInActiveProductByWarehouseIDs: getWarehouseValue("update_pending_in_active_product_by_warehouse_ids"), } 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 3/4] 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"), } From 49156e576d0ad99942adb7f7cbc93b60e94b0981 Mon Sep 17 00:00:00 2001 From: anbuiselly <105765792+anbuiselly@users.noreply.github.com> Date: Tue, 17 Jan 2023 14:23:24 +0700 Subject: [PATCH 4/4] fix --- model/warehouse_request.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/warehouse_request.go b/model/warehouse_request.go index 1ec7f6d..e813d99 100644 --- a/model/warehouse_request.go +++ b/model/warehouse_request.go @@ -121,6 +121,6 @@ type UpdateStatusWarehousePendingInactiveRequest struct { // UpdateStatusWarehousePendingInactive ... type UpdateStatusWarehousePendingInactive struct { - WarehouseID string `json:"warehouse"` - Status string `json:"status"` + WarehouseID string `json:"warehouse"` + PendingInactive bool `json:"pendingInactive"` }