[Front] v1.1.0 (#63)

* Update OIDCProvider version and redirect URIs * Update dependencies in package.json * Sync * Fix formatting and add missing commas
opentelekomcloud · Dec 21, 2023 · 034e10f · 034e10f
1 parent e17a4ef
commit 034e10f
Show file tree

Hide file tree

Showing 86 changed files with 2,028 additions and 1,046 deletions.
diff --git a/TSystems.LoveOTC/AdminHub/Order/Entity.cs b/TSystems.LoveOTC/AdminHub/Order/Entity.cs
@@ -7,10 +7,10 @@ internal partial class AdminHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 0.1.1
      * </remarks>
      */
-    public async Task<dynamic?> OrderEntity(uint key, uint? version) {
+    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);
@@ -27,7 +27,7 @@ internal partial class AdminHub {
                 x.TrackingNumber,
                 x.Version
             })
-            .SingleOrDefaultAsync();
+            .SingleAsync();
     }
 
     /**

diff --git a/TSystems.LoveOTC/AdminHub/Order/Get.cs b/TSystems.LoveOTC/AdminHub/Order/Get.cs
@@ -18,4 +18,31 @@ await this.Db.Orders
                 Quantity = (ushort)x.OrderCombos.Sum(o => o.Quantity)
             })
             .ToArrayAsync();
+
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 1.0.0
+     * @version 1.0.0
+     * </remarks>
+     */
+    public async Task<dynamic> OrderGetDetail(uint orderId) {
+        var items = await this.Db.OrderCombos
+            .Where(x => x.OrderId == orderId)
+            .Select(x => new {
+                x.Quantity,
+                Types = x.Combo.Types.Select(t => t.TypeId).ToArray()
+            })
+            .ToArrayAsync();
+
+        var cmts = await this.Db.Comments
+            .Where(x => x.OrderId == orderId)
+            .Select(x => x.CommentId)
+            .ToArrayAsync();
+
+        return new {
+            Items = items,
+            Comments = cmts
+        };
+    }
 }
diff --git a/TSystems.LoveOTC/AdminHub/Order/Post.cs b/TSystems.LoveOTC/AdminHub/Order/Post.cs
@@ -12,7 +12,7 @@ internal partial class AdminHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.0.0
+     * @version 1.0.1
      * </remarks>
      */
     public async Task<bool> OrderPostAppend(uint orderId, string cmt) {
@@ -31,7 +31,7 @@ public async Task<bool> OrderPostAppend(uint orderId, string cmt) {
             Content = cmt,
             UserId = this.UserId,
             CreateAt = DateTime.UtcNow,
-            Order = order
+            Order = order,
         });
 
         return await this.Db.SaveChangesAsync() > 0;
@@ -63,7 +63,7 @@ public async Task<bool> OrderPostClose(uint orderId, string reason) {
             Content = "[Admin Close] " + reason,
             UserId = this.UserId,
             CreateAt = DateTime.UtcNow,
-            Order = order
+            Order = order,
         });
 
         return await this.Db.SaveChangesAsync() > 0;
@@ -99,6 +99,27 @@ public async Task<bool> OrderPostShip(uint orderId, string? track) {
         return await this.Db.SaveChangesAsync() > 0;
     }
 
-    // TODO: OrderPostAccept
-    // TODO: OrderPostReject
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 1.0.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    public async Task<bool> OrderPostAccept(uint orderId) {
+        var order = await this.Db.Orders
+            .Where(x => x.OrderId == orderId)
+            .Where(x => x.Status == OrderStatus.Pending)
+            .SingleAsync();
+
+        order.Status = OrderStatus.Processing;
+        order.Comments.Add(new() {
+            Content = "[Admin Accepted Order]",
+            UserId = this.UserId,
+            CreateAt = DateTime.UtcNow,
+            Order = order,
+        });
+
+        return await this.Db.SaveChangesAsync() > 0;
+    }
 }
