Adding role creation during startup + minor fixes in tests
This commit is contained in:
@@ -7,7 +7,6 @@ public class AuthenticatedUser
|
||||
{
|
||||
#nullable enable
|
||||
public string? Guid { get; set; }
|
||||
public string? Username { get; set; }
|
||||
public string? FirstName { get; set; }
|
||||
public string? LastName { get; set; }
|
||||
public string? Email { get; set; }
|
||||
@@ -17,7 +16,6 @@ public class AuthenticatedUser
|
||||
public AuthenticatedUser(DatabaseSqlServer.User user)
|
||||
{
|
||||
Guid = user.Guid;
|
||||
Username = user.Username;
|
||||
FirstName = user.FirstName;
|
||||
LastName = user.LastName;
|
||||
Email = user.Email;
|
||||
|
||||
@@ -7,7 +7,6 @@ public class UserDto
|
||||
{
|
||||
#nullable enable
|
||||
public string? Guid { get; set; }
|
||||
public string? Username { get; set; }
|
||||
public string? FirstName { get; set; }
|
||||
public string? LastName { get; set; }
|
||||
public string? Email { get; set; }
|
||||
|
||||
@@ -3,7 +3,7 @@ namespace BasicDotnetTemplate.MainProject.Models.Api.Data.Auth;
|
||||
public class AuthenticateRequestData
|
||||
{
|
||||
#nullable enable
|
||||
public string? Username { get; set; }
|
||||
public string? Email { get; set; }
|
||||
public string? Password { get; set; }
|
||||
#nullable disable
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Data.Role;
|
||||
|
||||
public class CreateRoleRequestData
|
||||
{
|
||||
public string Name { get; set; } = String.Empty;
|
||||
public required bool IsNotEditable { get; set; }
|
||||
|
||||
}
|
||||
15
MainProject/Models/Api/Data/User/CreateUserRequestData.cs
Normal file
15
MainProject/Models/Api/Data/User/CreateUserRequestData.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Data.User;
|
||||
|
||||
public class CreateUserRequestData
|
||||
{
|
||||
public string FirstName { get; set; } = String.Empty;
|
||||
public string LastName { get; set; } = String.Empty;
|
||||
public string Email { get; set; } = String.Empty;
|
||||
public string Password { get; set; } = String.Empty;
|
||||
public string? RoleGuid { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
14
MainProject/Models/Api/Request/User/CreateUserRequest.cs
Normal file
14
MainProject/Models/Api/Request/User/CreateUserRequest.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using BasicDotnetTemplate.MainProject.Models.Api.Data.User;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Request.User;
|
||||
|
||||
public class CreateUserRequest
|
||||
{
|
||||
#nullable enable
|
||||
public CreateUserRequestData? Data { get; set; }
|
||||
#nullable disable
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -10,11 +10,13 @@ public class Base
|
||||
public string Guid { get; set; }
|
||||
public bool IsDeleted { get; set; }
|
||||
public DateTime CreationTime { get; set; }
|
||||
public int CreationUserId { get; set; }
|
||||
public DateTime UpdateTime { get; set; }
|
||||
public int UpdateUserId { get; set; }
|
||||
public DateTime DeletionTime { get; set; }
|
||||
public int DeletionUserId { get; set; }
|
||||
#nullable enable
|
||||
public int? CreationUserId { get; set; }
|
||||
public DateTime? UpdateTime { get; set; }
|
||||
public int? UpdateUserId { get; set; }
|
||||
public DateTime? DeletionTime { get; set; }
|
||||
public int? DeletionUserId { get; set; }
|
||||
#nullable disable
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Database.SqlServer
|
||||
{
|
||||
public class Role : Base
|
||||
{
|
||||
[MaxLength(100)]
|
||||
public required string Name { get; set; }
|
||||
public required bool IsNotEditable { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@ namespace BasicDotnetTemplate.MainProject.Models.Database.SqlServer;
|
||||
|
||||
public class User : Base
|
||||
{
|
||||
[MaxLength(200)]
|
||||
public required string Username { get; set; }
|
||||
[MaxLength(200)]
|
||||
public required string FirstName { get; set; }
|
||||
[MaxLength(200)]
|
||||
|
||||
Reference in New Issue
Block a user