[APP | Read] CommentEntity - [APP | CRUD] OrderGetDetail - [Front | H…

…ub] FindCover (#52) * Comment * OrderGetDetail * FindCover * Detail * User
opentelekomcloud · Oct 27, 2023 · a48c3a6 · a48c3a6
1 parent da6f418
commit a48c3a6
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 2,545 deletions.
diff --git a/TSystems.LoveOTC/Hub/Order/Entity.cs b/TSystems.LoveOTC/Hub/Order/Entity.cs
@@ -30,4 +30,31 @@ internal partial class ShopHub {
             })
             .SingleOrDefaultAsync();
     }
+
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 0.5.0
+     * @version 0.1.1
+     * </remarks>
+     */
+    [Authorize]
+    public async Task<dynamic?> CommentEntity(uint key, uint? version) {
+        if (version is not null) {
+            var noChange = await this.Db.Comments
+                .AnyAsync(x => x.CommentId == key && x.Version == version);
+
+            if (noChange) return true;
+        }
+
+        return await this.Db.Comments
+            .Where(x => x.CommentId == key && x.Order.UserId == this.UserId)
+            .Select(x => new {
+                x.Content,
+                x.User!.Name,
+                x.CreateAt,
+                x.Version
+            })
+            .SingleOrDefaultAsync();
+    }
 }
diff --git a/TSystems.LoveOTC/Hub/Order/Get.cs b/TSystems.LoveOTC/Hub/Order/Get.cs
@@ -1,6 +1,5 @@
 namespace TSystems.LoveOTC.Hub;
 
-using System.Collections.Immutable;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
 
@@ -27,47 +26,27 @@ await this.Db.Orders
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 1.0.0
      * </remarks>
      */
     [Authorize]
-    public async Task<OrderDetail> OrderGetDetail(uint orderId) {
-        var cartDb = await this.Db.OrderCombos
+    public async Task<dynamic> OrderGetDetail(uint orderId) {
+        var items = await this.Db.OrderCombos
             .Where(x => x.OrderId == orderId && x.Order.UserId == this.UserId)
             .Select(x => new {
-                ProdId = x.Combo.ProductId,
-                Cover = x.Combo.Product.Photos
-                    .Where(p => p.Cover == true)
-                    .Select(p => p.ObjectId)
-                    .Single(),
-                x.Combo.Product.Name,
-                Type = x.Combo.Types
-                    .Select(t => KeyValuePair.Create(t.Variant.Name, t.Name))
-                    .ToArray(),
-                x.Quantity
+                x.Quantity,
+                Types = x.Combo.Types.Select(t => t.TypeId).ToArray()
             })
             .ToArrayAsync();
 
-        var cmtDb = await this.Db.Comments
+        var cmts = await this.Db.Comments
             .Where(x => x.OrderId == orderId && x.Order.UserId == this.UserId)
-            .Select(x => new OrderComment {
-                Content = x.Content,
-                Time = x.CreateAt,
-                User = x.User!.Name
-            })
+            .Select(x => x.CommentId)
             .ToArrayAsync();
 
-        return new() {
-            ShopCart = cartDb
-                .Select(x => new CartItem {
-                    ProdId = x.ProdId,
-                    Cover = x.Cover,
-                    Name = x.Name,
-                    Type = x.Type.ToImmutableDictionary(k => k.Key, v => v.Value),
-                    Quantity = x.Quantity
-                })
-                .ToImmutableArray(),
-            Comments = cmtDb
+        return new {
+            Items = items,
+            Comments = cmts
         };
     }
 }
diff --git a/TSystems.LoveOTC/Hub/Order/OrderExtension.cs b/TSystems.LoveOTC/Hub/Order/OrderExtension.cs
diff --git a/TSystems.LoveOTC/Hub/Order/OrderItem.cs b/TSystems.LoveOTC/Hub/Order/OrderItem.cs
@@ -7,10 +7,16 @@ namespace TSystems.LoveOTC.Hub;
  * @version 0.1.0
  * </remarks>
  */
-internal record OrderItem : OrderExtension {
+internal record OrderItem {
     public required uint OrderId { get; init; }
 
     public required ICollection<string> Items { get; init; }
 
     public required ushort Quantity { get; init; }
+
+    public required string Status { get; init; }
+
+    public string? TrackNumber { get; init; }
+
+    public required DateTime OrderDate { get; init; }
 }