From b80374649bb21637887d8e71fb7c04ffda798661 Mon Sep 17 00:00:00 2001 From: Dominic Villemure Date: Fri, 5 Jul 2024 00:15:54 -0400 Subject: [PATCH] Renamed minimalUser to user --- .../GetMinimalUser.cs => GetUser/GetUser.cs} | 12 ++++++------ .../MinimalUserDto.cs => GetUser/UserDto.cs} | 4 ++-- src/Web/Endpoints/Users.cs | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename src/Application/Users/Queries/{GetMinimalUser/GetMinimalUser.cs => GetUser/GetUser.cs} (76%) rename src/Application/Users/Queries/{GetMinimalUser/MinimalUserDto.cs => GetUser/UserDto.cs} (86%) diff --git a/src/Application/Users/Queries/GetMinimalUser/GetMinimalUser.cs b/src/Application/Users/Queries/GetUser/GetUser.cs similarity index 76% rename from src/Application/Users/Queries/GetMinimalUser/GetMinimalUser.cs rename to src/Application/Users/Queries/GetUser/GetUser.cs index 454e8ae..3b36caa 100644 --- a/src/Application/Users/Queries/GetMinimalUser/GetMinimalUser.cs +++ b/src/Application/Users/Queries/GetUser/GetUser.cs @@ -1,20 +1,20 @@ using Hutopy.Application.Common.Interfaces; using Hutopy.Application.Common.Models; -namespace Hutopy.Application.Users.Queries.GetMinimalUser; +namespace Hutopy.Application.Users.Queries.GetUser; -public record GetMinimalUserQuery : IRequest +public record GetUserQuery : IRequest { public string? UserId { get; set; } = string.Empty; public string? UserName { get; set; } = string.Empty; }; -public class GetMinimalUserQueryHandler( +public class GetUserQueryHandler( IIdentityService identityService ) - : IRequestHandler + : IRequestHandler { - public async Task Handle(GetMinimalUserQuery request, CancellationToken cancellationToken) + public async Task Handle(GetUserQuery request, CancellationToken cancellationToken) { UserModel? identityUser = null; @@ -29,7 +29,7 @@ public class GetMinimalUserQueryHandler( identityUser = await identityService.GetUserByUserNameAsync(request.UserName); } - var user = new MinimalUserDto + var user = new UserDto { Id = identityUser?.Id ?? string.Empty, FirstName = identityUser?.FirstName ?? string.Empty, diff --git a/src/Application/Users/Queries/GetMinimalUser/MinimalUserDto.cs b/src/Application/Users/Queries/GetUser/UserDto.cs similarity index 86% rename from src/Application/Users/Queries/GetMinimalUser/MinimalUserDto.cs rename to src/Application/Users/Queries/GetUser/UserDto.cs index a38fd64..509743d 100644 --- a/src/Application/Users/Queries/GetMinimalUser/MinimalUserDto.cs +++ b/src/Application/Users/Queries/GetUser/UserDto.cs @@ -1,8 +1,8 @@ using Hutopy.Application.Users.Models; -namespace Hutopy.Application.Users.Queries.GetMinimalUser; +namespace Hutopy.Application.Users.Queries.GetUser; -public class MinimalUserDto +public class UserDto { public required string Id { get; init; } public required string FirstName { get; init; } diff --git a/src/Web/Endpoints/Users.cs b/src/Web/Endpoints/Users.cs index bcfa964..39bc408 100644 --- a/src/Web/Endpoints/Users.cs +++ b/src/Web/Endpoints/Users.cs @@ -1,5 +1,5 @@ using Hutopy.Application.Users.Commands; -using Hutopy.Application.Users.Queries.GetMinimalUser; +using Hutopy.Application.Users.Queries.GetUser; namespace Hutopy.Web.Endpoints; @@ -11,7 +11,7 @@ public class Users : EndpointGroupBase .MapPost(CreateUser) .MapPost(Login, "/login") .MapPost(UploadProfilePicture, "/upload-profile-picture") - .MapGet(GetMinimalUser); + .MapGet(GetUser); } private static async Task CreateUser(ISender sender, CreateUserCommand command) @@ -19,7 +19,7 @@ public class Users : EndpointGroupBase return await sender.Send(command); } - private static async Task GetMinimalUser(ISender sender, [AsParameters] GetMinimalUserQuery query) + private static async Task GetUser(ISender sender, [AsParameters] GetUserQuery query) { return await sender.Send(query); }