[APP | Read] OrderEntity - [APP | CRUD] OrderGetList - [Front | DB] C…

…ommon & AccessToken (#51)

* 1

* Common

* AccessToken

* OrderGetList

* remove OrderGetExtension

TSystems.LoveOTC/AdminHub/Order/Entity.cs

@@ -0,0 +1,32 @@
+namespace TSystems.LoveOTC.AdminHub;
+
+using Microsoft.EntityFrameworkCore;
+
+internal partial class AdminHub {
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 0.5.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    public async Task<dynamic?> OrderEntity(uint key, uint? version) {
+        if (version is not null) {
+            var noChange = await this.Db.Orders
+                .AnyAsync(x => x.OrderId == key && x.Version == version);
+
+            if (noChange) return true;
+        }
+
+        return await this.Db.Orders
+            .Where(x => x.OrderId == key)
+            .Select(x => new {
+                x.UserId,
+                Status = Enum.GetName(x.Status)!,
+                x.CreateAt,
+                x.TrackingNumber,
+                x.Version
+            })
+            .SingleOrDefaultAsync();
+    }
+}

TSystems.LoveOTC/Hub/Order/Entity.cs

@@ -0,0 +1,33 @@
+namespace TSystems.LoveOTC.Hub;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+internal partial class ShopHub {
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 0.5.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    [Authorize]
+    public async Task<dynamic?> OrderEntity(uint key, uint? version) {
+        if (version is not null) {
+            var noChange = await this.Db.Orders
+                .AnyAsync(x => x.OrderId == key && x.Version == version);
+
+            if (noChange) return true;
+        }
+
+        return await this.Db.Orders
+            .Where(x => x.OrderId == key && x.UserId == this.UserId)
+            .Select(x => new {
+                Status = Enum.GetName(x.Status)!,
+                x.CreateAt,
+                x.TrackingNumber,
+                x.Version
+            })
+            .SingleOrDefaultAsync();
+    }
+}

TSystems.LoveOTC/Hub/Order/Get.cs

@@ -1,7 +1,6 @@
 namespace TSystems.LoveOTC.Hub;
 
 using System.Collections.Immutable;
-using Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
 
@@ -10,20 +9,17 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.1.0
-     * @version 0.2.0
+     * @version 1.0.0
      * </remarks>
      */
     [Authorize]
-    public async Task<OrderItem[]> OrderGetList() =>
+    public async Task<dynamic[]> OrderGetList() =>
         await this.Db.Orders
             .Where(x => x.UserId == this.UserId)
-            .Select(x => new OrderItem {
-                OrderId = x.OrderId,
-                Items = x.Combos.Select(c => c.Product.Name).ToArray(),
-                Quantity = (ushort)x.OrderCombos.Sum(o => o.Quantity),
-                OrderDate = x.CreateAt,
-                TrackNumber = x.TrackingNumber,
-                Status = Enum.GetName(x.Status)!
+            .Select(x => new {
+                x.OrderId,
+                Products = x.Combos.Select(c => c.ProductId).ToArray(),
+                Quantity = (ushort)x.OrderCombos.Sum(o => o.Quantity)
             })
             .ToArrayAsync();
 
@@ -74,20 +70,4 @@ public async Task<OrderDetail> OrderGetDetail(uint orderId) {
             Comments = cmtDb
         };
     }
-
-    /**
-     * <remarks>
-     * @author Aloento
-     * @since 0.1.0
-     * @version 0.1.0
-     * </remarks>
-     */
-    [Authorize]
-    public async Task<OrderExtension> OrderGetExtension(uint orderId) {
-        return new() {
-            OrderDate = DateTime.Now,
-            TrackNumber = "Number123456789",
-            Status = Enum.GetName(OrderStatus.Finished)!
-        };
-    }
 }

TSystems.LoveOTC/Hub/Product/Entity.cs

@@ -100,6 +100,7 @@ internal partial class ShopHub {
             .Where(x => x.VariantId == key)
             .Select(x => new {
                 x.Name,
+                x.ProductId,
                 x.Version
             })
             .SingleOrDefaultAsync();

package.json

@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.10",
-    "@types/react": "^18.2.32",
+    "@types/react": "^18.2.33",
     "@types/react-dom": "^18.2.14",
     "@vitejs/plugin-react-swc": "^3.4.0",
     "typescript": "^5.2.2",