Update OrderGetItems and OrderGetCmts methods

Aloento · Feb 15, 2024 · 816a175 · 816a175
1 parent a5be856
commit 816a175
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SoarCraft.AwaiShop/Hub/Order/Get.cs b/SoarCraft.AwaiShop/Hub/Order/Get.cs
@@ -32,8 +32,8 @@ await this.Db.Orders
     [Authorize]
     public async Task<dynamic> OrderGetItems(uint orderId) =>
         await this.Db.OrderCombos
-            .Where(x => x.Order.UserId == this.UserId)
             .Where(x => x.OrderId == orderId)
+            .Where(x => x.Order.UserId == this.UserId)
             .Select(x => new {
                 x.Quantity,
                 Types = x.Combo.Types.Select(t => t.TypeId).ToArray()
@@ -50,8 +50,8 @@ await this.Db.OrderCombos
     [Authorize]
     public Task<uint[]> OrderGetCmts(uint orderId) =>
         this.Db.Comments
-            .Where(x => x.Order.UserId == this.UserId)
             .Where(x => x.OrderId == orderId)
+            .Where(x => x.Order.UserId == this.UserId)
             .Select(x => x.CommentId)
             .ToArrayAsync();
 }
diff --git a/SoarCraft.AwaiShop/SoarCraft.AwaiShop.csproj b/SoarCraft.AwaiShop/SoarCraft.AwaiShop.csproj
@@ -38,10 +38,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.16.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.101.2.1" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.102.1" />
   </ItemGroup>
 
   <ItemGroup>