diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts index 765b669..3c91ae1 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts @@ -8,6 +8,8 @@ export interface User { language?: string; comment?: string; deleted?: boolean; + deletedWhen?: Date; + deletedWho?: string; dateFormat?: string; addedWho?: string; addedWhen?: Date; @@ -70,7 +72,7 @@ export interface UserRep { repUser?: User user?: User, repGroup?: Group, - group?: Group, + group?: Group, } export interface DirGroup { diff --git a/DigitalData.UserManager.API/Controllers/UserController.cs b/DigitalData.UserManager.API/Controllers/UserController.cs index 0e370e6..d28e6f6 100644 --- a/DigitalData.UserManager.API/Controllers/UserController.cs +++ b/DigitalData.UserManager.API/Controllers/UserController.cs @@ -9,6 +9,8 @@ namespace DigitalData.UserManager.API.Controllers; [Authorize] [Obsolete("Use MediatR")] +[Route("api/[controller]")] +[ApiController] public class UserController : BaseAuthController { public UserController(ILogger logger, IUserService service) : base(logger, service, service) diff --git a/DigitalData.UserManager.Domain/Entities/User.cs b/DigitalData.UserManager.Domain/Entities/User.cs index 7f4142d..4f92d51 100644 --- a/DigitalData.UserManager.Domain/Entities/User.cs +++ b/DigitalData.UserManager.Domain/Entities/User.cs @@ -106,7 +106,11 @@ namespace DigitalData.UserManager.Domain.Entities public int UserIdFkIntEcm { get; set; } [Column("DELETED_WHEN")] - public DateTime DeletedWhen { get; set; } + public DateTime +#if NET7_0_OR_GREATER + ? +#endif + DeletedWhen { get; set; } [Column("DELETED_WHO")] [StringLength(50)] @@ -114,6 +118,10 @@ namespace DigitalData.UserManager.Domain.Entities #if NET7_0_OR_GREATER required #endif - string DeletedWho { get; set; } + string +#if NET7_0_OR_GREATER + ? +# endif + DeletedWho { get; set; } } } \ No newline at end of file