Renames

Application/Users/Commands/CreateUserCommand.cs

@@ -9,7 +9,7 @@ namespace Musify.Application.Users.Commands
         string Name,
         string? FirstName,
         string? SecondName)
-        : ICommand<Result<UserResponse>>
+        : ICommand<Result<UserApplicationResponse>>
     {
         public static User ToEntity(CreateUserCommand command)
         {

Application/Users/Handlers/CreateUserCommandHandler.cs

@@ -2,22 +2,22 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Commands;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Handlers
 {
     public class CreateUserCommandHandler(IDatabase database, ILogger<CreateUserCommandHandler> logger)
-        : ICommandHandler<CreateUserCommand, Result<UserResponse> >
+        : ICommandHandler<CreateUserCommand, Result<UserApplicationResponse> >
     {
-        public async ValueTask<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserApplicationResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users.AnyAsync(u => u.Id == request.Id, cancellationToken);
             if (userExists)
             {
                 logger.LogInformation("User {UserId} already exists", request.Id);
-                return Result<UserResponse>.Conflict($"User {request.Id} already exists");
+                return Result<UserApplicationResponse>.Conflict($"User {request.Id} already exists");
             }
 
             var newUser = CreateUserCommand.ToEntity(request);
@@ -34,7 +34,7 @@ namespace Musify.Application.Users.Handlers
             }
 
             logger.LogInformation("Created user {UserId}", newUser.Id);
-            return Result.Created(UserResponse.FromEntity(newUser));
+            return Result.Created(UserApplicationResponse.FromEntity(newUser));
         }
     }
 }

Application/Users/Handlers/GetUserByIdQueryHandler.cs

@@ -1,23 +1,23 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Handlers
 {
     public class GetUserByIdQueryHandler(IDatabase database)
-        : IQueryHandler<GetUserByIdQuery, Result<UserResponse> >
+        : IQueryHandler<GetUserByIdQuery, Result<UserApplicationResponse> >
     {
-        public async ValueTask<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserApplicationResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
         {
             var user = await database.Users
                 .AsNoTracking()
-                .Select(u => UserResponse.FromEntity(u))
+                .Select(u => UserApplicationResponse.FromEntity(u))
                 .SingleOrDefaultAsync(u => u.Id == request.Id, cancellationToken);
 
-            return user ?? Result<UserResponse>.NotFound();
+            return user ?? Result<UserApplicationResponse>.NotFound();
         }
     }
 }

Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs

@@ -1,23 +1,23 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Handlers
 {
     public class GetUserByKeycloakQueryHandler(IDatabase database)
-        : IQueryHandler<GetUserByKeycloakQuery, Result<UserResponse> >
+        : IQueryHandler<GetUserByKeycloakQuery, Result<UserApplicationResponse> >
     {
-        public async ValueTask<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<UserApplicationResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
         {
             var user = await database.Users
                 .AsNoTracking()
-                .Select(u => UserResponse.FromEntity(u))
+                .Select(u => UserApplicationResponse.FromEntity(u))
                 .SingleOrDefaultAsync(u => u.Id == request.Id, cancellationToken);
 
-            return user ?? Result<UserResponse>.NotFound();
+            return user ?? Result<UserApplicationResponse>.NotFound();
         }
     }
 }

Application/Users/Handlers/GetUsersQueryHandler.cs

@@ -1,8 +1,8 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Application;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Abstractions.Application;
+using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 using X.PagedList.EF;
@@ -10,9 +10,9 @@ using X.PagedList.EF;
 namespace Musify.Application.Users.Handlers
 {
     public class GetUsersQueryHandler(IDatabase database)
-        : IQueryHandler<GetUsersQuery, Result<PaginatedResponse<UserResponse> > >
+        : IQueryHandler<GetUsersQuery, Result<PaginatedResponse<UserApplicationResponse> > >
     {
-        public async ValueTask<Result<PaginatedResponse<UserResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
+        public async ValueTask<Result<PaginatedResponse<UserApplicationResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
         {
             var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
             var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
@@ -29,10 +29,10 @@ namespace Musify.Application.Users.Handlers
 
             var totalCount = await user.CountAsync(cancellationToken);
             var pagedUser = await user
-                .Select(u => UserResponse.FromEntity(u))
+                .Select(u => UserApplicationResponse.FromEntity(u))
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
-            return Result.Success(PaginatedResponse<UserResponse>.FromPagedList(pagedUser));
+            return Result.Success(PaginatedResponse<UserApplicationResponse>.FromPagedList(pagedUser));
         }
     }
 }

Application/Users/Queries/GetUserByIdQuery.cs

@@ -5,5 +5,5 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Queries
 {
     public record GetUserByIdQuery(Guid Id)
-        : IQuery<Result<UserResponse> >;
+        : IQuery<Result<UserApplicationResponse> >;
 }

Application/Users/Queries/GetUserByKeycloakQuery.cs

@@ -5,5 +5,5 @@ using Musify.Application.Users.Responses;
 namespace Musify.Application.Users.Queries
 {
     public record GetUserByKeycloakQuery(Guid Id)
-        : IQuery<Result<UserResponse> >;
+        : IQuery<Result<UserApplicationResponse> >;
 }

Application/Users/Queries/GetUsersQuery.cs

@@ -1,10 +1,10 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Contracts.Application;
+using Musify.Application.Abstractions.Application;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Queries
 {
     public record GetUsersQuery(int PageNumber, int PageSize, string? UsernameSearch = null)
-        : IQuery<Result<PaginatedResponse<UserResponse> >>;
+        : IQuery<Result<PaginatedResponse<UserApplicationResponse> >>;
 }

Application/Users/Responses/KeycloakUserResponse.cs

@@ -1,8 +0,0 @@
-namespace Musify.Application.Users.Responses
-{
-    public record KeycloakUserResponse(
-        Guid Id,
-        string Name,
-        string FirstName,
-        string SecondName);
-}

Application/Users/Responses/UserApplicationResponse.cs

@@ -2,7 +2,7 @@
 
 namespace Musify.Application.Users.Responses
 {
-    public record UserResponse(
+    public record UserApplicationResponse(
         Guid Id,
         string Name,
         string? FirstName,
@@ -10,9 +10,9 @@ namespace Musify.Application.Users.Responses
         DateTime CreatedAt,
         DateTime UpdatedAt)
     {
-        public static UserResponse FromEntity(User user)
+        public static UserApplicationResponse FromEntity(User user)
         {
-            return new UserResponse(
+            return new UserApplicationResponse(
                 user.Id,
                 user.Name,
                 user.FirstName,