diff --git a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs index 8463629..d05a7d2 100644 --- a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs @@ -1,9 +1,10 @@ using DigitalData.UserManager.Application.DTOs.GroupOfUser; using DigitalData.UserManager.Domain.Entities; -using DigitalData.Core.DTO; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Contracts { + [Obsolete("Use MediatR")] 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 4448402..9af0690 100644 --- a/DigitalData.UserManager.Application/Contracts/IGroupService.cs +++ b/DigitalData.UserManager.Application/Contracts/IGroupService.cs @@ -1,9 +1,10 @@ using DigitalData.UserManager.Application.DTOs.Group; using DigitalData.UserManager.Domain.Entities; -using DigitalData.Core.DTO; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Contracts { + [Obsolete("Use MediatR")] 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 ac54cea..f00df90 100644 --- a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs @@ -1,10 +1,11 @@ -using DigitalData.Core.Abstractions.Application; -using DigitalData.Core.DTO; +using DigitalData.Core.Abstraction.Application; +using DigitalData.Core.Abstraction.Application.DTO; using DigitalData.UserManager.Application.DTOs.ModuleOfUser; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts { + [Obsolete("Use MediatR")] public interface IModuleOfUserService : ICRUDService { Task DeleteAsyncByModuleUserId(int moduleId, int userId); diff --git a/DigitalData.UserManager.Application/Contracts/IModuleService.cs b/DigitalData.UserManager.Application/Contracts/IModuleService.cs index 890c840..bffd981 100644 --- a/DigitalData.UserManager.Application/Contracts/IModuleService.cs +++ b/DigitalData.UserManager.Application/Contracts/IModuleService.cs @@ -1,9 +1,10 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Abstraction.Application; using DigitalData.UserManager.Application.DTOs.Module; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts { + [Obsolete("Use MediatR")] public interface IModuleService : IBasicCRUDService { } diff --git a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs index ddac7bb..f2808a7 100644 --- a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs +++ b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs @@ -1,9 +1,10 @@ using DigitalData.UserManager.Application.DTOs.UserRep; using DigitalData.UserManager.Domain.Entities; -using DigitalData.Core.DTO; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Contracts { + [Obsolete("Use MediatR")] 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 d794fb6..fe5f3c1 100644 --- a/DigitalData.UserManager.Application/Contracts/IUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IUserService.cs @@ -1,9 +1,10 @@ using DigitalData.UserManager.Application.DTOs.User; using DigitalData.UserManager.Domain.Entities; -using DigitalData.Core.DTO; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Contracts { + [Obsolete("Use MediatR")] public interface IUserService : IBaseService { Task>> ReadByModuleIdAsync(int moduleId); diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IClientUserRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IClientUserRepository.cs index edad729..7cfc29a 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IClientUserRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IClientUserRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IClientUserRepository : ICRUDRepository { Task> ReadAsync(bool readOnly = true, int? userId = null); diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IGroupOfUserRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IGroupOfUserRepository.cs index a64eadf..52ad970 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IGroupOfUserRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IGroupOfUserRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IGroupOfUserRepository : ICRUDRepository { IQueryable ReadByGroupId(int groupId); diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IGroupRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IGroupRepository.cs index 3755414..a3293fe 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IGroupRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IGroupRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IGroupRepository : ICRUDRepository { } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IModuleOfUserRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IModuleOfUserRepository.cs index 79e8ebe..5805839 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IModuleOfUserRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IModuleOfUserRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IModuleOfUserRepository : ICRUDRepository { IQueryable ReadByModuleId(int moduleId); diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IModuleRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IModuleRepository.cs index f740ab6..86ce8cb 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IModuleRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IModuleRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IModuleRepository : ICRUDRepository { } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepRepository.cs index 99e6867..1987fc8 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IUserRepRepository : ICRUDRepository { Task> ReadAllAsync( diff --git a/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepository.cs b/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepository.cs index 6f8a983..1c3895d 100644 --- a/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepository.cs +++ b/DigitalData.UserManager.Application/Contracts/Repositories/IUserRepository.cs @@ -1,8 +1,9 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Contracts.Repositories; +[Obsolete("Use IRepository")] public interface IUserRepository : ICRUDRepository { Task> ReadByModuleIdAsync(int moduleId); diff --git a/DigitalData.UserManager.Application/DTOs/Base/BaseUpdateDto.cs b/DigitalData.UserManager.Application/DTOs/Base/BaseUpdateDto.cs index dd1b3d8..f60093b 100644 --- a/DigitalData.UserManager.Application/DTOs/Base/BaseUpdateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/Base/BaseUpdateDto.cs @@ -1,8 +1,6 @@ -using DigitalData.Core.Abstractions; - -namespace DigitalData.UserManager.Application.DTOs.Base +namespace DigitalData.UserManager.Application.DTOs.Base { - public record BaseUpdateDto() : IUnique + public record BaseUpdateDto { public string ChangedWho { get; set; } = "UNAUTHORIZED"; diff --git a/DigitalData.UserManager.Application/DTOs/Module/ModuleDto.cs b/DigitalData.UserManager.Application/DTOs/Module/ModuleDto.cs index 7c7b6a7..63da30e 100644 --- a/DigitalData.UserManager.Application/DTOs/Module/ModuleDto.cs +++ b/DigitalData.UserManager.Application/DTOs/Module/ModuleDto.cs @@ -1,10 +1,8 @@ -using DigitalData.Core.Abstractions; - -namespace DigitalData.UserManager.Application.DTOs.Module +namespace DigitalData.UserManager.Application.DTOs.Module { public record ModuleDto( int Id, string? Name, string? ShortName - ) : IUnique; + ); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs b/DigitalData.UserManager.Application/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs index a0e3337..59c711c 100644 --- a/DigitalData.UserManager.Application/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs @@ -1,6 +1,4 @@ -using DigitalData.Core.Abstractions; - -namespace DigitalData.UserManager.Application.DTOs.ModuleOfUser +namespace DigitalData.UserManager.Application.DTOs.ModuleOfUser { public record ModuleOfUserUpdateDto( int Id, @@ -9,5 +7,5 @@ namespace DigitalData.UserManager.Application.DTOs.ModuleOfUser bool? IsAdmin, string? Comment, string? ChangedWho - ) : IUnique; + ); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj index 7bfbbd9..618dd11 100644 --- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj +++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj @@ -27,7 +27,6 @@ - diff --git a/DigitalData.UserManager.Application/Services/BaseService.cs b/DigitalData.UserManager.Application/Services/BaseService.cs index 6f68e13..4d2925d 100644 --- a/DigitalData.UserManager.Application/Services/BaseService.cs +++ b/DigitalData.UserManager.Application/Services/BaseService.cs @@ -1,7 +1,7 @@ using AutoMapper; -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Abstraction.Application.DTO; +using DigitalData.Core.Abstraction.Application.Repository; using DigitalData.Core.Application; -using DigitalData.Core.DTO; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.Base; using DigitalData.UserManager.Application.DTOs.User; @@ -9,6 +9,7 @@ using DigitalData.UserManager.Domain.Entities; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] public class BaseService : CRUDService, IBaseService where TCRUDRepository : ICRUDRepository where TCreateDto : BaseCreateDto @@ -25,7 +26,7 @@ namespace DigitalData.UserManager.Application.Services public async Task GetUserAsync() => _lazyUserAsync is null ? null : await _lazyUserAsync.Value; - public override async Task> CreateAsync(TCreateDto createDto) + public override async Task> CreateAsync(TCreateDto createDto) { var user = await GetUserAsync(); if(user is not null) diff --git a/DigitalData.UserManager.Application/Services/GroupOfUserService.cs b/DigitalData.UserManager.Application/Services/GroupOfUserService.cs index 8b10619..e3bfb88 100644 --- a/DigitalData.UserManager.Application/Services/GroupOfUserService.cs +++ b/DigitalData.UserManager.Application/Services/GroupOfUserService.cs @@ -1,12 +1,13 @@ using AutoMapper; -using DigitalData.Core.DTO; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.GroupOfUser; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Application.Contracts.Repositories; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] 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 5e6b4ab..959d7e4 100644 --- a/DigitalData.UserManager.Application/Services/GroupService.cs +++ b/DigitalData.UserManager.Application/Services/GroupService.cs @@ -1,13 +1,14 @@ using AutoMapper; -using DigitalData.Core.DTO; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.Group; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Application.Contracts.Repositories; using Microsoft.Extensions.Localization; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] public class GroupService : BaseService, IGroupService { private readonly IStringLocalizer? _localizer; diff --git a/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs b/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs index f9156b6..e8d0b21 100644 --- a/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs +++ b/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs @@ -1,13 +1,14 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.DTO; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.ModuleOfUser; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Application.Contracts.Repositories; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] public class ModuleOfUserService : CRUDService, IModuleOfUserService { public ModuleOfUserService(IModuleOfUserRepository repository, IMapper mapper) : base(repository, mapper) diff --git a/DigitalData.UserManager.Application/Services/ModuleService.cs b/DigitalData.UserManager.Application/Services/ModuleService.cs index 763d9d9..901f293 100644 --- a/DigitalData.UserManager.Application/Services/ModuleService.cs +++ b/DigitalData.UserManager.Application/Services/ModuleService.cs @@ -7,6 +7,7 @@ using DigitalData.UserManager.Application.Contracts.Repositories; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] public class ModuleService : BasicCRUDService, IModuleService { public ModuleService(IModuleRepository repository, IMapper mapper) : base(repository, mapper) diff --git a/DigitalData.UserManager.Application/Services/UserRepService.cs b/DigitalData.UserManager.Application/Services/UserRepService.cs index 22b3b25..e81adfc 100644 --- a/DigitalData.UserManager.Application/Services/UserRepService.cs +++ b/DigitalData.UserManager.Application/Services/UserRepService.cs @@ -1,14 +1,15 @@ using AutoMapper; -using DigitalData.Core.DTO; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.UserRep; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Application.Contracts.Repositories; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] public class UserRepService : BaseService, IUserRepService { private readonly IStringLocalizer? _localizer; @@ -24,13 +25,13 @@ namespace DigitalData.UserManager.Application.Services return Result.Success(urReadDTOs); } - public override async Task> CreateAsync(UserRepCreateDto createDto) + public override async Task> CreateAsync(UserRepCreateDto createDto) // XOR control => (createDto.ValidFrom is null && createDto.ValidTo is not null) || (createDto.ValidFrom is not null && createDto.ValidTo is null) - ? Result.Fail().Notice(LogLevel.None, Flag.DataIntegrityIssue, _localizer?[Key.DateRangeNotXNOR].Value) + ? Result.Fail().Notice(LogLevel.None, Flag.DataIntegrityIssue, _localizer?[Key.DateRangeNotXNOR].Value) //date range control : (createDto.ValidFrom > createDto.ValidTo) - ? Result.Fail().Notice(LogLevel.None, Flag.DataIntegrityIssue, _localizer?[Key.InvalidDateRange].Value) + ? Result.Fail().Notice(LogLevel.None, Flag.DataIntegrityIssue, _localizer?[Key.InvalidDateRange].Value) : await base.CreateAsync(createDto); } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Services/UserService.cs b/DigitalData.UserManager.Application/Services/UserService.cs index 5d5cfe3..f811ecd 100644 --- a/DigitalData.UserManager.Application/Services/UserService.cs +++ b/DigitalData.UserManager.Application/Services/UserService.cs @@ -1,13 +1,14 @@ using AutoMapper; -using DigitalData.Core.DTO; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.User; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Application.Contracts.Repositories; using Microsoft.Extensions.Localization; +using DigitalData.Core.Abstraction.Application.DTO; namespace DigitalData.UserManager.Application.Services { + [Obsolete("Use MediatR")] public class UserService : BaseService, IUserService { private readonly IStringLocalizer? _localizer;