fix

MyOffice.Services/Account/Domain/AccountAccessDto.cs

@@ -1,19 +1,16 @@
 namespace MyOffice.Services.Account.Domain;
 
+using AutoMapper;
 using Core.Attributes;
 using Data.Models.Accounts;
 using Data.Models.Users;
 using Mapper;
+using MyOffice.Services.Identity;
 
 [Link(typeof(AccountAccess))]
 [Link(typeof(AccountServiceProfile))]
 public class AccountAccessDto
 {
-	/// <summary>
-	/// Current user
-	/// </summary>
-	public Guid CurrenUserId { get; set; }
-
 	public Guid AccountId { get; set; }
 	public AccountDto? Account { get; set; }
 
@@ -21,15 +18,41 @@ public class AccountAccessDto
 	/// User can access to account
 	/// </summary>
 	public Guid UserId { get; set; }
-	public User? User { get; set; }
-	/// <summary>
-	/// Who add access
-	/// </summary>
-	public Guid OwnerId { get; set; }
-	public User? Owner { get; set; }
+	public UserDto? User { get; set; }
 
 	public bool IsAllowRead { get; set; }
 	public bool IsAllowWrite { get; set; }
 	public bool IsAllowManage { get; set; }
+	public bool IsOwner { get; set; }
 	public AccountAccessTypeEnum Type { get; set; }
+	/// <summary>
+	/// Who add access
+	/// </summary>
+	public Guid OwnerId { get; set; }
+	public UserDto? Owner { get; set; }
+	public string? Name { get; set; }
+}
+
+public class AccountAccessDtoProfile: Profile
+{
+	public AccountAccessDtoProfile()
+	{
+		CreateMap<AccountAccess, AccountAccessDto>()
+			.AfterMap<AccountAccessDtoMappingAction>()
+		;
+	}
+}
+
+public class AccountAccessDtoMappingAction: IMappingAction<AccountAccess, AccountAccessDto>
+{
+	private readonly IContextProvider _contextProvider;
+	public AccountAccessDtoMappingAction(IContextProvider contextProvider)
+	{
+		_contextProvider = contextProvider;
+	}
+
+    public void Process(AccountAccess source, AccountAccessDto destination, ResolutionContext context)
+    {
+		destination.IsOwner = destination.OwnerId == _contextProvider.UserId;
+    }
 }

MyOffice.Services/Account/Domain/AccountDetailedDto.cs

@@ -1,9 +1,21 @@
-namespace MyOffice.Services.Account.Domain;
+using AutoMapper;
+using MyOffice.Core;
+using MyOffice.Data.Models.Accounts;
 
-public class AccountDetailedDto
+namespace MyOffice.Services.Account.Domain;
+
+public class AccountDetailedDto: IDataModelDto<AccountDetailed>
 {
 	public AccountDto Account { get; set; } = null!;
 	public decimal TotalPlus { get; set; }
 	public decimal TotalMinus { get; set; }
 	public decimal Rest => TotalPlus - TotalMinus;
 }
+
+public class AccountDetailedDtoProfile: Profile
+{
+	public AccountDetailedDtoProfile()
+	{
+		CreateMap<AccountDetailed, AccountDetailedDto>();
+	}
+}

MyOffice.Services/Account/Domain/AccountDto.cs

@@ -1,27 +1,79 @@
 namespace MyOffice.Services.Account.Domain;
 
-using MyOffice.Data.Models.Currencies;
 using System;
 using Data.Models.Accounts;
+using MyOffice.Services.Currency.Domain;
+using AutoMapper;
+using MyOffice.Services.Identity;
+using MyOffice.Core;
+using MyOffice.Services.Mapper;
 
