diff --git a/Moonlight.Api/Http/Controllers/Admin/DiagnoseController.cs b/Moonlight.Api/Http/Controllers/Admin/DiagnoseController.cs index acff03f9..4cc69827 100644 --- a/Moonlight.Api/Http/Controllers/Admin/DiagnoseController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/DiagnoseController.cs @@ -17,13 +17,13 @@ public class DiagnoseController : Controller } [HttpGet] - public async Task> GetAsync() + public async Task> GetAsync() { var results = await DiagnoseService.DiagnoseAsync(); return results .OrderBy(x => x.Level) - .MapToResult() + .ToDto() .ToArray(); } } \ No newline at end of file diff --git a/Moonlight.Api/Http/Controllers/Admin/RolesController.cs b/Moonlight.Api/Http/Controllers/Admin/RolesController.cs index 0cbe3b98..4df2077b 100644 --- a/Moonlight.Api/Http/Controllers/Admin/RolesController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/RolesController.cs @@ -22,7 +22,7 @@ public class RolesController : Controller } [HttpGet] - public async Task>> GetAsync( + public async Task>> GetAsync( [FromQuery] int startIndex, [FromQuery] int length, [FromQuery] FilterOptions? filterOptions @@ -57,18 +57,18 @@ public class RolesController : Controller // Pagination var data = await query - .ProjectToResponse() + .ProjectToDto() .Skip(startIndex) .Take(length) .ToArrayAsync(); var total = await query.CountAsync(); - return new PagedData(data, total); + return new PagedData(data, total); } [HttpGet("{id:int}")] - public async Task> GetAsync([FromRoute] int id) + public async Task> GetAsync([FromRoute] int id) { var role = await RoleRepository .Query() @@ -77,21 +77,21 @@ public class RolesController : Controller if (role == null) return Problem("No role with this id found", statusCode: 404); - return RoleMapper.MapToResponse(role); + return RoleMapper.ToDto(role); } [HttpPost] - public async Task> CreateAsync([FromBody] CreateRoleRequest request) + public async Task> CreateAsync([FromBody] CreateRoleDto request) { - var role = RoleMapper.MapToRole(request); + var role = RoleMapper.ToEntity(request); var finalRole = await RoleRepository.AddAsync(role); - return RoleMapper.MapToResponse(finalRole); + return RoleMapper.ToDto(finalRole); } [HttpPatch("{id:int}")] - public async Task> UpdateAsync([FromRoute] int id, [FromBody] UpdateRoleRequest request) + public async Task> UpdateAsync([FromRoute] int id, [FromBody] UpdateRoleDto request) { var role = await RoleRepository .Query() @@ -104,7 +104,7 @@ public class RolesController : Controller await RoleRepository.UpdateAsync(role); - return RoleMapper.MapToResponse(role); + return RoleMapper.ToDto(role); } [HttpDelete("{id:int}")] diff --git a/Moonlight.Api/Http/Controllers/Admin/SystemController.cs b/Moonlight.Api/Http/Controllers/Admin/SystemController.cs index 96671292..fba690b9 100644 --- a/Moonlight.Api/Http/Controllers/Admin/SystemController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/SystemController.cs @@ -16,12 +16,12 @@ public class SystemController : Controller } [HttpGet("info")] - public async Task> GetInfoAsync() + public async Task> GetInfoAsync() { var cpuUsage = await ApplicationService.GetCpuUsageAsync(); var memoryUsage = await ApplicationService.GetMemoryUsageAsync(); - return new SystemInfoResponse( + return new SystemInfoDto( cpuUsage, memoryUsage, ApplicationService.OperatingSystem, diff --git a/Moonlight.Api/Http/Controllers/AuthController.cs b/Moonlight.Api/Http/Controllers/AuthController.cs index c7401736..a5ff547a 100644 --- a/Moonlight.Api/Http/Controllers/AuthController.cs +++ b/Moonlight.Api/Http/Controllers/AuthController.cs @@ -17,13 +17,13 @@ public class AuthController : Controller } [HttpGet] - public async Task> GetSchemesAsync() + public async Task> GetSchemesAsync() { var schemes = await SchemeProvider.GetAllSchemesAsync(); return schemes .Where(scheme => !string.IsNullOrWhiteSpace(scheme.DisplayName)) - .Select(scheme => new SchemeResponse(scheme.Name, scheme.DisplayName!)) + .Select(scheme => new SchemeDto(scheme.Name, scheme.DisplayName!)) .ToArray(); } @@ -43,13 +43,13 @@ public class AuthController : Controller [Authorize] [HttpGet("claims")] - public Task> GetClaimsAsync() + public Task> GetClaimsAsync() { var result = User.Claims - .Select(claim => new ClaimResponse(claim.Type, claim.Value)) + .Select(claim => new ClaimDto(claim.Type, claim.Value)) .ToArray(); - return Task.FromResult>(result); + return Task.FromResult>(result); } [HttpGet("logout")] diff --git a/Moonlight.Api/Http/Controllers/UsersController.cs b/Moonlight.Api/Http/Controllers/UsersController.cs index 231c0a29..d1f7e15c 100644 --- a/Moonlight.Api/Http/Controllers/UsersController.cs +++ b/Moonlight.Api/Http/Controllers/UsersController.cs @@ -24,7 +24,7 @@ public class UsersController : Controller } [HttpGet] - public async Task>> GetAsync( + public async Task>> GetAsync( [FromQuery] int startIndex, [FromQuery] int length, [FromQuery] FilterOptions? filterOptions @@ -62,18 +62,18 @@ public class UsersController : Controller // Pagination var data = await query - .ProjectToResponse() + .ProjectToDto() .Skip(startIndex) .Take(length) .ToArrayAsync(); var total = await query.CountAsync(); - return new PagedData(data, total); + return new PagedData(data, total); } [HttpGet("{id:int}")] - public async Task> GetAsync([FromRoute] int id) + public async Task> GetAsync([FromRoute] int id) { var user = await UserRepository .Query() @@ -82,22 +82,22 @@ public class UsersController : Controller if (user == null) return Problem("No user with this id found", statusCode: 404); - return UserMapper.MapToResponse(user); + return UserMapper.ToDto(user); } [HttpPost] - public async Task> CreateAsync([FromBody] CreateUserRequest request) + public async Task> CreateAsync([FromBody] CreateUserDto request) { - var user = UserMapper.MapToUser(request); + var user = UserMapper.ToEntity(request); user.InvalidateTimestamp = DateTimeOffset.UtcNow.AddMinutes(-1); var finalUser = await UserRepository.AddAsync(user); - return UserMapper.MapToResponse(finalUser); + return UserMapper.ToDto(finalUser); } [HttpPatch("{id:int}")] - public async Task> UpdateAsync([FromRoute] int id, [FromBody] UpdateUserRequest request) + public async Task> UpdateAsync([FromRoute] int id, [FromBody] UpdateUserDto request) { var user = await UserRepository .Query() @@ -109,7 +109,7 @@ public class UsersController : Controller UserMapper.Merge(user, request); await UserRepository.UpdateAsync(user); - return UserMapper.MapToResponse(user); + return UserMapper.ToDto(user); } [HttpDelete("{id:int}")] diff --git a/Moonlight.Api/Mappers/DiagnoseResultMapper.cs b/Moonlight.Api/Mappers/DiagnoseResultMapper.cs index b5a6ad2b..ffa91e04 100644 --- a/Moonlight.Api/Mappers/DiagnoseResultMapper.cs +++ b/Moonlight.Api/Mappers/DiagnoseResultMapper.cs @@ -10,5 +10,5 @@ namespace Moonlight.Api.Mappers; [SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")] public static partial class DiagnoseResultMapper { - public static partial IEnumerable MapToResult(this IEnumerable results); + public static partial IEnumerable ToDto(this IEnumerable results); } \ No newline at end of file diff --git a/Moonlight.Api/Mappers/RoleMapper.cs b/Moonlight.Api/Mappers/RoleMapper.cs index 1b454a00..7ac52dad 100644 --- a/Moonlight.Api/Mappers/RoleMapper.cs +++ b/Moonlight.Api/Mappers/RoleMapper.cs @@ -11,10 +11,10 @@ namespace Moonlight.Api.Mappers; [SuppressMessage("Mapper", "RMG012:Source member was not found for target member")] public static partial class RoleMapper { - [MapProperty([nameof(Role.Members), nameof(Role.Members.Count)], nameof(RoleResponse.MemberCount))] - public static partial RoleResponse MapToResponse(Role role); - public static partial Role MapToRole(CreateRoleRequest request); - public static partial void Merge([MappingTarget] Role role, UpdateRoleRequest request); + [MapProperty([nameof(Role.Members), nameof(Role.Members.Count)], nameof(RoleDto.MemberCount))] + public static partial RoleDto ToDto(Role role); + public static partial Role ToEntity(CreateRoleDto request); + public static partial void Merge([MappingTarget] Role role, UpdateRoleDto request); - public static partial IQueryable ProjectToResponse(this IQueryable roles); + public static partial IQueryable ProjectToDto(this IQueryable roles); } \ No newline at end of file diff --git a/Moonlight.Api/Mappers/UserMapper.cs b/Moonlight.Api/Mappers/UserMapper.cs index a70b8fc4..2d150bc5 100644 --- a/Moonlight.Api/Mappers/UserMapper.cs +++ b/Moonlight.Api/Mappers/UserMapper.cs @@ -11,11 +11,11 @@ namespace Moonlight.Api.Mappers; [SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")] public static partial class UserMapper { - public static partial IQueryable ProjectToResponse(this IQueryable users); + public static partial IQueryable ProjectToDto(this IQueryable users); - public static partial UserResponse MapToResponse(User user); + public static partial UserDto ToDto(User user); - public static partial void Merge([MappingTarget] User user, UpdateUserRequest request); + public static partial void Merge([MappingTarget] User user, UpdateUserDto request); - public static partial User MapToUser(CreateUserRequest request); + public static partial User ToEntity(CreateUserDto request); } \ No newline at end of file diff --git a/Moonlight.Frontend/Mappers/RoleMapper.cs b/Moonlight.Frontend/Mappers/RoleMapper.cs index 5392816d..3495f872 100644 --- a/Moonlight.Frontend/Mappers/RoleMapper.cs +++ b/Moonlight.Frontend/Mappers/RoleMapper.cs @@ -10,5 +10,5 @@ namespace Moonlight.Frontend.Mappers; [SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")] public static partial class RoleMapper { - public static partial UpdateRoleRequest MapToUpdate(RoleResponse role); + public static partial UpdateRoleDto ToUpdate(RoleDto role); } \ No newline at end of file diff --git a/Moonlight.Frontend/Mappers/UserMapper.cs b/Moonlight.Frontend/Mappers/UserMapper.cs index 847cc5b2..0762ba58 100644 --- a/Moonlight.Frontend/Mappers/UserMapper.cs +++ b/Moonlight.Frontend/Mappers/UserMapper.cs @@ -10,5 +10,5 @@ namespace Moonlight.Frontend.Mappers; [SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")] public static partial class UserMapper { - public static partial UpdateUserRequest MapToUpdate(UserResponse response); + public static partial UpdateUserDto ToUpdate(UserDto dto); } \ No newline at end of file diff --git a/Moonlight.Frontend/Services/RemoteAuthProvider.cs b/Moonlight.Frontend/Services/RemoteAuthProvider.cs index 0dfc107e..22cdee35 100644 --- a/Moonlight.Frontend/Services/RemoteAuthProvider.cs +++ b/Moonlight.Frontend/Services/RemoteAuthProvider.cs @@ -22,7 +22,7 @@ public class RemoteAuthProvider : AuthenticationStateProvider { try { - var claimResponses = await HttpClient.GetFromJsonAsync( + var claimResponses = await HttpClient.GetFromJsonAsync( "api/auth/claims", Constants.SerializerOptions ); diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor index 612cc5d6..8b888027 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor @@ -56,9 +56,9 @@ @code { - [Parameter] public Func OnSubmit { get; set; } + [Parameter] public Func OnSubmit { get; set; } - private CreateRoleRequest Request; + private CreateRoleDto Request; private List Permissions; private FormHandler FormHandler; diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor index c904ce31..8db331d0 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor @@ -58,16 +58,16 @@ @code { - [Parameter] public Func OnSubmit { get; set; } - [Parameter] public RoleResponse Role { get; set; } + [Parameter] public Func OnSubmit { get; set; } + [Parameter] public RoleDto Role { get; set; } - private UpdateRoleRequest Request; + private UpdateRoleDto Request; private List Permissions; private FormHandler FormHandler; protected override void OnInitialized() { - Request = RoleMapper.MapToUpdate(Role); + Request = RoleMapper.ToUpdate(Role); Permissions = Role.Permissions.ToList(); } diff --git a/Moonlight.Frontend/UI/Admin/Views/Overview.razor b/Moonlight.Frontend/UI/Admin/Views/Overview.razor index 43e861f7..ddea7a73 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Overview.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Overview.razor @@ -144,14 +144,14 @@ @code { private bool IsInfoLoading = true; - private SystemInfoResponse? InfoResponse; + private SystemInfoDto? InfoResponse; protected override async Task OnAfterRenderAsync(bool firstRender) { if(!firstRender) return; - InfoResponse = await HttpClient.GetFromJsonAsync("api/admin/system/info", Constants.SerializerOptions); + InfoResponse = await HttpClient.GetFromJsonAsync("api/admin/system/info", Constants.SerializerOptions); IsInfoLoading = false; await InvokeAsync(StateHasChanged); diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor index e5a744c4..4187c446 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor @@ -218,7 +218,7 @@ { private bool IsLoading = false; private bool HasDiagnosed = false; - private DiagnoseResultResponse[] Entries; + private DiagnoseResultDto[] Entries; private async Task DiagnoseAsync() { @@ -226,7 +226,7 @@ HasDiagnosed = false; await InvokeAsync(StateHasChanged); - var results = await HttpClient.GetFromJsonAsync("api/admin/system/diagnose"); + var results = await HttpClient.GetFromJsonAsync("api/admin/system/diagnose"); Entries = results ?? []; IsLoading = false; diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Roles.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Roles.razor index 3720fb52..34dd51fd 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Sys/Roles.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Roles.razor @@ -27,9 +27,9 @@
- + - + @@ -68,26 +68,26 @@ @code { - private DataGrid Grid; + private DataGrid Grid; - private async Task> LoadAsync(DataGridRequest request) + private async Task> LoadAsync(DataGridRequest request) { var query = $"?startIndex={request.StartIndex}&length={request.Length}"; var filterOptions = request.Filters.Count > 0 ? new FilterOptions(request.Filters) : null; - var response = await HttpClient.GetFromJsonAsync>( + var response = await HttpClient.GetFromJsonAsync>( $"api/admin/roles{query}&filterOptions={filterOptions}", Constants.SerializerOptions ); - return new DataGridResponse(response!.Data, response.TotalLength); + return new DataGridResponse(response!.Data, response.TotalLength); } private async Task CreateAsync() { await DialogService.LaunchAsync(parameters => { - parameters[nameof(CreateRoleDialog.OnSubmit)] = async Task (CreateRoleRequest request) => + parameters[nameof(CreateRoleDialog.OnSubmit)] = async Task (CreateRoleDto request) => { await HttpClient.PostAsJsonAsync( "api/admin/roles", @@ -101,12 +101,12 @@ }); } - private async Task EditAsync(RoleResponse role) + private async Task EditAsync(RoleDto role) { await DialogService.LaunchAsync(parameters => { parameters[nameof(UpdateRoleDialog.Role)] = role; - parameters[nameof(UpdateRoleDialog.OnSubmit)] = async Task (UpdateRoleRequest request) => + parameters[nameof(UpdateRoleDialog.OnSubmit)] = async Task (UpdateRoleDto request) => { await HttpClient.PatchAsJsonAsync( $"api/admin/roles/{role.Id}", @@ -120,7 +120,7 @@ }); } - private async Task DeleteAsync(RoleResponse role) + private async Task DeleteAsync(RoleDto role) { await AlertDialogService.ConfirmDangerAsync( $"Deletion of role {role.Name}", diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Create.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Create.razor index 4c21594d..35d7f0eb 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Users/Create.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Users/Create.razor @@ -69,7 +69,7 @@ @code { - private CreateUserRequest Request = new(); + private CreateUserDto Request = new(); private FormHandler Form; diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Edit.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Edit.razor index 08b8c8f8..cd285370 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Users/Edit.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Users/Edit.razor @@ -77,15 +77,15 @@ [Parameter] public int Id { get; set; } private FormHandler Form; - private UpdateUserRequest Request; - private UserResponse User; + private UpdateUserDto Request; + private UserDto User; private async Task LoadAsync(LazyLoader _) { - var user = await HttpClient.GetFromJsonAsync($"api/users/{Id}", Constants.SerializerOptions); + var user = await HttpClient.GetFromJsonAsync($"api/users/{Id}", Constants.SerializerOptions); User = user!; - Request = UserMapper.MapToUpdate(User); + Request = UserMapper.ToUpdate(User); } private async Task OnSubmitAsync() diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Index.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Index.razor index 4d470eff..0a628dc8 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Users/Index.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Users/Index.razor @@ -36,12 +36,12 @@
- + + Identifier="@nameof(UserDto.Username)" Field="u => u.Username"/> + Identifier="@nameof(UserDto.Email)" Field="u => u.Email"/> @@ -78,24 +78,24 @@ @code { - private DataGrid Grid; + private DataGrid Grid; - private async Task> LoadAsync(DataGridRequest request) + private async Task> LoadAsync(DataGridRequest request) { var query = $"?startIndex={request.StartIndex}&length={request.Length}"; var filterOptions = request.Filters.Count > 0 ? new FilterOptions(request.Filters) : null; - var response = await HttpClient.GetFromJsonAsync>( + var response = await HttpClient.GetFromJsonAsync>( $"api/users{query}&filterOptions={filterOptions}", Constants.SerializerOptions ); - return new DataGridResponse(response!.Data, response.TotalLength); + return new DataGridResponse(response!.Data, response.TotalLength); } - private void Edit(UserResponse response) => Navigation.NavigateTo($"/users/{response.Id}"); + private void Edit(UserDto dto) => Navigation.NavigateTo($"/users/{dto.Id}"); - private async Task DeleteAsync(UserResponse user) + private async Task DeleteAsync(UserDto user) { await AlertDialogService.ConfirmDangerAsync( $"Deletion of user {user.Username}", diff --git a/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor b/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor index dac2fb49..1278c182 100644 --- a/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor +++ b/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor @@ -40,14 +40,14 @@ @code { - private SchemeResponse[]? Schemes; + private SchemeDto[]? Schemes; protected override async Task OnAfterRenderAsync(bool firstRender) { if (!firstRender) return; - var schemes = await HttpClient.GetFromJsonAsync( + var schemes = await HttpClient.GetFromJsonAsync( "api/auth", Constants.SerializerOptions ); diff --git a/Moonlight.Shared/Http/Requests/Roles/CreateRoleRequest.cs b/Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs similarity index 90% rename from Moonlight.Shared/Http/Requests/Roles/CreateRoleRequest.cs rename to Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs index 04024f28..5b4984d3 100644 --- a/Moonlight.Shared/Http/Requests/Roles/CreateRoleRequest.cs +++ b/Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Moonlight.Shared.Http.Requests.Roles; -public class CreateRoleRequest +public class CreateRoleDto { [Required] [MaxLength(15)] public string Name { get; set; } diff --git a/Moonlight.Shared/Http/Requests/Roles/UpdateRoleRequest.cs b/Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs similarity index 90% rename from Moonlight.Shared/Http/Requests/Roles/UpdateRoleRequest.cs rename to Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs index 3b1f08db..78fb81eb 100644 --- a/Moonlight.Shared/Http/Requests/Roles/UpdateRoleRequest.cs +++ b/Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Moonlight.Shared.Http.Requests.Roles; -public class UpdateRoleRequest +public class UpdateRoleDto { [Required] [MaxLength(15)] public string Name { get; set; } diff --git a/Moonlight.Shared/Http/Requests/Users/CreateUserRequest.cs b/Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs similarity index 89% rename from Moonlight.Shared/Http/Requests/Users/CreateUserRequest.cs rename to Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs index 4b2a2caa..826b7129 100644 --- a/Moonlight.Shared/Http/Requests/Users/CreateUserRequest.cs +++ b/Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs @@ -2,7 +2,7 @@ namespace Moonlight.Shared.Http.Requests.Users; -public class CreateUserRequest +public class CreateUserDto { [Required] [MinLength(3)] diff --git a/Moonlight.Shared/Http/Requests/Users/UpdateUserRequest.cs b/Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs similarity index 89% rename from Moonlight.Shared/Http/Requests/Users/UpdateUserRequest.cs rename to Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs index 100a28f8..c2182bc1 100644 --- a/Moonlight.Shared/Http/Requests/Users/UpdateUserRequest.cs +++ b/Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs @@ -2,7 +2,7 @@ namespace Moonlight.Shared.Http.Requests.Users; -public class UpdateUserRequest +public class UpdateUserDto { [Required] [MinLength(3)] diff --git a/Moonlight.Shared/Http/Responses/Admin/DiagnoseResultDto.cs b/Moonlight.Shared/Http/Responses/Admin/DiagnoseResultDto.cs new file mode 100644 index 00000000..104b3e67 --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Admin/DiagnoseResultDto.cs @@ -0,0 +1,10 @@ +namespace Moonlight.Shared.Http.Responses.Admin; + +public record DiagnoseResultDto(DiagnoseLevel Level, string Title, string[] Tags, string? Message, string? StackStrace, string? SolutionUrl, string? ReportUrl); + +public enum DiagnoseLevel +{ + Error = 0, + Warning = 1, + Healthy = 2 +} \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Admin/DiagnoseResultResponse.cs b/Moonlight.Shared/Http/Responses/Admin/DiagnoseResultResponse.cs deleted file mode 100644 index 87971662..00000000 --- a/Moonlight.Shared/Http/Responses/Admin/DiagnoseResultResponse.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Admin; - -public record DiagnoseResultResponse(DiagnoseLevel Level, string Title, string[] Tags, string? Message, string? StackStrace, string? SolutionUrl, string? ReportUrl); - -public enum DiagnoseLevel -{ - Error = 0, - Warning = 1, - Healthy = 2 -} \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Admin/RoleDto.cs b/Moonlight.Shared/Http/Responses/Admin/RoleDto.cs new file mode 100644 index 00000000..16675658 --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Admin/RoleDto.cs @@ -0,0 +1,3 @@ +namespace Moonlight.Shared.Http.Responses.Admin; + +public record RoleDto(int Id, string Name, string Description, string[] Permissions, int MemberCount, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Admin/RoleResponse.cs b/Moonlight.Shared/Http/Responses/Admin/RoleResponse.cs deleted file mode 100644 index 94997711..00000000 --- a/Moonlight.Shared/Http/Responses/Admin/RoleResponse.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Admin; - -public record RoleResponse(int Id, string Name, string Description, string[] Permissions, int MemberCount, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Admin/SystemInfoDto.cs b/Moonlight.Shared/Http/Responses/Admin/SystemInfoDto.cs new file mode 100644 index 00000000..48156082 --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Admin/SystemInfoDto.cs @@ -0,0 +1,3 @@ +namespace Moonlight.Shared.Http.Responses.Admin; + +public record SystemInfoDto(double CpuUsage, long MemoryUsage, string OperatingSystem, TimeSpan Uptime, string VersionName, bool IsUpToDate); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Admin/SystemInfoResponse.cs b/Moonlight.Shared/Http/Responses/Admin/SystemInfoResponse.cs deleted file mode 100644 index e807e2a1..00000000 --- a/Moonlight.Shared/Http/Responses/Admin/SystemInfoResponse.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Admin; - -public record SystemInfoResponse(double CpuUsage, long MemoryUsage, string OperatingSystem, TimeSpan Uptime, string VersionName, bool IsUpToDate); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs b/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs new file mode 100644 index 00000000..0b3c73a1 --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs @@ -0,0 +1,3 @@ +namespace Moonlight.Shared.Http.Responses.Auth; + +public record ClaimDto(string Type, string Value); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Auth/ClaimResponse.cs b/Moonlight.Shared/Http/Responses/Auth/ClaimResponse.cs deleted file mode 100644 index 4ea1fbf1..00000000 --- a/Moonlight.Shared/Http/Responses/Auth/ClaimResponse.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Auth; - -public record ClaimResponse(string Type, string Value); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs b/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs new file mode 100644 index 00000000..bd9fa7ce --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs @@ -0,0 +1,3 @@ +namespace Moonlight.Shared.Http.Responses.Auth; + +public record SchemeDto(string Name, string DisplayName); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Auth/SchemeResponse.cs b/Moonlight.Shared/Http/Responses/Auth/SchemeResponse.cs deleted file mode 100644 index b92c8d15..00000000 --- a/Moonlight.Shared/Http/Responses/Auth/SchemeResponse.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Auth; - -public record SchemeResponse(string Name, string DisplayName); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Users/UserDto.cs b/Moonlight.Shared/Http/Responses/Users/UserDto.cs new file mode 100644 index 00000000..80a824ab --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Users/UserDto.cs @@ -0,0 +1,3 @@ +namespace Moonlight.Shared.Http.Responses.Users; + +public record UserDto(int Id, string Username, string Email, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Users/UserResponse.cs b/Moonlight.Shared/Http/Responses/Users/UserResponse.cs deleted file mode 100644 index 09005631..00000000 --- a/Moonlight.Shared/Http/Responses/Users/UserResponse.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Users; - -public record UserResponse(int Id, string Username, string Email, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt); \ No newline at end of file diff --git a/Moonlight.Shared/Http/SerializationContext.cs b/Moonlight.Shared/Http/SerializationContext.cs index 52cc78e7..f07e6d72 100644 --- a/Moonlight.Shared/Http/SerializationContext.cs +++ b/Moonlight.Shared/Http/SerializationContext.cs @@ -8,18 +8,18 @@ using Moonlight.Shared.Http.Responses.Users; namespace Moonlight.Shared.Http; -[JsonSerializable(typeof(CreateUserRequest))] -[JsonSerializable(typeof(UpdateUserRequest))] -[JsonSerializable(typeof(ClaimResponse[]))] -[JsonSerializable(typeof(SchemeResponse[]))] -[JsonSerializable(typeof(DiagnoseResultResponse[]))] -[JsonSerializable(typeof(UserResponse))] -[JsonSerializable(typeof(SystemInfoResponse))] -[JsonSerializable(typeof(PagedData))] -[JsonSerializable(typeof(PagedData))] -[JsonSerializable(typeof(RoleResponse))] -[JsonSerializable(typeof(CreateRoleRequest))] -[JsonSerializable(typeof(UpdateRoleRequest))] +[JsonSerializable(typeof(CreateUserDto))] +[JsonSerializable(typeof(UpdateUserDto))] +[JsonSerializable(typeof(ClaimDto[]))] +[JsonSerializable(typeof(SchemeDto[]))] +[JsonSerializable(typeof(DiagnoseResultDto[]))] +[JsonSerializable(typeof(UserDto))] +[JsonSerializable(typeof(SystemInfoDto))] +[JsonSerializable(typeof(PagedData))] +[JsonSerializable(typeof(PagedData))] +[JsonSerializable(typeof(RoleDto))] +[JsonSerializable(typeof(CreateRoleDto))] +[JsonSerializable(typeof(UpdateRoleDto))] public partial class SerializationContext : JsonSerializerContext { } \ No newline at end of file