Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored response and request models to dto naming. Adjusted mapper naming

Browse Source
This commit is contained in:
ChiaraBm
2026-01-14 19:19:45 +01:00
parent 1d1dfc2c1c
commit 7f482fd6c3
37 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moonlight.Api/Http/Controllers/Admin/DiagnoseController.cs
View File

@@ -17,13 +17,13 @@ public class DiagnoseController : Controller
}
[HttpGet]
public async Task<ActionResult<DiagnoseResultResponse[]>> GetAsync()
public async Task<ActionResult<DiagnoseResultDto[]>> GetAsync()
{
var results = await DiagnoseService.DiagnoseAsync();
return results
.OrderBy(x => x.Level)
.MapToResult()
.ToDto()
.ToArray();
}
}

20
Moonlight.Api/Http/Controllers/Admin/RolesController.cs
View File

@@ -22,7 +22,7 @@ public class RolesController : Controller
}
[HttpGet]
public async Task<ActionResult<PagedData<RoleResponse>>> GetAsync(
public async Task<ActionResult<PagedData<RoleDto>>> 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<RoleResponse>(data, total);
return new PagedData<RoleDto>(data, total);
}
[HttpGet("{id:int}")]
public async Task<ActionResult<RoleResponse>> GetAsync([FromRoute] int id)
public async Task<ActionResult<RoleDto>> 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<ActionResult<RoleResponse>> CreateAsync([FromBody] CreateRoleRequest request)
public async Task<ActionResult<RoleDto>> 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<ActionResult<RoleResponse>> UpdateAsync([FromRoute] int id, [FromBody] UpdateRoleRequest request)
public async Task<ActionResult<RoleDto>> 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}")]

4
Moonlight.Api/Http/Controllers/Admin/SystemController.cs
View File

@@ -16,12 +16,12 @@ public class SystemController : Controller
}
[HttpGet("info")]
public async Task<ActionResult<SystemInfoResponse>> GetInfoAsync()
public async Task<ActionResult<SystemInfoDto>> GetInfoAsync()
{
var cpuUsage = await ApplicationService.GetCpuUsageAsync();
var memoryUsage = await ApplicationService.GetMemoryUsageAsync();
return new SystemInfoResponse(
return new SystemInfoDto(
cpuUsage,
memoryUsage,
ApplicationService.OperatingSystem,

10
Moonlight.Api/Http/Controllers/AuthController.cs
View File

@@ -17,13 +17,13 @@ public class AuthController : Controller
}
[HttpGet]
public async Task<ActionResult<SchemeResponse[]>> GetSchemesAsync()
public async Task<ActionResult<SchemeDto[]>> 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<ActionResult<ClaimResponse[]>> GetClaimsAsync()
public Task<ActionResult<ClaimDto[]>> 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<ActionResult<ClaimResponse[]>>(result);
return Task.FromResult<ActionResult<ClaimDto[]>>(result);
}
[HttpGet("logout")]

20
Moonlight.Api/Http/Controllers/UsersController.cs
View File

@@ -24,7 +24,7 @@ public class UsersController : Controller
}
[HttpGet]
public async Task<ActionResult<PagedData<UserResponse>>> GetAsync(
public async Task<ActionResult<PagedData<UserDto>>> 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<UserResponse>(data, total);
return new PagedData<UserDto>(data, total);
}
[HttpGet("{id:int}")]
public async Task<ActionResult<UserResponse>> GetAsync([FromRoute] int id)
public async Task<ActionResult<UserDto>> 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<ActionResult<UserResponse>> CreateAsync([FromBody] CreateUserRequest request)
public async Task<ActionResult<UserDto>> 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<ActionResult<UserResponse>> UpdateAsync([FromRoute] int id, [FromBody] UpdateUserRequest request)
public async Task<ActionResult<UserDto>> 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}")]

2
Moonlight.Api/Mappers/DiagnoseResultMapper.cs
View File

@@ -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<DiagnoseResultResponse> MapToResult(this IEnumerable<DiagnoseResult> results);
public static partial IEnumerable<DiagnoseResultDto> ToDto(this IEnumerable<DiagnoseResult> results);
}

10
Moonlight.Api/Mappers/RoleMapper.cs
View File

@@ -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<RoleResponse> ProjectToResponse(this IQueryable<Role> roles);
public static partial IQueryable<RoleDto> ProjectToDto(this IQueryable<Role> roles);
}

8
Moonlight.Api/Mappers/UserMapper.cs
View File

@@ -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<UserResponse> ProjectToResponse(this IQueryable<User> users);
public static partial IQueryable<UserDto> ProjectToDto(this IQueryable<User> 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);
}