-public class AccountDto
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = false)]
+public class GenerateMappedDtoAttribute: Attribute
 {
+	public GenerateMappedDtoAttribute()
+    {
+    }
+}
+
+[GenerateMappedDto]
+public class AccountDto : IDataModelDto<Account>
+{
+	#region Account properties
+
 	public Guid Id { get; set; }
 	public string CurrencyGlobalId { get; set; } = null!;
-	public CurrencyGlobal? CurrencyGlobal { get; set; }
-	public Guid CurrencyId { get; set; }
-	public Currency? Currency { get; set; }
-	public Guid UserId { get; set; }
-	public UserDto? User { get; set; }
+	public CurrencyGlobalDto? CurrencyGlobal { get; set; }
+	public string Name { get; set; } = null!;
 	public Guid OwnerId { get; set; }
 	public UserDto? Owner { get; set; }
-	public string Name { get; set; } = null!;
-	public bool HasMotions { get; set; }
+
+	#endregion Account properties
+
+	#region Dto properties
+
+	public Guid CurrencyId { get; set; }
+	public CurrencyDto? Currency { get; set; }
 	public string Type { get; set; } = null!;
-	public List<AccountAccessDto>? AccessRights { get; set; }
 	public List<AccountAccountCategoryDto>? Categories { get; set; }
 
+	public bool HasMotions { get; set; }
 
-	public Guid CurrentUserId { get; set; }
-	public AccountAccess? AccountAccess { get; set; }
+	#endregion Dto properties
+
+	#region Permissions
+
+	public List<AccountAccessDto>? AccessRights { get; set; }
+	public bool AllowRead { get; set; }
+	public bool AllowWrite { get; set; }
+	public bool AllowDelete { get; set; }
+	public bool AllowManage { get; set; }
+
+	#endregion Permissions
 }
+
+public class AccountDtoProfile : BaseProfile<Account, AccountDto>
+{
+	public AccountDtoProfile()
+	{
+		Mapping
+			.ForMember(x => x.HasMotions, o => o.MapFrom(x => x.Motions!.Any()))
+			.AfterMap<AccountDtoMappingAction>();
+	}
+}
+
+public class AccountDtoMappingAction : BaseMappingAction, IMappingAction<Account, AccountDto>
+{
+	public AccountDtoMappingAction(IContextProvider contextProvider) : base(contextProvider) { }
+
+	public void Process(Account source, AccountDto destination, ResolutionContext context)
+	{
+		var accessRight = destination.AccessRights?.FirstOrDefault(x => x.UserId == ContextProvider.UserId);
+		destination.AllowRead = accessRight?.IsAllowRead ?? false;
+		destination.AllowWrite = accessRight?.IsAllowWrite ?? false;
+		destination.AllowManage = accessRight?.IsAllowManage ?? false;
+		destination.AllowDelete = (accessRight?.IsOwner ?? false) && !destination.HasMotions;
+		destination.Name = accessRight?.Name ?? destination.Name;
+		destination.Type = accessRight?.Name ?? destination.Type;
+	}
+}

MyOffice.Services/Account/Domain/ItemCategoryDto.cs

@@ -1,14 +1,13 @@
 namespace MyOffice.Services.Account.Domain;
 
-using MyOffice.Data.Models.Users;
+using MyOffice.Data.Models.Items;
 
 public class ItemCategoryDto
 {
 	public Guid Id { get; set; }
 	public Guid UserId { get; set; }
-	public User User { get; set; } = null!;
+	public UserDto User { get; set; } = null!;
 	public string Name { get; set; } = null!;
 	public List<ItemDto> Items { get; set; } = null!;
 	public bool IsInternal { get; set; }
-}
-
+}

MyOffice.Services/Account/Domain/UserDto.cs

@@ -1,6 +1,6 @@
 namespace MyOffice.Services.Account.Domain;
 
-using Data.Models.Currencies;
+using MyOffice.Services.Currency.Domain;
 
 public class UserDto
 {
@@ -13,5 +13,5 @@ public class UserDto
 	public string? Phone { get; set; }
 
 	public string CurrencyId { get; set; } = null!;
-	public CurrencyGlobal? Currency { get; set; }
-}
+	public CurrencyGlobalDto? Currency { get; set; }
+}