From 3c9d0d900a0d844383f94a86617ba9630e412e06 Mon Sep 17 00:00:00 2001
From: Andrija Stevanovic <andrijastev4@gmail.com>
Date: Tue, 17 Feb 2026 01:24:36 +0100
Subject: [PATCH] added GetUserQueryDto

---
 .../Application/Models/User/Query/GetUser/GetUserQuery.cs   | 2 +-
 .../Models/User/Query/GetUser/GetUserQueryDto.cs            | 3 +++
 .../Models/User/Query/GetUser/GetUserQueryHandler.cs        | 6 +++---
 dotnet/AipsWebApi/Controllers/UserController.cs             | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryDto.cs

diff --git a/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQuery.cs b/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQuery.cs
index 48f6ad5..ae32282 100644
--- a/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQuery.cs
+++ b/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQuery.cs
@@ -2,4 +2,4 @@ using AipsCore.Application.Abstract.Query;
 
 namespace AipsCore.Application.Models.User.Query.GetUser;
 
-public record GetUserQuery(string UserId) : IQuery<Infrastructure.Persistence.User.User>;
\ No newline at end of file
+public record GetUserQuery(string UserId) : IQuery<GetUserQueryDto>;
\ No newline at end of file
diff --git a/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryDto.cs b/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryDto.cs
new file mode 100644
index 0000000..3075eb4
--- /dev/null
+++ b/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryDto.cs
@@ -0,0 +1,3 @@
+namespace AipsCore.Application.Models.User.Query.GetUser;
+
+public record GetUserQueryDto(string Id, string Email, string UserName);
\ No newline at end of file
diff --git a/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryHandler.cs b/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryHandler.cs
index 7de30d1..e621c79 100644
--- a/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryHandler.cs
+++ b/dotnet/AipsCore/Application/Models/User/Query/GetUser/GetUserQueryHandler.cs
@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace AipsCore.Application.Models.User.Query.GetUser;
 
-public class GetUserQueryHandler : IQueryHandler<GetUserQuery, Infrastructure.Persistence.User.User>
+public class GetUserQueryHandler : IQueryHandler<GetUserQuery, GetUserQueryDto>
 {
     private readonly AipsDbContext _context;
 
@@ -16,7 +16,7 @@ public class GetUserQueryHandler : IQueryHandler<GetUserQuery, Infrastructure.Pe
         _context = context;
     }
     
-    public async Task<Infrastructure.Persistence.User.User> Handle(GetUserQuery query, CancellationToken cancellationToken = default)
+    public async Task<GetUserQueryDto> Handle(GetUserQuery query, CancellationToken cancellationToken = default)
     {
         var result = await _context.Users
             .Where(u => u.Id.ToString() == query.UserId)
@@ -27,6 +27,6 @@ public class GetUserQueryHandler : IQueryHandler<GetUserQuery, Infrastructure.Pe
             throw new ValidationException(UserErrors.NotFound(new UserId(query.UserId)));
         }
 
-        return result;
+        return new GetUserQueryDto(result.Id.ToString(), result.Email!, result.UserName!);
     }
 }
\ No newline at end of file
diff --git a/dotnet/AipsWebApi/Controllers/UserController.cs b/dotnet/AipsWebApi/Controllers/UserController.cs
index d8a3547..c447bac 100644
--- a/dotnet/AipsWebApi/Controllers/UserController.cs
+++ b/dotnet/AipsWebApi/Controllers/UserController.cs
@@ -84,7 +84,7 @@ public class UserController : ControllerBase
 
     [Authorize]
     [HttpGet]
-    public async Task<ActionResult<User>> GetUser(string userId, CancellationToken cancellationToken)
+    public async Task<ActionResult<GetUserQueryDto>> GetUser(string userId, CancellationToken cancellationToken)
     {
         var query = new GetUserQuery(userId);
         var result = await _dispatcher.Execute(query, cancellationToken);