max/DotBased
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHANGE] Reworking Result monads

Browse Source
This commit is contained in:
max
2025-04-07 14:59:37 +02:00
parent bb010b0cea
commit 0a5950cfa2
24 changed files with 390 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DotBased.AspNet.Authority.EFCore/Repositories/AttributeRepository.cs
View File

@@ -6,7 +6,7 @@ namespace DotBased.AspNet.Authority.EFCore.Repositories;
public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFactory) : RepositoryBase, IAttributeRepository
{
public async Task<ListResult<AuthorityAttributeItem>> GetAttributesAsync(int limit = 20, int offset = 0, string search = "",
public async Task<ListResultOld<AuthorityAttributeItem>> GetAttributesAsync(int limit = 20, int offset = 0, string search = "",
CancellationToken cancellationToken = default)
{
try
@@ -25,7 +25,7 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
AttributeKey = a.AttributeKey,
AttributeValue = a.AttributeValue
}).ToListAsync(cancellationToken);
return ListResult<AuthorityAttributeItem>.Ok(select, total, limit, offset);
return ListResultOld<AuthorityAttributeItem>.Ok(select, total, limit, offset);
}
catch (Exception e)
{
@@ -33,13 +33,13 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
}
}
public async Task<Result<AuthorityAttribute>> GetAttributeByKeyAsync(string key, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityAttribute>> GetAttributeByKeyAsync(string key, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var attribute = await context.Attributes.FirstOrDefaultAsync(a => a.AttributeKey == key, cancellationToken);
return attribute == null ? Result<AuthorityAttribute>.Failed("Attribute not found") : Result<AuthorityAttribute>.Ok(attribute);
return attribute == null ? ResultOld<AuthorityAttribute>.Failed("Attribute not found") : ResultOld<AuthorityAttribute>.Ok(attribute);
}
catch (Exception e)
{
@@ -47,18 +47,18 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
}
}
public async Task<Result<AuthorityAttribute>> CreateAttributeAsync(AuthorityAttribute attribute, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityAttribute>> CreateAttributeAsync(AuthorityAttribute attribute, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (string.IsNullOrWhiteSpace(attribute.AttributeKey) || attribute.ForeignKey == Guid.Empty)
{
return Result<AuthorityAttribute>.Failed("Attribute key and/or bound id is empty");
return ResultOld<AuthorityAttribute>.Failed("Attribute key and/or bound id is empty");
}
var entry = context.Attributes.Add(attribute);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityAttribute>.Failed("Failed to create attribute") : Result<AuthorityAttribute>.Ok(entry.Entity);
return saveResult <= 0 ? ResultOld<AuthorityAttribute>.Failed("Failed to create attribute") : ResultOld<AuthorityAttribute>.Ok(entry.Entity);
}
catch (Exception e)
{
@@ -66,7 +66,7 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
}
}
public async Task<Result<AuthorityAttribute>> UpdateAttributeAsync(AuthorityAttribute attribute, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityAttribute>> UpdateAttributeAsync(AuthorityAttribute attribute, CancellationToken cancellationToken = default)
{
try
{
@@ -74,17 +74,17 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
var currentAttribute = await context.Attributes.FirstOrDefaultAsync(a => a.AttributeKey == attribute.AttributeKey, cancellationToken);
if (currentAttribute == null)
{
return Result<AuthorityAttribute>.Failed("Attribute not found");
return ResultOld<AuthorityAttribute>.Failed("Attribute not found");
}
if (currentAttribute.Version != attribute.Version)
{
return Result<AuthorityAttribute>.Failed("Attribute version doesn't match");
return ResultOld<AuthorityAttribute>.Failed("Attribute version doesn't match");
}
var entry = context.Attributes.Update(currentAttribute);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityAttribute>.Failed("Failed to update attribute") : Result<AuthorityAttribute>.Ok(entry.Entity);
return saveResult <= 0 ? ResultOld<AuthorityAttribute>.Failed("Failed to update attribute") : ResultOld<AuthorityAttribute>.Ok(entry.Entity);
}
catch (Exception e)
{
@@ -92,7 +92,7 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
}
}
public async Task<Result> DeleteAttributeAsync(AuthorityAttribute attribute, CancellationToken cancellationToken = default)
public async Task<ResultOld> DeleteAttributeAsync(AuthorityAttribute attribute, CancellationToken cancellationToken = default)
{
try
{
@@ -100,11 +100,11 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
var currentAttribute = await context.Attributes.FirstOrDefaultAsync(a => a.AttributeKey == attribute.AttributeKey, cancellationToken);
if (currentAttribute == null)
{
return Result.Failed("Attribute not found");
return ResultOld.Failed("Attribute not found");
}
context.Attributes.Remove(currentAttribute);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to delete attribute") : Result.Ok();
return saveResult <= 0 ? ResultOld.Failed("Failed to delete attribute") : ResultOld.Ok();
}
catch (Exception e)
{

34
DotBased.AspNet.Authority.EFCore/Repositories/GroupRepository.cs
View File

@@ -6,7 +6,7 @@ namespace DotBased.AspNet.Authority.EFCore.Repositories;
public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory) : RepositoryBase, IGroupRepository
{
public async Task<ListResult<AuthorityGroupItem>> GetGroupsAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
public async Task<ListResultOld<AuthorityGroupItem>> GetGroupsAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
{
try
{
@@ -22,7 +22,7 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
Id = g.Id,
Name = g.Name
}).ToListAsync(cancellationToken);
return ListResult<AuthorityGroupItem>.Ok(select, total, limit, offset);
return ListResultOld<AuthorityGroupItem>.Ok(select, total, limit, offset);
}
catch (Exception e)
{
@@ -30,17 +30,17 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityGroup>> GetGroupByIdAsync(string id, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityGroup>> GetGroupByIdAsync(string id, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (!Guid.TryParse(id, out var groupId))
{
return Result<AuthorityGroup>.Failed("Invalid group id");
return ResultOld<AuthorityGroup>.Failed("Invalid group id");
}
var group = await context.Groups.Where(g => g.Id == groupId).Include(g => g.Attributes).FirstOrDefaultAsync(cancellationToken: cancellationToken);
return Result<AuthorityGroup>.HandleResult(group, "Group not found");
return ResultOld<AuthorityGroup>.HandleResult(group, "Group not found");
}
catch (Exception e)
{
@@ -48,14 +48,14 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<ListResult<AuthorityGroup>> GetUserGroupsAsync(AuthorityUser user, CancellationToken cancellationToken = default)
public async Task<ListResultOld<AuthorityGroup>> GetUserGroupsAsync(AuthorityUser user, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var userJoinGroups = context.UserGroups.Where(ug => ug.UserId == user.Id).Select(ug => ug.GroupId);
var userGroups = context.Groups.Where(g => userJoinGroups.Contains(g.Id));
return ListResult<AuthorityGroup>.Ok(userGroups, userGroups.Count());
return ListResultOld<AuthorityGroup>.Ok(userGroups, userGroups.Count());
}
catch (Exception e)
{
@@ -63,18 +63,18 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityGroup>> CreateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityGroup>> CreateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (group.Id == Guid.Empty)
{
return Result<AuthorityGroup>.Failed("Id cannot be empty.");
return ResultOld<AuthorityGroup>.Failed("Id cannot be empty.");
}
var entry = context.Groups.Add(group);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityGroup>.Failed("Failed to create group.") : Result<AuthorityGroup>.Ok(entry.Entity);
return saveResult <= 0 ? ResultOld<AuthorityGroup>.Failed("Failed to create group.") : ResultOld<AuthorityGroup>.Ok(entry.Entity);
}
catch (Exception e)
{
@@ -82,7 +82,7 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityGroup>> UpdateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityGroup>> UpdateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
{
try
{
@@ -90,17 +90,17 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
var currentGroup = await context.Groups.FirstOrDefaultAsync(g => g.Id == group.Id ,cancellationToken);
if (currentGroup == null)
{
return Result<AuthorityGroup>.Failed("Group not found.");
return ResultOld<AuthorityGroup>.Failed("Group not found.");
}
if (currentGroup.Version != group.Version)
{
return Result<AuthorityGroup>.Failed("Group version does not match, version validation failed!");
return ResultOld<AuthorityGroup>.Failed("Group version does not match, version validation failed!");
}
var entry = context.Groups.Update(group);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityGroup>.Failed("Failed to update group.") : Result<AuthorityGroup>.Ok(entry.Entity);
return saveResult <= 0 ? ResultOld<AuthorityGroup>.Failed("Failed to update group.") : ResultOld<AuthorityGroup>.Ok(entry.Entity);
}
catch (Exception e)
{
@@ -108,7 +108,7 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result> DeleteGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
public async Task<ResultOld> DeleteGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
{
try
{
@@ -116,11 +116,11 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
var currentGroup = await context.Groups.FirstOrDefaultAsync(g => g.Id == group.Id, cancellationToken);
if (currentGroup == null)
{
return Result.Failed("Group not found, cannot delete group!");
return ResultOld.Failed("Group not found, cannot delete group!");
}
context.Groups.Remove(currentGroup);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to delete group.") : Result.Ok();
return saveResult <= 0 ? ResultOld.Failed("Failed to delete group.") : ResultOld.Ok();
}
catch (Exception e)
{

10
DotBased.AspNet.Authority.EFCore/Repositories/RepositoryBase.cs
View File

@@ -2,18 +2,18 @@ namespace DotBased.AspNet.Authority.EFCore.Repositories;
public abstract class RepositoryBase
{
protected Result<T> HandleExceptionResult<T>(string message, Exception ex) => new(HandleException(message, ex));
protected ResultOld<T> HandleExceptionResult<T>(string message, Exception ex) => new(HandleException(message, ex));
protected ListResult<T> HandleExceptionListResult<T>(string message, Exception ex) =>
protected ListResultOld<T> HandleExceptionListResult<T>(string message, Exception ex) =>
new(HandleException(message, ex));
protected Result HandleException(string message, Exception ex)
protected ResultOld HandleException(string message, Exception ex)
{
if (ex is OperationCanceledException oce)
{
return Result.Failed("Operation cancelled.", oce);
return ResultOld.Failed("Operation cancelled.", oce);
}
return Result.Failed(message, ex);
return ResultOld.Failed(message, ex);
}
}

64
DotBased.AspNet.Authority.EFCore/Repositories/RoleRepository.cs
View File

@@ -1,6 +1,8 @@
using DotBased.AspNet.Authority.EFCore.Models;
using DotBased.AspNet.Authority.Models;
using DotBased.AspNet.Authority.Models.Authority;
using DotBased.AspNet.Authority.Repositories;
using DotBased.Monads;
using Microsoft.EntityFrameworkCore;
namespace DotBased.AspNet.Authority.EFCore.Repositories;
@@ -8,7 +10,7 @@ namespace DotBased.AspNet.Authority.EFCore.Repositories;
public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory) : RepositoryBase, IRoleRepository
{
public async Task<ListResult<AuthorityRoleItem>> GetRolesAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
public async Task<Result<QueryItems<AuthorityRoleItem>>> GetRolesAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
{
try
{
@@ -26,29 +28,29 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
Id = r.Id,
Name = r.Name
}).ToListAsync(cancellationToken: cancellationToken);
return ListResult<AuthorityRoleItem>.Ok(select, total, limit, offset);
return QueryItems<AuthorityRoleItem>.Create(select, total, limit, offset);
}
catch (Exception e)
{
return HandleExceptionListResult<AuthorityRoleItem>("Failed to get roles.", e);
return e;
}
}
public async Task<Result<AuthorityRole>> GetRoleByIdAsync(string id, CancellationToken cancellationToken = default)
public async Task<Result<AuthorityRole>> GetRoleByIdAsync(Guid id, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (!Guid.TryParse(id, out var guid))
var role = await context.Roles.Where(r => r.Id == id).Include(r => r.Attributes).FirstOrDefaultAsync(cancellationToken: cancellationToken);
if (role != null)
{
return Result<AuthorityRole>.Failed("Invalid id!");
return role;
}
var role = await context.Roles.Where(r => r.Id == guid).Include(r => r.Attributes).FirstOrDefaultAsync(cancellationToken: cancellationToken);
return Result<AuthorityRole>.HandleResult(role, "Role not found!");
return ResultError.Fail("Role not found!");
}
catch (Exception e)
{
return HandleExceptionResult<AuthorityRole>("Failed to get role!", e);
return e;
}
}
@@ -59,15 +61,15 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (role.Id == Guid.Empty)
{
return Result<AuthorityRole>.Failed("Id cannot be empty!");
return ResultError.Fail("Id cannot be empty!");
}
var entity = context.Roles.Add(role);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityRole>.Failed("Failed to create role!") : Result<AuthorityRole>.Ok(entity.Entity);
return saveResult <= 0 ? ResultError.Fail("Failed to create role!") : entity.Entity;
}
catch (Exception e)
{
return HandleExceptionResult<AuthorityRole>("Failed to create role!", e);
return e;
}
}
@@ -79,21 +81,21 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
var currentRole = await context.Roles.FirstOrDefaultAsync(r => r.Id == role.Id, cancellationToken: cancellationToken);
if (currentRole == null)
{
return Result<AuthorityRole>.Failed("Role not found!");
return ResultError.Fail("Role not found!");
}
if (role.Version != currentRole.Version)
{
return Result<AuthorityRole>.Failed("Role version does not match, version validation failed!");
return ResultError.Fail("Role version does not match, version validation failed!");
}
var entity = context.Roles.Update(role);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityRole>.Failed("Failed to update role!") : Result<AuthorityRole>.Ok(entity.Entity);
return saveResult <= 0 ? ResultError.Fail("Failed to update role!") : entity.Entity;
}
catch (Exception e)
{
return HandleExceptionResult<AuthorityRole>("Failed to update role!", e);
return e;
}
}
@@ -107,16 +109,16 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
context.Roles.RemoveRange(roles);
context.RoleLinks.RemoveRange(context.RoleLinks.Where(rg => roleIds.Contains(rg.RoleId)));
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to delete roles!") : Result.Ok();
var removeResult = await context.SaveChangesAsync(cancellationToken);
return removeResult == roles.Count? Result.Success() : ResultError.Fail($"Not all roles have been removed! {removeResult} of {roles.Count} roles removed!");
}
catch (Exception e)
{
return HandleException("Failed to delete role!", e);
return e;
}
}
public async Task<ListResult<AuthorityRoleItem>> GetUserRolesAsync(AuthorityUser user, int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
public async Task<ListResultOld<AuthorityRoleItem>> GetUserRolesAsync(AuthorityUser user, int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
{
try
{
@@ -133,7 +135,7 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
Id = r.Id,
Name = r.Name
});
return ListResult<AuthorityRoleItem>.Ok(roles, limit, offset);
return ListResultOld<AuthorityRoleItem>.Ok(roles, limit, offset);
}
catch (Exception e)
{
@@ -151,26 +153,26 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
context.RoleLinks.Add(new RoleLink() { LinkId = linkId, RoleId = role.Id });
}
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to ad role link!") : Result.Ok();
return saveResult == roles.Count ? Result.Success() : ResultError.Fail($"Not all roles have been linked! {saveResult} of {roles.Count} roles linked!");
}
catch (Exception e)
{
return HandleException("Failed to add role link!", e);
return e;
}
}
public async Task<ListResult<AuthorityRole>> GetLinkedRolesAsync(List<Guid> linkIds, CancellationToken cancellationToken = default)
public async Task<Result<List<AuthorityRole>>> GetLinkedRolesAsync(List<Guid> linkIds, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var linkedRoles = context.RoleLinks.Where(r => linkIds.Contains(r.LinkId)).Select(r => r.RoleId);
var roleList = await context.Roles.Where(r => linkedRoles.Contains(r.Id)).ToListAsync(cancellationToken);
return ListResult<AuthorityRole>.Ok(roleList.DistinctBy(r => r.Id));
return roleList.DistinctBy(r => r.Id).ToList();
}
catch (Exception e)
{
return HandleExceptionListResult<AuthorityRole>("Failed to get linked roles!", e);
return e;
}
}
@@ -182,25 +184,25 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
var roleIds = roles.Select(r => r.Id).ToList();
context.RoleLinks.RemoveRange(context.RoleLinks.Where(rg => rg.LinkId == linkId && roleIds.Contains(rg.RoleId)));
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to delete role links!") : Result.Ok();
return saveResult == roles.Count ? Result.Success() : ResultError.Fail($"Not all roles have been unlinked! {saveResult} of {roles.Count} roles unlinked!");
}
catch (Exception e)
{
return HandleException("Failed to delete role link!", e);
return e;
}
}
public async Task<ListResult<Guid>> HasRolesAsync(Guid linkId, List<AuthorityRole> roles, CancellationToken cancellationToken = default)
public async Task<Result<List<Guid>>> HasRolesAsync(Guid linkId, List<AuthorityRole> roles, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var hasRoles = await context.RoleLinks.Where(r => r.LinkId == linkId && roles.Any(ar => ar.Id == r.RoleId)).Select(r => r.RoleId).ToListAsync(cancellationToken);
return ListResult<Guid>.Ok(hasRoles);
return hasRoles;
}
catch (Exception e)
{
return HandleExceptionListResult<Guid>("Failed to determine role for user!", e);
return e;
}
}
}

