diff --git a/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFCreateDto.cs b/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFCreateDto.cs index 0845331..f591962 100644 --- a/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFCreateDto.cs +++ b/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFCreateDto.cs @@ -2,7 +2,7 @@ { public record ProfileControlsTFCreateDto(int Id, int ProfileId, - int UsrId, + int UserId, long ObjId, string ObjType, string AttrName, diff --git a/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFDto.cs b/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFDto.cs index c403675..2e5f68b 100644 --- a/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFDto.cs +++ b/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFDto.cs @@ -5,7 +5,7 @@ namespace WorkFlow.Application.DTO.ProfileControlsTF { public record ProfileControlsTFDto(int Id, int ProfileId, - int UsrId, + int UserId, long ObjId, string ObjType, string AttrName, diff --git a/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateCreateDto.cs b/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateCreateDto.cs index eff3a7d..c3012f8 100644 --- a/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateCreateDto.cs +++ b/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateCreateDto.cs @@ -2,7 +2,7 @@ { public record ProfileObjStateCreateDto( int ProfileId, - int UsrId, + int UserId, long ObjId, int StateId, string? State2 = null, diff --git a/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateDto.cs b/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateDto.cs index d54be30..cc26d01 100644 --- a/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateDto.cs +++ b/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateDto.cs @@ -6,7 +6,7 @@ namespace WorkFlow.Application.DTO.ProfileObjState { public record ProfileObjStateDto(int Id, int ProfileId, - int UsrId, + int UserId, long ObjId, int StateId, string AddedWho, diff --git a/WorkFlow.Domain/Entities/ProfileControlsTF.cs b/WorkFlow.Domain/Entities/ProfileControlsTF.cs index b8f50fb..b37a51b 100644 --- a/WorkFlow.Domain/Entities/ProfileControlsTF.cs +++ b/WorkFlow.Domain/Entities/ProfileControlsTF.cs @@ -18,7 +18,7 @@ namespace WorkFlow.Domain.Entities [Required] [Column("USR_ID")] - public required int UsrId { get; init; } + public required int UserId { get; init; } [Required] [Column("OBJ_ID")] @@ -62,7 +62,7 @@ namespace WorkFlow.Domain.Entities [ForeignKey("ProfileId")] public Profile? Profile { get; init; } = default; - [ForeignKey("UsrId")] + [ForeignKey("UserId")] public User? User { get; set; } = default; } } \ No newline at end of file diff --git a/WorkFlow.Domain/Entities/ProfileObjState.cs b/WorkFlow.Domain/Entities/ProfileObjState.cs index 7eb038c..8ecc4a9 100644 --- a/WorkFlow.Domain/Entities/ProfileObjState.cs +++ b/WorkFlow.Domain/Entities/ProfileObjState.cs @@ -18,7 +18,7 @@ namespace WorkFlow.Domain.Entities [Required] [Column("USR_ID")] - public required int UsrId { get; init; } + public required int UserId { get; init; } [Required] [Column("OBJ_ID")] @@ -48,7 +48,7 @@ namespace WorkFlow.Domain.Entities [ForeignKey("ProfileId")] public Profile? Profile { get; init; } = null; - [ForeignKey("UsrId")] + [ForeignKey("UserId")] public User? User { get; init; } = null; [ForeignKey("StateId")] diff --git a/WorkFlow.Infrastructure/Contracts/IProfileControlsTFRepository.cs b/WorkFlow.Infrastructure/Contracts/IProfileControlsTFRepository.cs index a28ee28..418c71c 100644 --- a/WorkFlow.Infrastructure/Contracts/IProfileControlsTFRepository.cs +++ b/WorkFlow.Infrastructure/Contracts/IProfileControlsTFRepository.cs @@ -8,7 +8,7 @@ namespace WorkFlow.Infrastructure.Contracts Task> ReadAsync( bool isReadonly = true, bool withProfile = true, bool withUser = false, - int? usrId = null, string? username = null, + int? userId = null, string? username = null, int? profileId = null, int? objId = null, bool? profileActive = null); } } \ No newline at end of file diff --git a/WorkFlow.Infrastructure/Contracts/IProfileObjStateRepository.cs b/WorkFlow.Infrastructure/Contracts/IProfileObjStateRepository.cs index 83a6600..bdf88cb 100644 --- a/WorkFlow.Infrastructure/Contracts/IProfileObjStateRepository.cs +++ b/WorkFlow.Infrastructure/Contracts/IProfileObjStateRepository.cs @@ -8,7 +8,7 @@ namespace WorkFlow.Infrastructure.Contracts Task> ReadAsync( bool isReadonly = true, bool withProfile = true, bool withUser = true, bool withState = true, - int? usrId = null, string? username = null, + int? userId = null, string? username = null, int? profileId = null, int? objId = null, bool? profileActive = null); } } \ No newline at end of file diff --git a/WorkFlow.Infrastructure/Repositories/ProfileControlsTFRepository.cs b/WorkFlow.Infrastructure/Repositories/ProfileControlsTFRepository.cs index eaca774..5118a93 100644 --- a/WorkFlow.Infrastructure/Repositories/ProfileControlsTFRepository.cs +++ b/WorkFlow.Infrastructure/Repositories/ProfileControlsTFRepository.cs @@ -10,7 +10,7 @@ namespace WorkFlow.Infrastructure.Repositories { protected override IQueryable ReadOnly() => base.ReadOnly().Include(pctf => pctf.Profile).Include(pctf => pctf.User); - protected IQueryable Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, int? profileId = null, int? usrId = null, string? username = null, int? objId = null, bool? profileActive = null) + protected IQueryable Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, int? profileId = null, int? userId = null, string? username = null, int? objId = null, bool? profileActive = null) { var query = isReadonly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable(); @@ -23,8 +23,8 @@ namespace WorkFlow.Infrastructure.Repositories if (profileId is not null) query = query.Where(pctf => pctf.ProfileId == profileId); - if (usrId is not null) - query = query.Where(pctf => pctf.UsrId == usrId); + if (userId is not null) + query = query.Where(pctf => pctf.UserId == userId); if (username is null) query = query.Where(pctf => pctf.User!.Username == username); @@ -41,12 +41,12 @@ namespace WorkFlow.Infrastructure.Repositories public async Task> ReadAsync( bool isReadonly = true, bool withProfile = true, bool withUser = true, - int? usrId = null, string? username = null, + int? userId = null, string? username = null, int? profileId = null, int? objId = null, bool? profileActive = null) => await Read( isReadonly: isReadonly, withProfile: withProfile, withUser: withUser, - usrId: usrId, username: username, + userId: userId, username: username, profileId: profileId, objId: objId, profileActive: profileActive) .ToListAsync(); } diff --git a/WorkFlow.Infrastructure/Repositories/ProfileObjStateRepository.cs b/WorkFlow.Infrastructure/Repositories/ProfileObjStateRepository.cs index e25fad6..a041aec 100644 --- a/WorkFlow.Infrastructure/Repositories/ProfileObjStateRepository.cs +++ b/WorkFlow.Infrastructure/Repositories/ProfileObjStateRepository.cs @@ -10,7 +10,7 @@ namespace WorkFlow.Infrastructure.Repositories { protected override IQueryable ReadOnly() => base.ReadOnly().Include(pos => pos.Profile).Include(pos => pos.State); - protected IQueryable Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, bool withState = true, int? profileId = null, int? usrId = null, string? username = null, int? stateId = null, int? objId = null, bool? profileActive = null) + protected IQueryable Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, bool withState = true, int? profileId = null, int? userId = null, string? username = null, int? stateId = null, int? objId = null, bool? profileActive = null) { var query = isReadonly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable(); @@ -26,8 +26,8 @@ namespace WorkFlow.Infrastructure.Repositories if (profileId is not null) query = query.Where(pctf => pctf.ProfileId == profileId); - if (usrId is not null) - query = query.Where(pctf => pctf.UsrId == usrId); + if (userId is not null) + query = query.Where(pctf => pctf.UserId == userId); if (username is null) query = query.Where(pctf => pctf.User!.Username == username); @@ -47,12 +47,12 @@ namespace WorkFlow.Infrastructure.Repositories public async Task> ReadAsync( bool isReadonly = true, bool withProfile = true, bool withUser = true, bool withState = true, - int? usrId = null, string? username = null, + int? userId = null, string? username = null, int? profileId = null, int? objId = null, bool? profileActive = null) => await Read( isReadonly: isReadonly, withProfile: withProfile, withUser: withUser, withState: withState, - usrId: usrId, username: username, + userId: userId, username: username, profileId: profileId, objId: objId, profileActive: profileActive) .ToListAsync(); }