Compare commits
4 Commits
e9527ca61e
...
b1075c8b82
| Author | SHA1 | Date | |
|---|---|---|---|
| b1075c8b82 | |||
| 40deb9968f | |||
| 182771afd2 | |||
| 668eef2a4d |
@ -2,10 +2,10 @@
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using DigitalData.UserManager.Application.DTOs.Auth;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.Core.DTO;
|
||||
using Microsoft.Extensions.Localization;
|
||||
using DigitalData.UserManager.Application;
|
||||
using System.Security.Claims;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
@ -14,9 +14,11 @@ namespace DigitalData.UserManager.API.Controllers;
|
||||
public class AuthController : ControllerBase
|
||||
{
|
||||
private readonly ILogger<UserController> _logger;
|
||||
[Obsolete("Use MediatR")]
|
||||
private readonly IUserService _userService;
|
||||
private readonly IStringLocalizer<Resource> _localizer;
|
||||
|
||||
[Obsolete("Use MediatR")]
|
||||
public AuthController(ILogger<UserController> logger, IUserService userService, IStringLocalizer<Resource> localizer)
|
||||
{
|
||||
_logger = logger;
|
||||
@ -34,6 +36,7 @@ public class AuthController : ControllerBase
|
||||
|
||||
[Authorize]
|
||||
[HttpGet("user")]
|
||||
[Obsolete("Use MediatR")]
|
||||
public async Task<IActionResult> GetUserWithClaims()
|
||||
{
|
||||
try
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
using DigitalData.Core.API;
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.Core.API;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs.Base;
|
||||
using DigitalData.UserManager.Application.DTOs.User;
|
||||
@ -10,6 +10,7 @@ using System.Security.Claims;
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class BaseAuthController<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity> : CRUDControllerBaseWithErrorHandling<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity, int>
|
||||
where TCRUDService : IBaseService<TCreateDto, TReadDto, TBaseEntity>
|
||||
where TCreateDto : BaseCreateDto
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using DigitalData.Core.Abstractions.Application;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Caching.Memory;
|
||||
@ -7,14 +6,16 @@ using System.Diagnostics.CodeAnalysis;
|
||||
using System.Security.Claims;
|
||||
using DigitalData.UserManager.Application;
|
||||
using Microsoft.Extensions.Localization;
|
||||
using DigitalData.Core.DTO;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using DigitalData.Core.Abstraction.Application;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Route("api/[controller]")]
|
||||
[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class DirectoryController : ControllerBase
|
||||
{
|
||||
private readonly IUserService _userService;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs.Group;
|
||||
using DigitalData.UserManager.Domain.Entities;
|
||||
@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class GroupController : BaseAuthController<IGroupService, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group>
|
||||
{
|
||||
public GroupController(ILogger<GroupController> logger, IGroupService service, IUserService userService) : base(logger, service, userService)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs.GroupOfUser;
|
||||
using DigitalData.UserManager.Domain.Entities;
|
||||
@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class GroupOfUserController : BaseAuthController<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser>
|
||||
{
|
||||
public GroupOfUserController(ILogger<GroupOfUserController> logger, IGroupOfUserService service, IUserService userService) : base(logger, service, userService)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.Core.API;
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs.ModuleOfUser;
|
||||
using DigitalData.UserManager.Domain.Entities;
|
||||
@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class ModuleOfUserController : CRUDControllerBaseWithErrorHandling<IModuleOfUserService, ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
|
||||
{
|
||||
public ModuleOfUserController(ILogger<ModuleOfUserController> logger, IModuleOfUserService service) : base(logger, service)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs.User;
|
||||
using DigitalData.UserManager.Domain.Entities;
|
||||
@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class UserController : BaseAuthController<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User>
|
||||
{
|
||||
public UserController(ILogger<UserController> logger, IUserService service) : base(logger, service, service)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.UserManager.Application.Contracts;
|
||||
using DigitalData.UserManager.Application.DTOs.UserRep;
|
||||
using DigitalData.UserManager.Domain.Entities;
|
||||
@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace DigitalData.UserManager.API.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[Obsolete("Use MediatR")]
|
||||
public class UserRepController : BaseAuthController<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep>
|
||||
{
|
||||
public UserRepController(ILogger<UserRepController> logger, IUserRepService service, IUserService userService) : base(logger, service, userService)
|
||||
|
||||
@ -22,7 +22,8 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
|
||||
<PackageReference Include="DigitalData.Core.API" Version="2.2.0" />
|
||||
<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
|
||||
<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
using DigitalData.Core.DTO;
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
|
||||
namespace DigitalData.UserManager.Application.DTOs.Base
|
||||
{
|
||||
// TODO: use getter - setter methods for a simple inheritance.
|
||||
[Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
|
||||
public record BaseReadDto(int Id, string? AddedWho, DateTime? AddedWhen, string? ChangedWho, DateTime? ChangedWhen) : BaseDTO<int>(Id);
|
||||
}
|
||||
@ -26,6 +26,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
|
||||
<PackageReference Include="DigitalData.Core.Application" Version="3.3.4" />
|
||||
<PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.1.1" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -25,6 +25,10 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
|
||||
<ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
|
||||
<TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<PackageId>UserManager.Domain</PackageId>
|
||||
@ -13,11 +13,38 @@
|
||||
<Copyright>Copyright 2024</Copyright>
|
||||
<PackageIcon>icon.png</PackageIcon>
|
||||
<RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
|
||||
<PackageTags>digital data domain user maanger</PackageTags>
|
||||
<PackageTags>digital data domain user manager</PackageTags>
|
||||
<AssemblyVersion>3.1.0</AssemblyVersion>
|
||||
<FileVersion>3.1.0</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' != 'net462'">
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<LangVersion>latest</LangVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="4.7.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
||||
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||
<PackageReference Include="System.Drawing.Common" Version="8.0.16" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
||||
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\Assets\icon.png">
|
||||
<Pack>True</Pack>
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
#if NETFRAMEWORK
|
||||
using System;
|
||||
#endif
|
||||
|
||||
namespace DigitalData.UserManager.Domain.Entities
|
||||
{
|
||||
@ -13,11 +16,21 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
|
||||
[StringLength(50)]
|
||||
[Column("ADDED_WHO")]
|
||||
public string? AddedWho { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
AddedWho
|
||||
{ get; set; }
|
||||
|
||||
[StringLength(50)]
|
||||
[Column("CHANGED_WHO")]
|
||||
public string? ChangedWho { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
ChangedWho
|
||||
{ get; set; }
|
||||
|
||||
//TODO: assign it to default value in create dto, not here!
|
||||
[Column("ADDED_WHEN", TypeName = "datetime")]
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
#if NETFRAMEWORK
|
||||
using System;
|
||||
#endif
|
||||
|
||||
namespace DigitalData.UserManager.Domain.Entities
|
||||
{
|
||||
@ -14,18 +17,28 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
|
||||
[Required]
|
||||
[Column("USER_ID")]
|
||||
public int UserId { get; init; }
|
||||
public int UserId { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column("CLIENT_ID")]
|
||||
public int ClientId { get; init; }
|
||||
public int ClientId { get; set; }
|
||||
|
||||
[Column("COMMENT")]
|
||||
public string? Comment { get; init; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Comment
|
||||
{ get; set; }
|
||||
|
||||
[StringLength(50)]
|
||||
[Column("ADDED_WHO")]
|
||||
public string? AddedWho { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
AddedWho
|
||||
{ get; set; }
|
||||
|
||||
[Column("ADDED_WHEN", TypeName = "datetime")]
|
||||
[DefaultValue("GETDATE()")]
|
||||
|
||||
@ -8,7 +8,11 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
public class Group : BaseEntity
|
||||
{
|
||||
[StringLength(50)]
|
||||
public string? Name { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Name { get; set; }
|
||||
|
||||
[Required]
|
||||
[DefaultValue(false)]
|
||||
@ -24,12 +28,17 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
public bool Active { get; set; }
|
||||
|
||||
[StringLength(200)]
|
||||
public string? Comment { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Comment
|
||||
{ get; set; }
|
||||
|
||||
// TODO: this column should be assigned by triggers. despite this it is not null and this is problem for creation. talk with others
|
||||
[Required]
|
||||
[Column("ECM_FK_ID")]
|
||||
[DefaultValue(-1)]
|
||||
public int EcmFkId { get; init; } = -1;
|
||||
public int EcmFkId { get; set; } = -1;
|
||||
}
|
||||
}
|
||||
@ -15,12 +15,24 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
public int GroupId { get; set; }
|
||||
|
||||
[StringLength(200)]
|
||||
public string? Comment { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Comment { get; set; }
|
||||
|
||||
[ForeignKey("UserId")]
|
||||
public virtual User? User { get; set; }
|
||||
public virtual User
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
User { get; set; }
|
||||
|
||||
[ForeignKey("GroupId")]
|
||||
public virtual Group? Group { get; set; }
|
||||
public virtual Group
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Group { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -12,11 +12,19 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
public int Id { get; set; }
|
||||
|
||||
[StringLength(50)]
|
||||
public string? Name { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Name { get; set; }
|
||||
|
||||
[StringLength(20)]
|
||||
[Column("SHORT_NAME")]
|
||||
public string? ShortName { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
ShortName { get; set; }
|
||||
|
||||
#region IGNORED COLUMNS
|
||||
//[Required]
|
||||
|
||||
@ -21,21 +21,41 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
|
||||
[Column("COMMENT")]
|
||||
[StringLength(200)]
|
||||
public string? Comment { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Comment { get; set; }
|
||||
|
||||
[Column("ADDED_WHO")]
|
||||
[StringLength(50)]
|
||||
public string? AddedWho { get; set; } = "DEFAULT";
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
AddedWho { get; set; } = "DEFAULT";
|
||||
|
||||
[Column("CHANGED_WHO")]
|
||||
[StringLength(50)]
|
||||
public string? ChangedWho { get; set; }
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
ChangedWho { get; set; }
|
||||
|
||||
[ForeignKey("UserId")]
|
||||
public virtual User? User { get; set; }
|
||||
public virtual User
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
User { get; set; }
|
||||
|
||||
[ForeignKey("ModuleId")]
|
||||
public virtual Module? Module { get; set; }
|
||||
public virtual Module
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Module { get; set; }
|
||||
|
||||
#region IGNORED COLUMNS
|
||||
//public bool IsAdmin { get; set; }
|
||||
@ -53,5 +73,4 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
//public DateTime? ChangedWhen { get; set; }
|
||||
#endregion
|
||||
}
|
||||
|
||||
}
|
||||
@ -2,75 +2,101 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DigitalData.UserManager.Domain.Entities;
|
||||
|
||||
[Table("TBDD_USER", Schema = "dbo")]
|
||||
public class User : BaseEntity
|
||||
namespace DigitalData.UserManager.Domain.Entities
|
||||
{
|
||||
[Column("PRENAME")]
|
||||
[StringLength(50)]
|
||||
public string? Prename { get; set; }
|
||||
[Table("TBDD_USER", Schema = "dbo")]
|
||||
public class User : BaseEntity
|
||||
{
|
||||
[Column("PRENAME")]
|
||||
[StringLength(50)]
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Prename { get; set; }
|
||||
|
||||
[Column("NAME")]
|
||||
[StringLength(50)]
|
||||
public string? Name { get; set; }
|
||||
[Column("NAME")]
|
||||
[StringLength(50)]
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Name { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column("USERNAME")]
|
||||
[StringLength(50)]
|
||||
public string Username { get; set; }
|
||||
[Required]
|
||||
[Column("USERNAME")]
|
||||
[StringLength(50)]
|
||||
public string Username { get; set; }
|
||||
|
||||
[Column("SHORTNAME")]
|
||||
[StringLength(30)]
|
||||
public string? Shortname { get; set; }
|
||||
[Column("SHORTNAME")]
|
||||
[StringLength(30)]
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Shortname
|
||||
{ get; set; }
|
||||
|
||||
[Column("EMAIL")]
|
||||
[StringLength(100)]
|
||||
public string? Email { get; set; }
|
||||
[Column("EMAIL")]
|
||||
[StringLength(100)]
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Email { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column("LANGUAGE")]
|
||||
[StringLength(5)]
|
||||
[DefaultValue("de-DE")]
|
||||
public string Language { get; set; }
|
||||
[Required]
|
||||
[Column("LANGUAGE")]
|
||||
[StringLength(5)]
|
||||
[DefaultValue("de-DE")]
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Language { get; set; }
|
||||
|
||||
[Column("COMMENT")]
|
||||
[StringLength(500)]
|
||||
public string? Comment { get; set; }
|
||||
[Column("COMMENT")]
|
||||
[StringLength(500)]
|
||||
public string
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Comment { get; set; }
|
||||
|
||||
[Column("DELETED")]
|
||||
public bool Deleted { get; set; }
|
||||
[Column("DELETED")]
|
||||
public bool Deleted { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column("DATE_FORMAT")]
|
||||
[StringLength(10)]
|
||||
[DefaultValue("dd.MM.yyyy")]
|
||||
public string DateFormat { get; set; }
|
||||
[Required]
|
||||
[Column("DATE_FORMAT")]
|
||||
[StringLength(10)]
|
||||
[DefaultValue("dd.MM.yyyy")]
|
||||
public string DateFormat { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column("ACTIVE")]
|
||||
public bool Active { get; set; }
|
||||
[Required]
|
||||
[Column("ACTIVE")]
|
||||
public bool Active { get; set; }
|
||||
|
||||
#region IGNORED COLUMNS
|
||||
//[Required]
|
||||
//[Column("GENERAL_VIEWER")]
|
||||
//[StringLength(30)]
|
||||
//[DefaultValue("NONE")]
|
||||
//public string GeneralViewer { get; set; }
|
||||
#region IGNORED COLUMNS
|
||||
//[Required]
|
||||
//[Column("GENERAL_VIEWER")]
|
||||
//[StringLength(30)]
|
||||
//[DefaultValue("NONE")]
|
||||
//public string GeneralViewer { get; set; }
|
||||
|
||||
//[Required]
|
||||
//[Column("WAN_ENVIRONMENT")]
|
||||
//public bool WanEnvironment { get; set; }
|
||||
//[Required]
|
||||
//[Column("WAN_ENVIRONMENT")]
|
||||
//public bool WanEnvironment { get; set; }
|
||||
|
||||
//[Required]
|
||||
//[Column("USERID_FK_INT_ECM")]
|
||||
//public int UseridFkIntEcm { get; set; }
|
||||
//[Required]
|
||||
//[Column("USERID_FK_INT_ECM")]
|
||||
//public int UseridFkIntEcm { get; set; }
|
||||
|
||||
//[Column("DELETED_WHEN")]
|
||||
//public DateTime? DeletedWhen { get; set; }
|
||||
//[Column("DELETED_WHEN")]
|
||||
//public DateTime? DeletedWhen { get; set; }
|
||||
|
||||
//[Column("DELETED_WHO")]
|
||||
//[StringLength(50)]
|
||||
//public string? DeletedWho { get; set; }
|
||||
#endregion
|
||||
//[Column("DELETED_WHO")]
|
||||
//[StringLength(50)]
|
||||
//public string? DeletedWho { get; set; }
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
#if NETFRAMEWORK
|
||||
using System;
|
||||
#endif
|
||||
|
||||
namespace DigitalData.UserManager.Domain.Entities
|
||||
{
|
||||
@ -25,15 +27,31 @@ namespace DigitalData.UserManager.Domain.Entities
|
||||
public DateTime? ValidTo { get; set; }
|
||||
|
||||
[ForeignKey("UserId")]
|
||||
public virtual User? User { get; set; }
|
||||
public virtual User
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
User { get; set; }
|
||||
|
||||
[ForeignKey("RepGroupId")]
|
||||
public virtual Group? RepGroup { get; set; }
|
||||
public virtual Group
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
RepGroup { get; set; }
|
||||
|
||||
[ForeignKey("GroupId")]
|
||||
public virtual Group? Group { get; set; }
|
||||
public virtual Group
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
Group { get; set; }
|
||||
|
||||
[ForeignKey("RepUserId")]
|
||||
public virtual User? RepUser { get; set; }
|
||||
public virtual User
|
||||
#if NET6_0_OR_GREATER
|
||||
?
|
||||
#endif
|
||||
RepUser { get; set; }
|
||||
}
|
||||
}
|
||||
@ -26,6 +26,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
|
||||
<PackageReference Include="DigitalData.Core.Infrastructure" Version="2.1.1" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user