Merge pull request #53 from k-nero/Dev-Rebase

Sync master
k-nero · Oct 22, 2023 · ae39a3e · ae39a3e
2 parents be7be2a + e932e34
commit ae39a3e
Show file tree

Hide file tree

Showing 27 changed files with 1,210 additions and 82 deletions.
diff --git a/Script.sql b/Script.sql
diff --git a/src/SWD-Laundry-Backend.Contract.Repository/Entity/BaseEntity.cs b/src/SWD-Laundry-Backend.Contract.Repository/Entity/BaseEntity.cs
@@ -13,6 +13,7 @@ protected BaseEntity()
 
         [Key]
         public string Id { get; set; }
+        public bool IsDelete { get; set; } = false;
         public string? CreatedBy { get; set; }
         public string? LastUpdatedBy { get; set; }
         //public string? DeletedBy { get; set; }

diff --git a/src/SWD-Laundry-Backend.Contract.Repository/SWD-Laundry-Backend.Contract.Repository.csproj b/src/SWD-Laundry-Backend.Contract.Repository/SWD-Laundry-Backend.Contract.Repository.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11"></PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.12"></PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/SWD-Laundry-Backend.Contract.Service/Interface/IIdentityService.cs b/src/SWD-Laundry-Backend.Contract.Service/Interface/IIdentityService.cs
@@ -14,4 +14,6 @@ public interface IIdentityService : IBaseIdentityService
 
     public Task<IList<Claim>> GetClaimsAsync(ApplicationUser user);
     public Task SetVerfiedEmailAsync(ApplicationUser user, string email);
+    public Task<int> SetWalletAsync(ApplicationUser user, string walletId);
+    public Task SetUserAvatarUrlAsync(ApplicationUser identity, string photoUrl);
 }
diff --git a/src/SWD-Laundry-Backend.Core/Models/LoginModel.cs b/src/SWD-Laundry-Backend.Core/Models/LoginModel.cs
@@ -0,0 +1,7 @@
+namespace SWD_Laundry_Backend.Core.Models;
+public readonly struct LoginModel
+{
+    public string? AccessToken { get; init; }
+    public string? UserName { get; init; }
+    public string? Password { get; init; }
+}
diff --git a/src/SWD-Laundry-Backend.Core/Models/PaymentModel.cs b/src/SWD-Laundry-Backend.Core/Models/PaymentModel.cs
@@ -1,7 +1,4 @@
-using StackExchange.Redis;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace SWD_Laundry_Backend.Core.Models;
+namespace SWD_Laundry_Backend.Core.Models;
 
 public class PaymentModel
 {

diff --git a/src/SWD-Laundry-Backend.Core/QueryObject/BaseQuery.cs b/src/SWD-Laundry-Backend.Core/QueryObject/BaseQuery.cs
@@ -13,4 +13,6 @@ public record class BaseQuery
     public DateTime? EndDate { get; init; }
     [BindProperty(Name = "sort", SupportsGet = true)]
     public string? Sort { get; init; }
+    [BindProperty(Name = "is-deleted", SupportsGet = true)]
+    public bool IsDeleted { get; init; } = false;
 }
diff --git a/src/SWD-Laundry-Backend.Core/SWD-Laundry-Backend.Core.csproj b/src/SWD-Laundry-Backend.Core/SWD-Laundry-Backend.Core.csproj
@@ -12,12 +12,12 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="FirebaseAdmin" Version="2.4.0" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.7.1" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="Invedia.DI" Version="2021.7.22.1" />
-    <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.12" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0-rc.1.23421.29" />
     <PackageReference Include="Microsoft.OpenApi" Version="1.6.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/src/SWD-Laundry-Backend.Repository/Base/BaseRepository.cs b/src/SWD-Laundry-Backend.Repository/Base/BaseRepository.cs
@@ -45,7 +45,10 @@ public virtual async Task<T> AddAsync(T entity, CancellationToken cancellationTo
 
         public virtual async Task<int> DeleteAsync(Expression<Func<T, bool>> filter, CancellationToken cancellationToken = default)
         {
-            var i = await DbSet.Where(filter).ExecuteDeleteAsync(cancellationToken);
+            //var i = await DbSet.Where(filter).ExecuteDeleteAsync(cancellationToken);
+            var i = await DbSet.Where(filter)
+                .ExecuteUpdateAsync(x => x.SetProperty(x => x.IsDelete, true)
+                , cancellationToken);
             return i;
         }