ifritechnologies/pfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UserService refactored to integrate into TenantUser

Browse Source
This commit is contained in:
hermes
2026-09-25 03:55:20 +02:00
parent 26df423180
commit 4b806a3202
1 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PostFundManagement.Application/Services/Users/UserService.cs
+37 -25
View File
@@ -1,5 +1,6 @@
using PostFundManagement.Application.Abstractions.Services;
using PostFundManagement.Domain;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Errors;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Domain.Models;
@@ -7,19 +8,19 @@ using PostFundManagement.Infrastructure.Database;
namespace PostFundManagement.Application.Services.Users;
public sealed class UserService(IDbContextFactory<ApplicationDbContext> contextFactory) : IUserService
public sealed class UserService(IDbContextFactory<ApplicationDbContext> contextFactory, ITenantContextService tenantContext) : IUserService
{
public async Task<Result> SyncUserAsync(Guid userId, string email, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result>>)(async () =>
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
// TODO: refactor to use TenantUser
var user = await context.Users.FirstOrDefaultAsync(u => u.Id == userId, cancellationToken);
var tenantUser = await context.TenantUsers
.Include(i => i.User)
.FirstOrDefaultAsync(u => u.UserId == userId, cancellationToken);
// TODO: refactor to use TenantUser
// TODO: Also add to TenantUser
if (user is null)
if (tenantUser is null)
{
context.Users.Add(new Domain.Entities.User
{
Id = userId,
@@ -27,12 +28,22 @@ public sealed class UserService(IDbContextFactory<ApplicationDbContext> contextF
Status = ActivityStatus.Active,
LastLoginAt = DateTime.UtcNow
});
context.TenantUsers.Add(new Domain.Entities.TenantUser
{
CreatedAt = DateTime.UtcNow,
CreatedBy = userId,
Status = ActivityStatus.Active,
TenantId = tenantContext.TenantId,
UserId = userId
});
}
else
{
user!.Email = email;
user.LastLoginAt = DateTime.UtcNow;
tenantUser.User!.Email = email;
tenantUser.User.LastLoginAt = DateTime.UtcNow;
context.Users.Update(user);
context.Users.Update(tenantUser.User);
}
return Result.OkIf(await context.SaveChangesAsync(cancellationToken) > 0, CreateError.New);
@@ -43,32 +54,29 @@ public sealed class UserService(IDbContextFactory<ApplicationDbContext> contextF
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
// TODO: refactor to use TenantUser
var query = context.Users.AsNoTracking();
var query = context.TenantUsers.Include(i => i.User).AsNoTracking();
// TODO: refactor to use TenantUser
if (request.Status.HasValue)
query = query.Where(u => u.Status == request.Status.Value);
if (!string.IsNullOrWhiteSpace(request.Email))
query = query.Where(u => u.Email != null && u.Email.Contains(request.Email));
query = query.Where(u => u.User!.Email != null && u.User!.Email.Contains(request.Email));
if (!string.IsNullOrWhiteSpace(request.SortBy))
query = request.SortBy.ToLowerInvariant() switch
{
"email" => request.SortDescending ? query.OrderByDescending(u => u.Email) : query.OrderBy(u => u.Email),
"lastloginat" => request.SortDescending ? query.OrderByDescending(u => u.LastLoginAt) : query.OrderBy(u => u.LastLoginAt),
"email" => request.SortDescending ? query.OrderByDescending(u => u.User!.Email) : query.OrderBy(u => u.User!.Email),
"lastloginat" => request.SortDescending ? query.OrderByDescending(u => u.User!.LastLoginAt) : query.OrderBy(u => u.User!.LastLoginAt),
"status" => request.SortDescending ? query.OrderByDescending(u => u.Status) : query.OrderBy(u => u.Status),
_ => request.SortDescending ? query.OrderByDescending(u => u.Id) : query.OrderBy(u => u.Id)
};
else
query = query.OrderBy(u => u.Id);
// TODO: refactor to use TenantUser
var users = await query.Skip((pagination.Page - 1) * pagination.PageSize)
.Take(pagination.PageSize).ToListAsync(cancellationToken);
return Result.Ok(users.Select(u => u.Map()).ToArray());
return Result.Ok(users.Select(u => u.User!.Map()).ToArray());
}));
public async Task<Result> UpdateUserStatusAsync(Guid userId, ActivityStatus status, CancellationToken cancellationToken = default) =>
@@ -76,9 +84,13 @@ public sealed class UserService(IDbContextFactory<ApplicationDbContext> contextF
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
// TODO: Update TenantUser status as well
var changedTotal = await context.Users
.Where(f => f.Id == userId)
var changedTotal = await context.TenantUsers
.Include(i => i.User)
.Where(f => f.UserId == userId)
.ExecuteUpdateAsync(f => f
.SetProperty(u => u.Status, status), cancellationToken);
changedTotal += await context.Users.Where(f => f.Id == userId)
.ExecuteUpdateAsync(f => f.SetProperty(u => u.Status, status), cancellationToken);
return Result.OkIf(changedTotal > 0, UpdateError.New);
@@ -89,11 +101,11 @@ public sealed class UserService(IDbContextFactory<ApplicationDbContext> contextF
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
// TODO: refactor to use TenantUser
var user = await context.Users.AsNoTracking()
.FirstOrDefaultAsync(f => f.Id == userId, cancellationToken);
var tenantUser = await context.TenantUsers.AsNoTracking()
.Include(i => i.User)
.FirstOrDefaultAsync(f => f.UserId == userId, cancellationToken);
return Result.FailIf(user == null, NotFoundError.New)
.ToResult(user?.Map()!);
return Result.FailIf(tenantUser == null, NotFoundError.New)
.ToResult(tenantUser!.User?.Map()!);
}));
}