58
DotBased.AspNet.Authority.EFCore/Repositories/UserRepository.cs
View File

@@ -6,7 +6,7 @@ namespace DotBased.AspNet.Authority.EFCore.Repositories;
public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory) : RepositoryBase, IUserRepository
{
public async Task<ListResult<AuthorityUserItem>> GetAuthorityUsersAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
public async Task<ListResultOld<AuthorityUserItem>> GetAuthorityUsersAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
{
try
{
@@ -26,7 +26,7 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
EmailAddress = u.EmailAddress,
PhoneNumber = u.PhoneNumber
}).ToListAsync(cancellationToken: cancellationToken);
return ListResult<AuthorityUserItem>.Ok(selected, totalCount, limit, offset);
return ListResultOld<AuthorityUserItem>.Ok(selected, totalCount, limit, offset);
}
catch (Exception e)
{
@@ -34,18 +34,18 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityUser>> GetAuthorityUserByIdAsync(string id, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityUser>> GetAuthorityUserByIdAsync(string id, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (!Guid.TryParse(id, out var guid))
{
return Result<AuthorityUser>.Failed("Invalid id!");
return ResultOld<AuthorityUser>.Failed("Invalid id!");
}
var user = await context.Users.Where(u => u.Id == guid).Include(u => u.Attributes).FirstOrDefaultAsync(cancellationToken: cancellationToken);
return Result<AuthorityUser>.HandleResult(user, "User not found.");
return ResultOld<AuthorityUser>.HandleResult(user, "User not found.");
}
catch (Exception e)
{
@@ -53,18 +53,18 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityUser>> CreateUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityUser>> CreateUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (user.Id == Guid.Empty)
{
return Result<AuthorityUser>.Failed("Id cannot be empty!");
return ResultOld<AuthorityUser>.Failed("Id cannot be empty!");
}
var entity = context.Users.Add(user);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityUser>.Failed("Failed to create user!") : Result<AuthorityUser>.Ok(entity.Entity);
return saveResult <= 0 ? ResultOld<AuthorityUser>.Failed("Failed to create user!") : ResultOld<AuthorityUser>.Ok(entity.Entity);
}
catch (Exception e)
{
@@ -72,7 +72,7 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityUser>> UpdateUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityUser>> UpdateUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
{
try
{
@@ -80,17 +80,17 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
var usr = await context.Users.FirstOrDefaultAsync(u => u.Id == user.Id, cancellationToken: cancellationToken);
if (usr == null)
{
return Result<AuthorityUser>.Failed("User not found!");
return ResultOld<AuthorityUser>.Failed("User not found!");
}
if (usr.Version != user.Version || usr.SecurityVersion != user.SecurityVersion)
{
return Result<AuthorityUser>.Failed("Version validation failed!");
return ResultOld<AuthorityUser>.Failed("Version validation failed!");
}
var entity = context.Users.Update(user);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result<AuthorityUser>.Failed("Failed to save updated user!") : Result<AuthorityUser>.Ok(entity.Entity);
return saveResult <= 0 ? ResultOld<AuthorityUser>.Failed("Failed to save updated user!") : ResultOld<AuthorityUser>.Ok(entity.Entity);
}
catch (Exception e)
{
@@ -98,7 +98,7 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result> DeleteUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
public async Task<ResultOld> DeleteUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
{
try
{
@@ -106,11 +106,11 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
var usr = await context.Users.FirstOrDefaultAsync(u => u.Id == user.Id, cancellationToken: cancellationToken);
if (usr == null)
{
return Result.Failed("User not found!");
return ResultOld.Failed("User not found!");
}
context.Users.Remove(usr);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to delete user!") : Result.Ok();
return saveResult <= 0 ? ResultOld.Failed("Failed to delete user!") : ResultOld.Ok();
}
catch (Exception e)
{
@@ -118,13 +118,13 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<AuthorityUser>> GetUserByEmailAsync(string email, CancellationToken cancellationToken = default)
public async Task<ResultOld<AuthorityUser>> GetUserByEmailAsync(string email, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var usr = await context.Users.Where(u => u.EmailAddress == email).Include(u => u.Attributes).FirstOrDefaultAsync(cancellationToken: cancellationToken);
return Result<AuthorityUser>.HandleResult(usr, "User not found by given email address.");
return ResultOld<AuthorityUser>.HandleResult(usr, "User not found by given email address.");
}
catch (Exception e)
{
@@ -132,7 +132,7 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result> SetVersionAsync(AuthorityUser user, long version, CancellationToken cancellationToken = default)
public async Task<ResultOld> SetVersionAsync(AuthorityUser user, long version, CancellationToken cancellationToken = default)
{
try
{
@@ -140,18 +140,18 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
var usr = await context.Users.FirstOrDefaultAsync(u => u.Id == user.Id, cancellationToken);
if (usr == null)
{
return Result.Failed("Failed to find user with given id!");
return ResultOld.Failed("Failed to find user with given id!");
}
if (usr.Version != user.Version)
{
return Result.Failed("Stored user version doesn't match current user version!");
return ResultOld.Failed("Stored user version doesn't match current user version!");
}
usr.Version = version;
context.Users.Update(usr);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to update user!") : Result.Ok();
return saveResult <= 0 ? ResultOld.Failed("Failed to update user!") : ResultOld.Ok();
}
catch (Exception e)
{
@@ -159,13 +159,13 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<long>> GetVersionAsync(AuthorityUser user, CancellationToken cancellationToken = default)
public async Task<ResultOld<long>> GetVersionAsync(AuthorityUser user, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var usrVersion = await context.Users.Where(u => u.Id == user.Id).Select(u => u.Version).FirstOrDefaultAsync(cancellationToken);
return Result<long>.HandleResult(usrVersion, "Failed to get user version!");
return ResultOld<long>.HandleResult(usrVersion, "Failed to get user version!");
}
catch (Exception e)
{
@@ -173,7 +173,7 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result> SetSecurityVersionAsync(AuthorityUser user, long securityVersion, CancellationToken cancellationToken = default)
public async Task<ResultOld> SetSecurityVersionAsync(AuthorityUser user, long securityVersion, CancellationToken cancellationToken = default)
{
try
{
@@ -181,18 +181,18 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
var usr = await context.Users.FirstOrDefaultAsync(u => u.Id == user.Id, cancellationToken);
if (usr == null)
{
return Result.Failed("Failed to find user with given id!");
return ResultOld.Failed("Failed to find user with given id!");
}
if (usr.SecurityVersion != user.SecurityVersion)
{
return Result.Failed("Stored user version doesn't match current user version!");
return ResultOld.Failed("Stored user version doesn't match current user version!");
}
usr.SecurityVersion = securityVersion;
context.Users.Update(usr);
var saveResult = await context.SaveChangesAsync(cancellationToken);
return saveResult <= 0 ? Result.Failed("Failed to update user!") : Result.Ok();
return saveResult <= 0 ? ResultOld.Failed("Failed to update user!") : ResultOld.Ok();
}
catch (Exception e)
{
@@ -200,13 +200,13 @@ public class UserRepository(IDbContextFactory<AuthorityContext> contextFactory)
}
}
public async Task<Result<long>> GetSecurityVersionAsync(AuthorityUser user, CancellationToken cancellationToken = default)
public async Task<ResultOld<long>> GetSecurityVersionAsync(AuthorityUser user, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var usrVersion = await context.Users.Where(u => u.Id == user.Id).Select(u => u.SecurityVersion).FirstOrDefaultAsync(cancellationToken);
return Result<long>.HandleResult(usrVersion, "Failed to get user security version!");
return ResultOld<long>.HandleResult(usrVersion, "Failed to get user security version!");
}
catch (Exception e)
{