feat(order): enhance order status management and Protobuf definitions
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 7m46s
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 7m46s
- Added AdminNotes handling in UpdateOrderStatusCommandHandler to include delivery descriptions. - Updated DeliveryStatus enum to include ReadyForOfficePickup. - Enhanced GetCustomerOrderHistoryQueryHandler and UserOrderService to support new delivery status. - Updated Protobuf definitions for DeliveryStatus to reflect changes. - Bumped Protobuf project version to accommodate new features.
This commit is contained in:
@@ -99,7 +99,20 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
|
||||
|
||||
public override async Task<UpdateOrderStatusResponse> UpdateOrderStatus(UpdateOrderStatusRequest request, ServerCallContext context)
|
||||
{
|
||||
return await _dispatchRequestToCQRS.Handle<UpdateOrderStatusRequest, UpdateOrderStatusCommand, UpdateOrderStatusResponse>(request, context);
|
||||
// Proto DeliveryStatus ≠ Domain DeliveryStatus — نگاشت صریح لازم است
|
||||
var command = new UpdateOrderStatusCommand
|
||||
{
|
||||
OrderId = request.OrderId,
|
||||
DeliveryStatus = MapProtoDeliveryToDomain(request.DeliveryStatus),
|
||||
TrackingCode = request.TrackingCode,
|
||||
AdminNotes = request.AdminNotes
|
||||
};
|
||||
var result = await _sender.Send(command, context.CancellationToken);
|
||||
return new UpdateOrderStatusResponse
|
||||
{
|
||||
Success = result.Success,
|
||||
Message = result.Message ?? string.Empty
|
||||
};
|
||||
}
|
||||
|
||||
public override async Task<GetOrderByIdResponse> GetOrderById(GetOrderByIdRequest request, ServerCallContext context)
|
||||
@@ -466,8 +479,9 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
|
||||
DomainEnums.DeliveryStatus.Pending => DeliveryStatus.DeliveryProcessing,
|
||||
DomainEnums.DeliveryStatus.InTransit => DeliveryStatus.DeliveryShipped,
|
||||
DomainEnums.DeliveryStatus.Delivered => DeliveryStatus.DeliveryDelivered,
|
||||
DomainEnums.DeliveryStatus.Returned => DeliveryStatus.DeliveryCancelled,
|
||||
DomainEnums.DeliveryStatus.Cancelled => DeliveryStatus.DeliveryCancelled,
|
||||
DomainEnums.DeliveryStatus.ReadyForOfficePickup => DeliveryStatus.DeliveryReadyForOffice,
|
||||
DomainEnums.DeliveryStatus.Returned => DeliveryStatus.DeliveryReturned,
|
||||
_ => DeliveryStatus.DeliveryPending
|
||||
};
|
||||
|
||||
@@ -476,10 +490,23 @@ public class DiscountOrderService : DiscountOrderContract.DiscountOrderContractB
|
||||
/// </summary>
|
||||
private static DomainEnums.DeliveryStatus MapProtoDeliveryFilterToDomain(int protoDeliveryStatus) => protoDeliveryStatus switch
|
||||
{
|
||||
1 => DomainEnums.DeliveryStatus.Pending, // DELIVERY_PROCESSING
|
||||
2 => DomainEnums.DeliveryStatus.InTransit, // DELIVERY_SHIPPED
|
||||
3 => DomainEnums.DeliveryStatus.Delivered, // DELIVERY_DELIVERED
|
||||
4 => DomainEnums.DeliveryStatus.Cancelled, // DELIVERY_CANCELLED
|
||||
_ => DomainEnums.DeliveryStatus.None // DELIVERY_PENDING (0)
|
||||
1 => DomainEnums.DeliveryStatus.Pending, // DELIVERY_PROCESSING
|
||||
2 => DomainEnums.DeliveryStatus.InTransit, // DELIVERY_SHIPPED
|
||||
3 => DomainEnums.DeliveryStatus.Delivered, // DELIVERY_DELIVERED
|
||||
4 => DomainEnums.DeliveryStatus.Cancelled, // DELIVERY_CANCELLED
|
||||
5 => DomainEnums.DeliveryStatus.ReadyForOfficePickup, // DELIVERY_READY_FOR_OFFICE
|
||||
6 => DomainEnums.DeliveryStatus.Returned, // DELIVERY_RETURNED
|
||||
_ => DomainEnums.DeliveryStatus.None // DELIVERY_PENDING (0)
|
||||
};
|
||||
|
||||
private static DomainEnums.DeliveryStatus MapProtoDeliveryToDomain(DeliveryStatus status) => status switch
|
||||
{
|
||||
DeliveryStatus.DeliveryProcessing => DomainEnums.DeliveryStatus.Pending,
|
||||
DeliveryStatus.DeliveryShipped => DomainEnums.DeliveryStatus.InTransit,
|
||||
DeliveryStatus.DeliveryDelivered => DomainEnums.DeliveryStatus.Delivered,
|
||||
DeliveryStatus.DeliveryCancelled => DomainEnums.DeliveryStatus.Cancelled,
|
||||
DeliveryStatus.DeliveryReadyForOffice => DomainEnums.DeliveryStatus.ReadyForOfficePickup,
|
||||
DeliveryStatus.DeliveryReturned => DomainEnums.DeliveryStatus.Returned,
|
||||
_ => DomainEnums.DeliveryStatus.None
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1058,6 +1058,7 @@ public class UserOrderService : UserOrderContract.UserOrderContractBase
|
||||
Domain.Enums.DeliveryStatus.Delivered => "تحویل داده شده",
|
||||
Domain.Enums.DeliveryStatus.Returned => "مرجوع شده",
|
||||
Domain.Enums.DeliveryStatus.Cancelled => "لغو شده",
|
||||
Domain.Enums.DeliveryStatus.ReadyForOfficePickup => "آماده تحویل در دفتر",
|
||||
_ => status.ToString()
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user