[Back] Use TypeId | ProductGetTypes | ProductGetVariants | ProductPat…

…chType | GuestVisit - [Front] AdminProductComboDetail | AdminProductNewCombo | useVariants | useTypes | useTypeList | useVariantName | useType | useVariant
opentelekomcloud · Mar 2, 2024 · 62d4860 · 62d4860
1 parent 85fb050
commit 62d4860
Show file tree

Hide file tree

Showing 27 changed files with 882 additions and 813 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,10 @@
+## LoveOTC
+
+An online shop for OTC members to order merchandise.
+
+## Basic Requirements
+
+- .NET 8
+- Node.js 17+
+- Visual Studio 2022 Preview
+- Visual Studio Code
diff --git a/TSystems.LoveOTC/AdminHub/Product/Delete.cs b/TSystems.LoveOTC/AdminHub/Product/Delete.cs
@@ -106,13 +106,13 @@ private async Task deleteType(Type type) {
      * <remarks>
      * @author Aloento
      * @since 0.1.0
-     * @version 0.2.0
+     * @version 0.3.0
      * </remarks>
      */
-    public async Task<bool> ProductDeleteType(uint variantId, string reqType) {
+    public async Task<bool> ProductDeleteType(uint typeId) {
         await this.deleteType(
             await this.Db.Types
-                .Where(x => x.VariantId == variantId && x.Name == reqType)
+                .Where(x => x.TypeId == typeId)
                 .IncludeOptimized(x => x.Combos)
                 .SingleAsync()
         );

diff --git a/TSystems.LoveOTC/AdminHub/Product/Get.cs b/TSystems.LoveOTC/AdminHub/Product/Get.cs
@@ -36,15 +36,25 @@ await this.Db.Products
      * <remarks>
      * @author Aloento
      * @since 0.1.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
-    public async Task<dynamic[]> ProductGetVariants(uint prodId) =>
-        await this.Db.Variants
+    public Task<uint[]> ProductGetVariants(uint prodId) =>
+        this.Db.Variants
             .Where(x => x.ProductId == prodId)
-            .Select(x => new {
-                x.VariantId,
-                Types = x.Types.Select(t => t.TypeId).ToArray()
-            })
+            .Select(x => x.VariantId)
+            .ToArrayAsync();
+
+    /**
+     * <remarks>
+     * @author Aloento
+     * @since 1.3.0
+     * @version 0.1.0
+     * </remarks>
+     */
+    public Task<uint[]> ProductGetTypes(uint variantId) =>
+        this.Db.Types
+            .Where(x => x.VariantId == variantId)
+            .Select(x => x.TypeId)
             .ToArrayAsync();
 }
diff --git a/TSystems.LoveOTC/AdminHub/Product/Patch.cs b/TSystems.LoveOTC/AdminHub/Product/Patch.cs
@@ -228,10 +228,10 @@ private async Task<List<Combo>> archiveCombos(ICollection<Combo> oldCombos) {
      * <remarks>
      * @author Aloento
      * @since 0.1.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
-    public async Task<bool> ProductPatchType(uint variantId, string oldName, string newName) {
+    public async Task<bool> ProductPatchType(uint typeId, string newName) {
         var valid = typeof(Type)
             .GetProperty(nameof(Type.Name))!
             .GetCustomAttribute<StringLengthAttribute>()!;
@@ -240,7 +240,7 @@ public async Task<bool> ProductPatchType(uint variantId, string oldName, string
             throw new HubException(valid.FormatErrorMessage("Name"));
 
         var type = this.Db.Types
-            .Where(x => x.VariantId == variantId && x.Name == oldName);
+            .Where(x => x.TypeId == typeId);
 
         var any = await type
             .SelectMany(x => x.Combos)

diff --git a/TSystems.LoveOTC/AdminHub/Product/Post.cs b/TSystems.LoveOTC/AdminHub/Product/Post.cs
@@ -110,7 +110,7 @@ public async Task<uint> ProductPostPhoto(uint prodId, IAsyncEnumerable<byte[]> i
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 0.1.1
      * </remarks>
      */
     public async Task<uint> ProductPostVariant(uint prodId, string name) {
@@ -138,14 +138,14 @@ public async Task<uint> ProductPostVariant(uint prodId, string name) {
         });
 
         await this.Db.SaveChangesAsync();
-        return temp.Entity.ProductId;
+        return temp.Entity.VariantId;
     }
 
     /**
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 0.1.1
      * </remarks>
      */
     public async Task<uint> ProductPostType(uint variantId, string name) {
@@ -173,7 +173,7 @@ public async Task<uint> ProductPostType(uint variantId, string name) {
         });
 
         await this.Db.SaveChangesAsync();
-        return temp.Entity.VariantId;
+        return temp.Entity.TypeId;
     }
 
     /**

diff --git a/TSystems.LoveOTC/Helpers/DataSeeder.cs b/TSystems.LoveOTC/Helpers/DataSeeder.cs
@@ -38,7 +38,6 @@ public static async Task SeedData(IApplicationBuilder host) {
             Category = jacketCate,
             Photos = [
                 new() {
-                    Cover = true,
                     Order = 1,
                     Object = new() { Data = jacket1 }
                 },
@@ -157,7 +156,6 @@ public static async Task SeedData(IApplicationBuilder host) {
             Category = shirtCate,
             Photos = [
                 new() {
-                    Cover = true,
                     Order = 1,
                     Object = new() { Data = tMale1 }
                 },
@@ -270,7 +268,6 @@ public static async Task SeedData(IApplicationBuilder host) {
             Category = shirtCate,
             Photos = [
                 new() {
-                    Cover = true,
                     Order = 1,
                     Object = new() { Data = tFemale1 }
                 },

diff --git a/TSystems.LoveOTC/Helpers/LoggerExtension.cs b/TSystems.LoveOTC/Helpers/LoggerExtension.cs
@@ -6,13 +6,23 @@ namespace TSystems.LoveOTC.Helpers;
  * <remarks>
  * @author Aloento
  * @since 0.5.0
- * @version 0.1.0
+ * @version 0.2.0
  * </remarks>
  */
 internal static partial class LoggerExtension {
     [LoggerMessage(
         EventId = 1001,
         Level = LogLevel.Debug,
+        Message = "Guest : Visit from [{ip}]"
+    )]
+    private static partial void guestVisit(ILogger logger, string? ip);
+
+    public static void GuestVisit(this ILogger logger, HubCallerContext ctx) =>
+        guestVisit(logger, ctx.GetHttpContext()?.Connection.RemoteIpAddress?.ToString());
+
+    [LoggerMessage(
+        EventId = 2001,
+        Level = LogLevel.Information,
         Message = "User {name} : [{uid}] Logged from [{ip}]"
     )]
     private static partial void userLogin(ILogger logger, string? name, string? uid, string? ip);

diff --git a/TSystems.LoveOTC/Hub/ShopHub.cs b/TSystems.LoveOTC/Hub/ShopHub.cs
@@ -18,7 +18,7 @@ internal partial class ShopHub(ShopContext db, ILogger<ShopHub> logger) : CraftH
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 0.1.1
      * </remarks>
      */
     public override async Task OnConnectedAsync() {
@@ -34,7 +34,8 @@ public override async Task OnConnectedAsync() {
                 await this.Clients.Caller.OnNewUser();
                 this.Context.Items.TryAdd("NewUser", true);
             }
-        }
+        } else
+            this.Logger.GuestVisit(this.Context);
     }
 
     /**

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "loveotc",
   "private": true,
-  "version": "1.4.0",
+  "version": "1.4.5",
   "type": "module",
   "author": {
     "name": "Aloento",
@@ -15,7 +15,7 @@
     "update": "npx npm-check-updates -u"
   },
   "dependencies": {
-    "@fluentui/react-components": "^9.46.6",
+    "@fluentui/react-components": "^9.46.7",
     "@fluentui/react-hooks": "^8.6.36",
     "@fluentui/react-icons": "^2.0.230",
     "@griffel/react": "^1.5.20",
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "@types/react": "^18.2.60",
+    "@types/react": "^18.2.61",
     "@types/react-dom": "^18.2.19",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "typescript": "^5.3.3",