From d4978dff15f5f536cbb2276aa137d8c2542f3320 Mon Sep 17 00:00:00 2001
From: lumijiez <59575049+lumijiez@users.noreply.github.com>
Date: Tue, 10 Jun 2025 23:50:43 +0300
Subject: [PATCH] Fix efcore tracking issue

---
 .../Users/DeleteUserRoleHandler.cs                    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Imprink.Application/Users/DeleteUserRoleHandler.cs b/src/Imprink.Application/Users/DeleteUserRoleHandler.cs
index e30ef08..a5424ee 100644
--- a/src/Imprink.Application/Users/DeleteUserRoleHandler.cs
+++ b/src/Imprink.Application/Users/DeleteUserRoleHandler.cs
@@ -18,13 +18,12 @@ public class DeleteUserRoleHandler(IUnitOfWork uw) : IRequestHandler<DeleteUserR
             if (!await uw.UserRepository.UserExistsAsync(request.Sub, cancellationToken))
                 throw new NotFoundException("User with ID: " + request.Sub + " does not exist.");
 
-            var userRole = new UserRole
-            {
-                UserId = request.Sub,
-                RoleId = request.RoleId
-            };
+            var existingUserRole = await uw.UserRoleRepository.GetUserRoleAsync(request.Sub, request.RoleId, cancellationToken);
+            
+            if (existingUserRole == null)
+                throw new NotFoundException($"User role not found for user {request.Sub} and role {request.RoleId}");
 
-            var removedRole = await uw.UserRoleRepository.RemoveUserRoleAsync(userRole, cancellationToken);
+            var removedRole = await uw.UserRoleRepository.RemoveUserRoleAsync(existingUserRole, cancellationToken);
 
             await uw.SaveAsync(cancellationToken);
             await uw.CommitTransactionAsync(cancellationToken);