diff --git a/TSystems.LoveOTC/AdminHub/Product/Delete.cs b/TSystems.LoveOTC/AdminHub/Product/Delete.cs
@@ -23,6 +23,7 @@ public async Task<bool> ProductDeletePhoto(uint photoId) {
      * <summary>
      * Include Types -> Combos
      * </summary>
+     *
      * <remarks>
      * @author Aloento
      * @since 0.5.0
@@ -69,6 +70,7 @@ await this.Db.Variants
      * <summary>
      * Include Combos
      * </summary>
+     *
      * <remarks>
      * @author Aloento
      * @since 0.5.0

diff --git a/TSystems.LoveOTC/AdminHub/Product/Patch.cs b/TSystems.LoveOTC/AdminHub/Product/Patch.cs
@@ -118,6 +118,7 @@ public async Task<bool> ProductPatchCaption(uint photoId, string caption) {
      * <summary>
      * Include Combos
      * </summary>
+     *
      * <remarks>
      * @author Aloento
      * @since 0.5.0

diff --git a/TSystems.LoveOTC/AdminHub/Product/Post.cs b/TSystems.LoveOTC/AdminHub/Product/Post.cs
@@ -133,7 +133,7 @@ public async Task<uint> ProductPostVariant(uint prodId, string name) {
 
         var temp = await this.Db.Variants.AddAsync(new() {
             ProductId = prodId,
-            Name = name
+            Name = name,
         });
 
         await this.Db.SaveChangesAsync();

diff --git a/TSystems.LoveOTC/Entities/OrderStatus.cs b/TSystems.LoveOTC/Entities/OrderStatus.cs
@@ -4,13 +4,14 @@ namespace TSystems.LoveOTC.Entities;
  * <remarks>
  * @author Aloento
  * @since 0.1.0
- * @version 0.1.0
+ * @version 0.1.1
  * </remarks>
  */
 public enum OrderStatus {
     Pending,
     Processing,
     Shipping,
     Finished,
-    Cancelled
+    Cancelled,
+    Returning,
 }
diff --git a/TSystems.LoveOTC/Hub/Order/Delete.cs b/TSystems.LoveOTC/Hub/Order/Delete.cs
@@ -0,0 +1,25 @@
+namespace TSystems.LoveOTC.Hub;
+
+using Entities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+internal partial class ShopHub {
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 1.0.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    [Authorize]
+    public async Task<bool> OrderDeleteCancel(uint orderId) {
+        var row = await this.Db.Orders
+            .Where(x => x.UserId == this.UserId)
+            .Where(x => x.OrderId == orderId)
+            .Where(x => x.Status == OrderStatus.Cancelled)
+            .ExecuteDeleteAsync();
+
+        return row > 0;
+    }
+}
diff --git a/TSystems.LoveOTC/Hub/Order/Entity.cs b/TSystems.LoveOTC/Hub/Order/Entity.cs
@@ -8,11 +8,11 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 0.1.1
      * </remarks>
      */
     [Authorize]
-    public async Task<dynamic?> OrderEntity(uint key, uint? version) {
+    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);
@@ -28,7 +28,7 @@ internal partial class ShopHub {
                 x.TrackingNumber,
                 x.Version
             })
-            .SingleOrDefaultAsync();
+            .SingleAsync();
     }
 
     /**

diff --git a/TSystems.LoveOTC/Hub/Order/Post.cs b/TSystems.LoveOTC/Hub/Order/Post.cs
@@ -37,7 +37,7 @@ public async Task<uint> OrderPostNew(CartItem[] cart, string? cmt) {
             order.Comments.Add(new() {
                 Content = cmt,
                 CreateAt = DateTime.UtcNow,
-                Order = order
+                Order = order,
             });
 
         foreach (var item in cart) {
@@ -57,13 +57,12 @@ public async Task<uint> OrderPostNew(CartItem[] cart, string? cmt) {
             order.OrderCombos.Add(new() {
                 Order = order,
                 Combo = combo,
-                Quantity = item.Quantity
+                Quantity = item.Quantity,
             });
         }
 
         return await this.Db.SaveChangesAsync() > 0
-            ? order.OrderId
-            : throw new HubException();
+            ? order.OrderId : throw new HubException();
     }
 
     /**
@@ -92,7 +91,7 @@ public async Task<bool> OrderPostAppend(uint orderId, string cmt) {
         order.Comments.Add(new() {
             Content = cmt,
             CreateAt = DateTime.UtcNow,
-            Order = order
+            Order = order,
         });
 
         return await this.Db.SaveChangesAsync() > 0;
@@ -121,16 +120,40 @@ public async Task<bool> OrderPostCancel(uint orderId, string reason) {
             .Where(x => x.Status != OrderStatus.Finished)
             .SingleAsync();
 
-        order.Status = OrderStatus.Cancelled;
+        order.Status = order.Status == OrderStatus.Shipping
+            ? OrderStatus.Returning : OrderStatus.Cancelled;
+
         order.Comments.Add(new() {
             Content = "[User Cancel] " + reason,
             CreateAt = DateTime.UtcNow,
-            Order = order
+            Order = order,
         });
 
         return await this.Db.SaveChangesAsync() > 0;
     }
 
-    // TODO: OrderPostReceived
-    // TODO: OrderDelete
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 1.0.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    [Authorize]
+    public async Task<bool> OrderPostReceived(uint orderId) {
+        var order = await this.Db.Orders
+            .Where(x => x.UserId == this.UserId)
+            .Where(x => x.OrderId == orderId)
+            .Where(x => x.Status == OrderStatus.Shipping)
+            .SingleAsync();
+
+        order.Status = OrderStatus.Finished;
+        order.Comments.Add(new() {
+            Content = "[User Mark Received Order]",
+            CreateAt = DateTime.UtcNow,
+            Order = order,
+        });
+
+        return await this.Db.SaveChangesAsync() > 0;
+    }
 }
diff --git a/TSystems.LoveOTC/Models/Category.cs b/TSystems.LoveOTC/Models/Category.cs
@@ -17,7 +17,8 @@ namespace TSystems.LoveOTC.Models;
 public class Category : Concurrency {
     public uint CategoryId { get; set; }
 
-    [StringLength(15, MinimumLength = 1)] public string Name { get; set; }
+    [StringLength(15, MinimumLength = 1)]
+    public string Name { get; set; }
 
     public virtual ICollection<Product> Products { get; }
 }
diff --git a/TSystems.LoveOTC/Models/Combo.cs b/TSystems.LoveOTC/Models/Combo.cs
@@ -20,13 +20,13 @@ public class Combo : Concurrency, IArchive {
 
     public virtual Product Product { get; set; }
 
+    public bool? IsArchived { get; set; }
+
     public virtual ICollection<Type> Types { get; set; }
 
     public virtual ICollection<ComboType> ComboTypes { get; init; }
 
     public virtual ICollection<Order> Orders { get; init; }
 
     public virtual ICollection<OrderCombo> OrderCombos { get; init; }
-
-    public bool? IsArchived { get; set; }
 }
diff --git a/TSystems.LoveOTC/Models/Product.cs b/TSystems.LoveOTC/Models/Product.cs
@@ -29,9 +29,9 @@ public class Product : Concurrency, IArchive {
 
     public JsonElement? Description { get; set; }
 
+    public bool? IsArchived { get; set; }
+
     public virtual ICollection<Variant> Variants { get; }
 
     public virtual ICollection<Combo> Combos { get; }
-
-    public bool? IsArchived { get; set; }
 }
diff --git a/TSystems.LoveOTC/Models/Type.cs b/TSystems.LoveOTC/Models/Type.cs
@@ -24,9 +24,9 @@ public class Type : Concurrency, IArchive {
 
     public virtual Variant Variant { get; set; }
 
+    public bool? IsArchived { get; set; }
+
     public virtual ICollection<Combo> Combos { get; init; }
 
     public virtual ICollection<ComboType> ComboTypes { get; init; }
-
-    public bool? IsArchived { get; set; }
 }
diff --git a/package.json b/package.json
@@ -15,8 +15,8 @@
     "update": "npx npm-check-updates -u"
   },
   "dependencies": {
-    "@fluentui/react-components": "^9.42.0",
-    "@fluentui/react-hooks": "^8.6.33",
+    "@fluentui/react-components": "^9.43.3",
+    "@fluentui/react-hooks": "^8.6.34",
     "@fluentui/react-icons": "^2.0.224",
     "@griffel/react": "^1.5.19",
     "@lexical/clipboard": "^0.12.5",
@@ -51,9 +51,9 @@
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.17",
+    "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.8"
+    "vite": "^5.0.10"
   }
 }