Order barista orders by place order timestamp (#4)

src/Barista/NCafe.Barista.Api/Program.cs

@@ -68,7 +68,10 @@ await mediator.Send(new PlaceOrder(
        // Notify clients
        await hubContext.Clients.All.SendAsync(
            "ReceiveOrder",
-           new Order(message.Id, message.OrderItems.Select(i => new NCafe.Shared.Hubs.OrderItem(i.Name, i.Quantity)).ToArray(), message.CustomerName));
+           new Order(message.Id,
+               message.OrderItems.Select(i => new NCafe.Shared.Hubs.OrderItem(i.Name, i.Quantity)).ToArray(),
+               message.CustomerName,
+               DateTimeOffset.Now));
    });
 
 app.MapDefaultEndpoints();

src/Barista/NCafe.Barista.Api/Projections/BaristaOrderProjectionService.cs

@@ -16,16 +16,21 @@ public BaristaOrderProjectionService(IProjectionService<BaristaOrder> projection
         {
             Id = @event.Id,
             CustomerName = @event.Customer,
+            OrderPlacedAt = @event.OrderPlacedAt,
             Items = @event.OrderItems.Select(item => new BaristaOrderItem
             {
                 Name = item.Name,
-                Quantity = item.Quantity
+                Quantity = item.Quantity,
             }).ToArray()
         });
 
         projectionService.OnUpdate<OrderPrepared>(
             order => order.Id,
-            (@event, order) => order.IsCompleted = true);
+            (@event, order) =>
+            {
+                order.IsCompleted = true;
+                order.OrderPreparedAt = @event.OrderPreparedAt;
+            });
     }
 
     protected async override Task ExecuteAsync(CancellationToken stoppingToken)

src/Barista/NCafe.Barista.Domain/Entities/BaristaOrder.cs

@@ -19,13 +19,16 @@ public BaristaOrder(Guid id, ValueObjects.OrderItem[] orderItems, string custome
         RaiseEvent(new OrderPlaced(id)
         {
             OrderItems = orderItems,
-            Customer = customer
+            Customer = customer,
+            OrderPlacedAt = DateTimeOffset.UtcNow,
         });
     }
 
     public IReadOnlyCollection<ValueObjects.OrderItem> Items { get; private set; }
     public string Customer { get; private set; }
     public bool IsCompleted { get; private set; }
+    public DateTimeOffset? OrderPlacedAt { get; private set; }
+    public DateTimeOffset? OrderPreparedAt { get; private set; }
 
     public void CompletePreparation()
     {
@@ -42,11 +45,13 @@ private void Apply(OrderPlaced @event)
         Id = @event.Id;
         Items = @event.OrderItems;
         Customer = @event.Customer;
+        OrderPlacedAt = @event.OrderPlacedAt;
         IsCompleted = false;
     }
 
     private void Apply(OrderPrepared @event)
     {
         IsCompleted = true;
+        OrderPreparedAt = @event.OrderPreparedAt;
     }
 }

src/Barista/NCafe.Barista.Domain/Events/OrderPlaced.cs

@@ -10,6 +10,7 @@ public OrderPlaced(Guid id)
         Id = id;
     }
 
+    public DateTimeOffset OrderPlacedAt { get; init; }
     public OrderItem[] OrderItems { get; init; }
     public string Customer { get; init; }
 }

src/Barista/NCafe.Barista.Domain/Events/OrderPrepared.cs

@@ -7,5 +7,8 @@ public sealed record OrderPrepared : Event
     public OrderPrepared(Guid id)
     {
         Id = id;
+        OrderPreparedAt = DateTimeOffset.UtcNow;
     }
+
+    public DateTimeOffset OrderPreparedAt { get; init; }
 }

src/Barista/NCafe.Barista.Domain/Queries/GetOrders.cs

@@ -13,8 +13,10 @@ internal sealed class GetOrdersHandler(IReadModelRepository<BaristaOrder> orderR
 
     public Task<BaristaOrder[]> Handle(GetOrders query, CancellationToken cancellationToken)
     {
-        var products = _orderRepository.GetAll()
+        var orders = _orderRepository.GetAll()
+            .Where(order => !order.IsCompleted)
+            .OrderBy(order => order.OrderPlacedAt)
             .ToArray();
-        return Task.FromResult(products);
+        return Task.FromResult(orders);
     }
 }

src/Barista/NCafe.Barista.Domain/ReadModels/BaristaOrder.cs

@@ -6,6 +6,8 @@ public sealed class BaristaOrder : ReadModel
 {
     public string CustomerName { get; set; }
     public BaristaOrderItem[] Items { get; set; }
+    public DateTimeOffset OrderPlacedAt { get; set; }
+    public DateTimeOffset? OrderPreparedAt { get; set; }
     public bool IsCompleted { get; set; }
 }
 

src/Common/NCafe.Shared/Hubs/Order.cs

@@ -1,5 +1,5 @@
 namespace NCafe.Shared.Hubs;
 
-public sealed record Order(Guid Id, OrderItem[] OrderItems, string Customer);
+public sealed record Order(Guid Id, OrderItem[] OrderItems, string Customer, DateTimeOffset OrderPlacedAt);
 
 public sealed record OrderItem(string Name, int Quantity);

src/UI/NCafe.Web/Models/BaristaOrder.cs

@@ -1,5 +1,5 @@
 namespace NCafe.Web.Models;
 
-public record BaristaOrder(Guid Id, string CustomerName, BaristaOrderItem[] Items, bool IsCompleted);
+public record BaristaOrder(Guid Id, string CustomerName, BaristaOrderItem[] Items, DateTimeOffset OrderPlacedAt);
 
 public record BaristaOrderItem(string Name, int Quantity);

src/UI/NCafe.Web/Pages/Barista/Index.razor

@@ -15,14 +15,14 @@
 {
     <Spin />
 }
-else if (!orders.Any(o => !o.IsCompleted))
+else if (!orders.Any())
 {
     <Result Title="No new orders for now." />
 }
 else
 {
     <Card Title="New Orders">
-    @foreach (var order in orders.Where(o => !o.IsCompleted))
+    @foreach (var order in orders.OrderBy(o => o.OrderPlacedAt))
     {
         <CardGrid Style="width:25%">
             <h5>@order.CustomerName</h5>
@@ -58,17 +58,17 @@ else
         var url = $"{Configuration["BaristaBaseAddress"]}/orders/prepared";
         try
         {
+            var order = orders.Single(o => o.Id == orderId);
             var response = await Http.PostAsJsonAsync(url, new { OrderId = orderId });
             response.EnsureSuccessStatusCode();
 
             _ = NotificationService.Open(new NotificationConfig
                 {
-                    Message = "Order Completed",
+                    Message = $"{order.CustomerName}'s order Completed",
                     Description = $"Order completed successfully.",
                     NotificationType = NotificationType.Success
                 });
 
-            var order = orders.FirstOrDefault(o => o.Id == orderId);
             orders.Remove(order);
 
             StateHasChanged();
@@ -97,7 +97,7 @@ else
                 order.Id,
                 order.Customer,
                 order.OrderItems.Select(i => new BaristaOrderItem(i.Name, i.Quantity)).ToArray(),
-                false));
+                order.OrderPlacedAt));
             StateHasChanged();
         });