diff --git a/DigitalData.UserManager.Application/Contracts/IBaseService.cs b/DigitalData.UserManager.Application/Contracts/IBaseService.cs index 6438e94..c4e0a7e 100644 --- a/DigitalData.UserManager.Application/Contracts/IBaseService.cs +++ b/DigitalData.UserManager.Application/Contracts/IBaseService.cs @@ -5,10 +5,9 @@ using DigitalData.UserManager.Application.DTOs.Base; namespace DigitalData.UserManager.Application.Contracts { - public interface IBaseService : ICRUDService + public interface IBaseService : ICRUDService where TCreateDto : BaseCreateDto where TReadDto : class - where TUpdateDto : BaseUpdateDto where TBaseEntity : BaseEntity { diff --git a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs index 703b869..8463629 100644 --- a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs @@ -4,7 +4,7 @@ using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { - public interface IGroupOfUserService : IBaseService + public interface IGroupOfUserService : IBaseService { Task DeleteAsyncByGroupUserId(int groupId, int userId); diff --git a/DigitalData.UserManager.Application/Contracts/IGroupService.cs b/DigitalData.UserManager.Application/Contracts/IGroupService.cs index 5dae49d..4448402 100644 --- a/DigitalData.UserManager.Application/Contracts/IGroupService.cs +++ b/DigitalData.UserManager.Application/Contracts/IGroupService.cs @@ -4,7 +4,7 @@ using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { - public interface IGroupService : IBaseService + public interface IGroupService : IBaseService { Task> CreateAsync(DirectoryGroupDto dirGroup); } diff --git a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs index dc20222..ac54cea 100644 --- a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs @@ -5,7 +5,7 @@ using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts { - public interface IModuleOfUserService : ICRUDService + public interface IModuleOfUserService : ICRUDService { Task DeleteAsyncByModuleUserId(int moduleId, int userId); diff --git a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs index bd8e361..ddac7bb 100644 --- a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs +++ b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs @@ -4,7 +4,7 @@ using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { - public interface IUserRepService : IBaseService + public interface IUserRepService : IBaseService { Task>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false, int? userId = null, int? groupId = null); } diff --git a/DigitalData.UserManager.Application/Contracts/IUserService.cs b/DigitalData.UserManager.Application/Contracts/IUserService.cs index 4465651..d794fb6 100644 --- a/DigitalData.UserManager.Application/Contracts/IUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IUserService.cs @@ -4,7 +4,7 @@ using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { - public interface IUserService : IBaseService + public interface IUserService : IBaseService { Task>> ReadByModuleIdAsync(int moduleId); diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj index b31cfbd..f4cf1a3 100644 --- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj +++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj @@ -25,7 +25,8 @@ - + + diff --git a/DigitalData.UserManager.Application/Services/BaseService.cs b/DigitalData.UserManager.Application/Services/BaseService.cs index ca36cc6..6f68e13 100644 --- a/DigitalData.UserManager.Application/Services/BaseService.cs +++ b/DigitalData.UserManager.Application/Services/BaseService.cs @@ -9,11 +9,10 @@ using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Services { - public class BaseService : CRUDService, IBaseService + public class BaseService : CRUDService, IBaseService where TCRUDRepository : ICRUDRepository where TCreateDto : BaseCreateDto where TReadDto : class - where TUpdateDto : BaseUpdateDto where TBaseEntity : BaseEntity { public BaseService(TCRUDRepository repository, IMapper mapper) : base(repository, mapper) @@ -37,12 +36,13 @@ namespace DigitalData.UserManager.Application.Services return await base.CreateAsync(createDto); } - public override async Task UpdateAsync(TUpdateDto updateDto) + // made without generic type + public override async Task UpdateAsync(TUpdateDto updateDto) { var user = await GetUserAsync(); - if (user is not null) + if (user is not null && updateDto is BaseUpdateDto baseUpdateDto) { - updateDto.ChangedWho = user.Username; + baseUpdateDto.ChangedWho = user.Username; } return await base.UpdateAsync(updateDto); diff --git a/DigitalData.UserManager.Application/Services/GroupOfUserService.cs b/DigitalData.UserManager.Application/Services/GroupOfUserService.cs index 688be6a..8846b48 100644 --- a/DigitalData.UserManager.Application/Services/GroupOfUserService.cs +++ b/DigitalData.UserManager.Application/Services/GroupOfUserService.cs @@ -7,7 +7,7 @@ using DigitalData.UserManager.Infrastructure.Contracts; namespace DigitalData.UserManager.Application.Services { - public class GroupOfUserService : BaseService, IGroupOfUserService + public class GroupOfUserService : BaseService, IGroupOfUserService { public GroupOfUserService(IGroupOfUserRepository repository, IMapper mapper) : base(repository, mapper) { diff --git a/DigitalData.UserManager.Application/Services/GroupService.cs b/DigitalData.UserManager.Application/Services/GroupService.cs index 093832d..752cd10 100644 --- a/DigitalData.UserManager.Application/Services/GroupService.cs +++ b/DigitalData.UserManager.Application/Services/GroupService.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { - public class GroupService : BaseService, IGroupService + public class GroupService : BaseService, IGroupService { private readonly IStringLocalizer _localizer; public GroupService(IGroupRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, mapper) diff --git a/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs b/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs index 1c3379f..1d41b0f 100644 --- a/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs +++ b/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs @@ -8,7 +8,7 @@ using DigitalData.UserManager.Infrastructure.Contracts; namespace DigitalData.UserManager.Application.Services { - public class ModuleOfUserService : CRUDService, IModuleOfUserService + public class ModuleOfUserService : CRUDService, IModuleOfUserService { public ModuleOfUserService(IModuleOfUserRepository repository, IMapper mapper) : base(repository, mapper) { diff --git a/DigitalData.UserManager.Application/Services/UserRepService.cs b/DigitalData.UserManager.Application/Services/UserRepService.cs index e93d3fd..832a9f4 100644 --- a/DigitalData.UserManager.Application/Services/UserRepService.cs +++ b/DigitalData.UserManager.Application/Services/UserRepService.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging; namespace DigitalData.UserManager.Application.Services { - public class UserRepService : BaseService, IUserRepService + public class UserRepService : BaseService, IUserRepService { private readonly IStringLocalizer _localizer; public UserRepService(IUserRepRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, mapper) diff --git a/DigitalData.UserManager.Application/Services/UserService.cs b/DigitalData.UserManager.Application/Services/UserService.cs index d6081b1..a0f062f 100644 --- a/DigitalData.UserManager.Application/Services/UserService.cs +++ b/DigitalData.UserManager.Application/Services/UserService.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { - public class UserService : BaseService, IUserService + public class UserService : BaseService, IUserService { private readonly IStringLocalizer _localizer; public UserService(IUserRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, mapper) diff --git a/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj b/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj index 0f4299f..79335d7 100644 --- a/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj +++ b/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj @@ -24,7 +24,7 @@ - +