Merge remote-tracking branch 'origin/master' into feature/oauth

# Conflicts:
#	src/Web/Endpoints/Users.cs

src/Application/Users/Queries/GetMinimalUser/GetMinimalUser.cs

@@ -1,10 +1,12 @@
 using Hutopy.Application.Common.Interfaces;
+using Hutopy.Application.Common.Models;
 
 namespace Hutopy.Application.Users.Queries.GetMinimalUser;
 
 public record GetMinimalUserQuery : IRequest<MinimalUserDto>
 {
-    public string UserId { get; set; } = string.Empty;
+    public string? UserId { get; set; } = string.Empty;
+    public string? UserName { get; set; } = string.Empty;
 };
 
 public class GetMinimalUserQueryHandler(
@@ -14,15 +16,27 @@ public class GetMinimalUserQueryHandler(
 {
     public async Task<MinimalUserDto> Handle(GetMinimalUserQuery request, CancellationToken cancellationToken)
     {
-        var identityUser = await identityService.FindUserByIdAsync(request.UserId);
-        
+        UserModel? identityUser = null;
+
+        if (request.UserId != string.Empty)
+        {
+            identityUser = await identityService.FindUserByIdAsync(request.UserId);
+
+        }
+
+        if (request.UserName != string.Empty)
+        {
+            identityUser = await identityService.GetUserByUserNameAsync(request.UserName);
+        }
+
+
         var user = new MinimalUserDto
         {
-            FirstName = identityUser?.FirstName ?? "",
-            LastName = identityUser?.LastName ?? "",
-            UserName = identityUser?.UserName ?? ""
+            FirstName = identityUser?.FirstName ?? string.Empty,
+            LastName = identityUser?.LastName ?? string.Empty,
+            UserName = identityUser?.UserName ?? string.Empty
         };
 
         return user;
     }
-}
+}

src/Application/Users/Queries/GetMinimalUser/MinimalUserDto.cs

@@ -4,5 +4,5 @@ public class MinimalUserDto
 {
     public required string FirstName { get; init; }
     public required string LastName { get; init; }
-    public string UserName { get; init; } = String.Empty;
+    public required string UserName { get; init; } = String.Empty;
 }