refactor(tests): more idiomatic Fake methods and result assertions

src/Dotnet.Samples.AspNetCore.WebApi/Data/PlayerData.cs

@@ -5,167 +5,167 @@
 namespace Dotnet.Samples.AspNetCore.WebApi.Data;
 
 public static class PlayerData
 {
-    public static List<Player> CreateStarting11()
+    public static List<Player> MakeStarting11()
     {
         return
         [
             new()
             {
                 Id = 1,
                 FirstName = "Damián",
                 MiddleName = "Emiliano",
                 LastName = "Martínez",
                 DateOfBirth = new DateTime(1992, 9, 1, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 23,
                 Position = Position.Goalkeeper.Text,
                 AbbrPosition = Position.Goalkeeper.Abbr,
                 Team = "Aston Villa FC",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 2,
                 FirstName = "Nahuel",
                 LastName = "Molina",
                 DateOfBirth = new DateTime(1998, 4, 5, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 26,
                 Position = Position.RightBack.Text,
                 AbbrPosition = Position.RightBack.Abbr,
                 Team = "Altético Madrid",
                 League = "La Liga",
                 Starting11 = true,
             },
             new()
             {
                 Id = 3,
                 FirstName = "Cristian",
                 MiddleName = "Gabriel",
                 LastName = "Romero",
                 DateOfBirth = new DateTime(1998, 4, 26, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 13,
                 Position = Position.CentreBack.Text,
                 AbbrPosition = Position.CentreBack.Abbr,
                 Team = "Tottenham Hotspur",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 4,
                 FirstName = "Nicolás",
                 MiddleName = "Hernán Gonzalo",
                 LastName = "Otamendi",
                 DateOfBirth = new DateTime(1988, 2, 11, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 19,
                 Position = Position.CentreBack.Text,
                 AbbrPosition = Position.CentreBack.Abbr,
                 Team = "SL Benfica",
                 League = "Liga Portugal",
                 Starting11 = true,
             },
             new()
             {
                 Id = 5,
                 FirstName = "Nicolás",
                 MiddleName = "Alejandro",
                 LastName = "Tagliafico",
                 DateOfBirth = new DateTime(1992, 8, 30, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 3,
                 Position = Position.LeftBack.Text,
                 AbbrPosition = Position.LeftBack.Abbr,
                 Team = "Olympique Lyon",
                 League = "Ligue 1",
                 Starting11 = true,
             },
             new()
             {
                 Id = 6,
                 FirstName = "Ángel",
                 MiddleName = "Fabián",
                 LastName = "Di María",
                 DateOfBirth = new DateTime(1988, 2, 13, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 11,
                 Position = Position.RightWinger.Text,
                 AbbrPosition = Position.RightWinger.Abbr,
                 Team = "SL Benfica",
                 League = "Liga Portugal",
                 Starting11 = true,
             },
             new()
             {
                 Id = 7,
                 FirstName = "Rodrigo",
                 MiddleName = "Javier",
                 LastName = "de Paul",
                 DateOfBirth = new DateTime(1994, 5, 23, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 7,
                 Position = Position.CentralMidfield.Text,
                 AbbrPosition = Position.CentralMidfield.Abbr,
                 Team = "Altético Madrid",
                 League = "La Liga",
                 Starting11 = true,
             },
             new()
             {
                 Id = 8,
                 FirstName = "Enzo",
                 MiddleName = "Jeremías",
                 LastName = "Fernández",
                 DateOfBirth = new DateTime(2001, 1, 16, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 24,
                 Position = Position.CentralMidfield.Text,
                 AbbrPosition = Position.CentralMidfield.Abbr,
                 Team = "Chelsea FC",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 9,
                 FirstName = "Alexis",
                 LastName = "Mac Allister",
                 DateOfBirth = new DateTime(1998, 12, 23, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 20,
                 Position = Position.CentralMidfield.Text,
                 AbbrPosition = Position.CentralMidfield.Abbr,
                 Team = "Liverpool FC",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 10,
                 FirstName = "Lionel",
                 MiddleName = "Andrés",
                 LastName = "Messi",
                 DateOfBirth = new DateTime(1987, 6, 23, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 10,
                 Position = Position.RightWinger.Text,
                 AbbrPosition = Position.RightWinger.Abbr,
                 Team = "Inter Miami CF",
                 League = "Major League Soccer",
                 Starting11 = true,
             },
             new()
             {
                 Id = 11,
                 FirstName = "Julián",
                 LastName = "Álvarez",
                 DateOfBirth = new DateTime(2000, 1, 30, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 9,
                 Position = Position.CentreForward.Text,
                 AbbrPosition = Position.CentreForward.Abbr,
                 Team = "Manchester City",
                 League = "Premier League",
                 Starting11 = true,
             }
         ];
     }
 
     /// <summary>
     /// The purpose of this method is to demonstrate the capabilities of
     /// System.Text.Json.JsonSerializer
     /// https://learn.microsoft.com/en-us/dotnet/standard/serialization/system-text-json/deserialization
     /// </summary>

src/Dotnet.Samples.AspNetCore.WebApi/Utilities/ApplicationBuilderExtensions.cs

@@ -21,7 +21,7 @@ public static async Task SeedDbContextAsync(this IApplicationBuilder app)
 
             if (!await dbContext.Players.AnyAsync())
             {
-                await dbContext.Players.AddRangeAsync(PlayerData.CreateStarting11());
+                await dbContext.Players.AddRangeAsync(PlayerData.MakeStarting11());
                 await dbContext.SaveChangesAsync();
                 logger.LogInformation("Successfully seeded database with initial data.");
             }

src/Dotnet.Samples.AspNetCore.WebApi/Utilities/DbContextUtils.cs

@@ -35,7 +35,7 @@ CancellationToken cancellationToken
     {
         if (!await dbContext.Players.AnyAsync(cancellationToken))
         {
-            await dbContext.Players.AddRangeAsync(PlayerData.CreateStarting11(), cancellationToken);
+            await dbContext.Players.AddRangeAsync(PlayerData.MakeStarting11(), cancellationToken);
             await dbContext.SaveChangesAsync(cancellationToken);
         }
     }

test/Dotnet.Samples.AspNetCore.WebApi.Tests/Unit/PlayerServiceTests.cs

@@ -25,11 +25,10 @@
     public async Task GivenCreateAsync_WhenRepositoryAddAsync_ThenAddsPlayerToRepositoryAndRemovesCache()
     {
         // Arrange
-        var response = PlayerFakes.CreateResponseModelForOneExistingById(9);
+        var request = PlayerFakes.MakeRequestModelForCreate();
+        var response = PlayerFakes.MakeResponseModelForCreate();
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
-        mapper
-            .Setup(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<PlayerRequestModel>()))
-            .Returns(response);
+        mapper.Setup(mapper => mapper.Map<PlayerResponseModel>(request)).Returns(response);
 
         var service = new PlayerService(
             repository.Object,
@@ -39,7 +38,7 @@
         );
 
         // Act
-        await service.CreateAsync(It.IsAny<PlayerRequestModel>());
+        await service.CreateAsync(request);
 
         // Assert
         repository.Verify(repository => repository.AddAsync(It.IsAny<Player>()), Times.Once);
@@ -56,28 +55,26 @@
 
     [Fact]
     [Trait("Category", "Unit")]
     public async Task GivenRetrieveAsync_WhenRepositoryGetAllAsyncReturnsPlayers_ThenCacheCreateEntryAndResultShouldBeListOfPlayers()
     {
         // Arrange
-        var players = PlayerFakes.GetStarting11();
-        var response = PlayerFakes.CreateStarting11ResponseModels();
+        var value = It.IsAny<object>();
+        var players = PlayerFakes.MakeStarting11();
+        var response = PlayerFakes.MakeResponseModelsForRetrieve();
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
         repository.Setup(repository => repository.GetAllAsync()).ReturnsAsync(players);
-        mapper
-            .Setup(mapper => mapper.Map<List<PlayerResponseModel>>(It.IsAny<List<Player>>()))
-            .Returns(response);
-        var value = It.IsAny<object>();
+        mapper.Setup(mapper => mapper.Map<List<PlayerResponseModel>>(players)).Returns(response);
 
         var service = new PlayerService(
             repository.Object,
             logger.Object,
             memoryCache.Object,
             mapper.Object
         );
 
         // Act
         var result = await service.RetrieveAsync();
 
         // Assert
         repository.Verify(repository => repository.GetAllAsync(), Times.Once);
         memoryCache.Verify(cache => cache.TryGetValue(It.IsAny<object>(), out value), Times.Once);
@@ -91,28 +88,26 @@
 
     [Fact]
     [Trait("Category", "Unit")]
     public async Task GivenRetrieveAsync_WhenExecutedForTheSecondTime_ThenSecondExecutionTimeShouldBeLessThanFirst()
     {
         // Arrange
-        var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
-        repository
-            .Setup(repository => repository.GetAllAsync())
-            .ReturnsAsync(PlayerFakes.GetStarting11());
-        mapper
-            .Setup(mapper => mapper.Map<List<PlayerResponseModel>>(It.IsAny<List<Player>>()))
-            .Returns(PlayerFakes.CreateStarting11ResponseModels());
         var value = It.IsAny<object>();
+        var players = PlayerFakes.MakeStarting11();
+        var response = PlayerFakes.MakeResponseModelsForRetrieve();
+        var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
+        repository.Setup(repository => repository.GetAllAsync()).ReturnsAsync(players);
+        mapper.Setup(mapper => mapper.Map<List<PlayerResponseModel>>(players)).Returns(response);
 
         var service = new PlayerService(
             repository.Object,
             logger.Object,
             memoryCache.Object,
             mapper.Object
         );
 
         // Act
         var first = await ExecutionTimeAsync(() => service.RetrieveAsync());
         var second = await ExecutionTimeAsync(() => service.RetrieveAsync());
 
         // Assert
         memoryCache.Verify(
@@ -133,141 +128,134 @@
     public async Task GivenRetrieveByIdAsync_WhenRepositoryFindByIdAsyncReturnsNull_TheResultShouldBeNull()
     {
         // Arrange
+        var id = 999;
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
-        repository
-            .Setup(repository => repository.FindByIdAsync(It.IsAny<long>()))
-            .ReturnsAsync((Player?)null);
+        repository.Setup(repository => repository.FindByIdAsync(id)).ReturnsAsync(null as Player);
 
         var service = new PlayerService(
             repository.Object,
             logger.Object,
             memoryCache.Object,
             mapper.Object
         );
 
         // Act
-        var result = await service.RetrieveByIdAsync(It.IsAny<long>());
+        var result = await service.RetrieveByIdAsync(id);
 
         // Assert
         repository.Verify(repository => repository.FindByIdAsync(It.IsAny<long>()), Times.Once);
         mapper.Verify(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<Player>()), Times.Never);
         result.Should().BeNull();
     }
 
     [Fact]
     [Trait("Category", "Unit")]
     public async Task GivenRetrieveByIdAsync_WhenRepositoryFindByIdAsyncReturnsPlayer_TheResultShouldBePlayer()
     {
         // Arrange
-        var id = 9;
-        var player = PlayerFakes.GetOneExistingById(id);
-        var response = PlayerFakes.CreateResponseModelForOneExistingById(id);
+        var id = 1;
+        var player = PlayerFakes.MakeFromStarting11ById(id);
+        var response = PlayerFakes.MakeResponseModelForRetrieve(id);
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
-        repository
-            .Setup(repository => repository.FindByIdAsync(It.IsAny<long>()))
-            .ReturnsAsync(player);
-        mapper
-            .Setup(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<Player>()))
-            .Returns(response);
+        repository.Setup(repository => repository.FindByIdAsync(id)).ReturnsAsync(player);
+        mapper.Setup(mapper => mapper.Map<PlayerResponseModel>(player)).Returns(response);
 
         var service = new PlayerService(
             repository.Object,
             logger.Object,
             memoryCache.Object,
             mapper.Object
         );
 
         // Act
-        var result = await service.RetrieveByIdAsync(It.IsAny<long>());
+        var result = await service.RetrieveByIdAsync(id);
 
         // Assert
         repository.Verify(repository => repository.FindByIdAsync(It.IsAny<long>()), Times.Once);
         mapper.Verify(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<Player>()), Times.Once);
         result.Should().BeOfType<PlayerResponseModel>();
         result.Should().BeEquivalentTo(response);
     }
 
     [Fact]
     [Trait("Category", "Unit")]
     public async Task GivenRetrieveBySquadNumberAsync_WhenRepositoryFindBySquadNumberAsyncReturnsNull_ThenResultShouldBeNull()
     {
         // Arrange
+        var squadNumber = 999;
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
         repository
-            .Setup(repository => repository.FindBySquadNumberAsync(It.IsAny<int>()))
-            .ReturnsAsync((Player?)null);
+            .Setup(repository => repository.FindBySquadNumberAsync(squadNumber))
+            .ReturnsAsync(null as Player);
 
         var service = new PlayerService(
             repository.Object,
             logger.Object,
             memoryCache.Object,
             mapper.Object
         );
 
         // Act
-        var result = await service.RetrieveBySquadNumberAsync(It.IsAny<int>());
+        var result = await service.RetrieveBySquadNumberAsync(squadNumber);
 
         // Assert
         repository.Verify(
             repository => repository.FindBySquadNumberAsync(It.IsAny<int>()),
             Times.Once
         );
         mapper.Verify(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<Player>()), Times.Never);
         result.Should().BeNull();
     }
 
     [Fact]
     [Trait("Category", "Unit")]
     public async Task GivenRetrieveBySquadNumberAsync_WhenRepositoryFindBySquadNumberAsyncReturnsPlayer_ThenResultShouldBePlayer()
     {
         // Arrange
-        var id = 9;
-        var player = PlayerFakes.GetOneExistingById(id);
-        var response = PlayerFakes.CreateResponseModelForOneExistingById(id);
+        var id = 1;
+        var player = PlayerFakes.MakeFromStarting11ById(id);
+        var squadNumber = player.SquadNumber;
+        var response = PlayerFakes.MakeResponseModelForRetrieve(id);
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
         repository
-            .Setup(repository => repository.FindBySquadNumberAsync(It.IsAny<int>()))
+            .Setup(repository => repository.FindBySquadNumberAsync(squadNumber))
             .ReturnsAsync(player);
-        mapper
-            .Setup(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<Player>()))
-            .Returns(response);
+        mapper.Setup(mapper => mapper.Map<PlayerResponseModel>(player)).Returns(response);
 
         var service = new PlayerService(
             repository.Object,
             logger.Object,
             memoryCache.Object,
             mapper.Object
         );
 
         // Act
-        var result = await service.RetrieveBySquadNumberAsync(It.IsAny<int>());
+        var result = await service.RetrieveBySquadNumberAsync(squadNumber);
 
         // Assert
         repository.Verify(
             repository => repository.FindBySquadNumberAsync(It.IsAny<int>()),
             Times.Once
         );
         mapper.Verify(mapper => mapper.Map<PlayerResponseModel>(It.IsAny<Player>()), Times.Once);
         result.Should().BeOfType<PlayerResponseModel>();
         result.Should().BeEquivalentTo(response);
     }
 
     /* -------------------------------------------------------------------------
      * Update
      * ---------------------------------------------------------------------- */
 
     [Fact]
     [Trait("Category", "Unit")]
     public async Task GivenUpdateAsync_WhenRepositoryFindByIdAsyncReturnsPlayer_ThenRepositoryUpdateAsyncAndCacheRemove()
     {
         // Arrange
-        var id = 9;
-        var player = PlayerFakes.GetOneExistingById(id);
-        var request = PlayerFakes.CreateRequestModelForOneExistingById(id);
+        var id = 1;
+        var player = PlayerFakes.MakeFromStarting11ById(id);
+        var request = PlayerFakes.MakeRequestModelForUpdate(id);
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
-        repository
-            .Setup(repository => repository.FindByIdAsync(It.IsAny<long>()))
-            .ReturnsAsync(player);
+        repository.Setup(repository => repository.FindByIdAsync(id)).ReturnsAsync(player);
 
         var service = new PlayerService(
             repository.Object,
@@ -298,8 +286,8 @@
     public async Task GivenDeleteAsync_WhenRepositoryFindByIdAsyncReturnsPlayer_ThenRepositoryDeleteAsyncAndCacheRemove()
     {
         // Arrange
-        var id = 9;
-        var player = PlayerFakes.GetOneExistingById(id);
+        var id = 2;
+        var player = PlayerFakes.MakeFromStarting11ById(id);
         var (repository, logger, memoryCache, mapper) = PlayerMocks.InitServiceMocks();
         repository
             .Setup(repository => repository.FindByIdAsync(It.IsAny<long>()))
@@ -330,20 +318,20 @@
         stopwatch.Stop();
 
         return stopwatch.ElapsedMilliseconds;
     }
 
     protected virtual void Dispose(bool disposing)
     {
         if (!_disposed)
         {
             Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", null);
             _disposed = true;
         }
     }
 
     public void Dispose()
     {
         Dispose(true);
         GC.SuppressFinalize(this);
     }
 }

test/Dotnet.Samples.AspNetCore.WebApi.Tests/Utilities/DatabaseFakes.cs

@@ -48,7 +48,7 @@ CREATE TABLE players (
 
         public static void Seed(this PlayerDbContext context)
         {
-            context.Players.AddRange(PlayerFakes.GetStarting11());
+            context.Players.AddRange(PlayerFakes.MakeStarting11());
             context.SaveChanges();
         }
     }

test/Dotnet.Samples.AspNetCore.WebApi.Tests/Utilities/PlayerFakes.cs

@@ -11,183 +11,175 @@
 /// to avoid external dependencies.
 /// </summary>
 public static class PlayerFakes
 {
-    public static List<Player> GetStarting11()
+    public static List<Player> MakeStarting11()
     {
         return
         [
             new()
             {
                 Id = 1,
                 FirstName = "Damián",
                 MiddleName = "Emiliano",
                 LastName = "Martínez",
                 DateOfBirth = new DateTime(1992, 9, 1, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 23,
                 Position = Position.Goalkeeper.Text,
                 AbbrPosition = Position.Goalkeeper.Abbr,
                 Team = "Aston Villa FC",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 2,
                 FirstName = "Nahuel",
                 LastName = "Molina",
                 DateOfBirth = new DateTime(1998, 4, 5, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 26,
                 Position = Position.RightBack.Text,
                 AbbrPosition = Position.RightBack.Abbr,
                 Team = "Altético Madrid",
                 League = "La Liga",
                 Starting11 = true,
             },
             new()
             {
                 Id = 3,
                 FirstName = "Cristian",
                 MiddleName = "Gabriel",
                 LastName = "Romero",
                 DateOfBirth = new DateTime(1998, 4, 26, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 13,
                 Position = Position.CentreBack.Text,
                 AbbrPosition = Position.CentreBack.Abbr,
                 Team = "Tottenham Hotspur",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 4,
                 FirstName = "Nicolás",
                 MiddleName = "Hernán Gonzalo",
                 LastName = "Otamendi",
                 DateOfBirth = new DateTime(1988, 2, 11, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 19,
                 Position = Position.CentreBack.Text,
                 AbbrPosition = Position.CentreBack.Abbr,
                 Team = "SL Benfica",
                 League = "Liga Portugal",
                 Starting11 = true,
             },
             new()
             {
                 Id = 5,
                 FirstName = "Nicolás",
                 MiddleName = "Alejandro",
                 LastName = "Tagliafico",
                 DateOfBirth = new DateTime(1992, 8, 30, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 3,
                 Position = Position.LeftBack.Text,
                 AbbrPosition = Position.LeftBack.Abbr,
                 Team = "Olympique Lyon",
                 League = "Ligue 1",
                 Starting11 = true,
             },
             new()
             {
                 Id = 6,
                 FirstName = "Ángel",
                 MiddleName = "Fabián",
                 LastName = "Di María",
                 DateOfBirth = new DateTime(1988, 2, 13, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 11,
                 Position = Position.RightWinger.Text,
                 AbbrPosition = Position.RightWinger.Abbr,
                 Team = "SL Benfica",
                 League = "Liga Portugal",
                 Starting11 = true,
             },
             new()
             {
                 Id = 7,
                 FirstName = "Rodrigo",
                 MiddleName = "Javier",
                 LastName = "de Paul",
                 DateOfBirth = new DateTime(1994, 5, 23, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 7,
                 Position = Position.CentralMidfield.Text,
                 AbbrPosition = Position.CentralMidfield.Abbr,
                 Team = "Altético Madrid",
                 League = "La Liga",
                 Starting11 = true,
             },
             new()
             {
                 Id = 8,
                 FirstName = "Enzo",
                 MiddleName = "Jeremías",
                 LastName = "Fernández",
                 DateOfBirth = new DateTime(2001, 1, 16, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 24,
                 Position = Position.CentralMidfield.Text,
                 AbbrPosition = Position.CentralMidfield.Abbr,
                 Team = "Chelsea FC",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 9,
                 FirstName = "Alexis",
                 LastName = "Mac Allister",
                 DateOfBirth = new DateTime(1998, 12, 23, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 20,
                 Position = Position.CentralMidfield.Text,
                 AbbrPosition = Position.CentralMidfield.Abbr,
                 Team = "Liverpool FC",
                 League = "Premier League",
                 Starting11 = true,
             },
             new()
             {
                 Id = 10,
                 FirstName = "Lionel",
                 MiddleName = "Andrés",
                 LastName = "Messi",
                 DateOfBirth = new DateTime(1987, 6, 23, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 10,
                 Position = Position.RightWinger.Text,
                 AbbrPosition = Position.RightWinger.Abbr,
                 Team = "Inter Miami CF",
                 League = "Major League Soccer",
                 Starting11 = true,
             },
             new()
             {
                 Id = 11,
                 FirstName = "Julián",
                 LastName = "Álvarez",
                 DateOfBirth = new DateTime(2000, 1, 30, 0, 0, 0, DateTimeKind.Utc),
                 SquadNumber = 9,
                 Position = Position.CentreForward.Text,
                 AbbrPosition = Position.CentreForward.Abbr,
                 Team = "Manchester City",
                 League = "Premier League",
                 Starting11 = true,
             }
         ];
     }
 
-    public static List<PlayerResponseModel> CreateStarting11ResponseModels() =>
-        [
-            .. GetStarting11()
-                .Select(player => new PlayerResponseModel
-                {
-                    Id = player.Id,
-                    FullName =
-                        $"{player.FirstName} {(string.IsNullOrWhiteSpace(player.MiddleName) ? "" : player.MiddleName + " ")}{player.LastName}".Trim(),
-                    Birth = $"{player.DateOfBirth:MMMM d, yyyy}",
-                    Dorsal = player.SquadNumber,
-                    Position = player.Position,
-                    Club = player.Team,
-                    League = player.League,
-                    Starting11 = player.Starting11 ? "Yes" : "No"
-                })
-        ];
+    public static Player MakeFromStarting11ById(long id)
+    {
+        var player =
+            MakeStarting11().SingleOrDefault(player => player.Id == id)
+            ?? throw new ArgumentNullException($"Player with ID {id} not found.");
+
+        return player;
+    }
 
-    public static Player CreateOneNew()
+    public static Player MakeNew()
     {
         return new()
         {
@@ -205,88 +197,118 @@
         };
     }
 
-    public static PlayerRequestModel CreateRequestModelForOneNew()
+    /* -------------------------------------------------------------------------
+     * Create
+     * ---------------------------------------------------------------------- */
+
+    public static PlayerRequestModel MakeRequestModelForCreate()
     {
-        var player = CreateOneNew();
+        var player = MakeNew();
 
-        return new()
+        return new PlayerRequestModel()
         {
             Id = player.Id,
             FirstName = player.FirstName,
             MiddleName = player.MiddleName,
             LastName = player.LastName,
             DateOfBirth = player.DateOfBirth,
             SquadNumber = player.SquadNumber,
             AbbrPosition = player.AbbrPosition,
             Team = player.Team,
             League = player.League
         };
     }
 
-    public static PlayerResponseModel CreateResponseModelForOneNew()
+    public static PlayerResponseModel MakeResponseModelForCreate()
     {
-        var player = CreateOneNew();
+        var player = MakeNew();
 
         return new PlayerResponseModel
         {
             Id = player.Id,
             FullName =
                 $"{player.FirstName} {(string.IsNullOrWhiteSpace(player.MiddleName) ? "" : player.MiddleName + " ")}{player.LastName}".Trim(),
             Birth = $"{player.DateOfBirth:MMMM d, yyyy}",
             Dorsal = player.SquadNumber,
             Position = player.Position,
             Club = player.Team,
             League = player.League,
             Starting11 = player.Starting11 ? "Yes" : "No"
         };
     }
 
-    public static Player GetOneExistingById(long id)
-    {
-        var player =
-            GetStarting11().SingleOrDefault(player => player.Id == id)
-            ?? throw new ArgumentNullException($"Player with ID {id} not found.");
-
-        return player;
-    }
+    /* -------------------------------------------------------------------------
+     * Retrieve
+     * ---------------------------------------------------------------------- */
 
-    public static PlayerRequestModel CreateRequestModelForOneExistingById(long id)
+    public static PlayerRequestModel MakeRequestModelForRetrieve(long id)
     {
         var player =
-            GetStarting11().SingleOrDefault(player => player.Id == id)
+            MakeStarting11().SingleOrDefault(player => player.Id == id)
             ?? throw new ArgumentNullException($"Player with ID {id} not found.");
 
         return new PlayerRequestModel
         {
             Id = player.Id,
             FirstName = player.FirstName,
             MiddleName = player.MiddleName,
             LastName = player.LastName,
             DateOfBirth = player.DateOfBirth,
             SquadNumber = player.SquadNumber,
             AbbrPosition = player.AbbrPosition,
             Team = player.Team,
             League = player.League
         };
     }
 
-    public static PlayerResponseModel CreateResponseModelForOneExistingById(long id)
+    public static PlayerResponseModel MakeResponseModelForRetrieve(long id)
     {
         var player =
-            GetStarting11().SingleOrDefault(player => player.Id == id)
+            MakeStarting11().SingleOrDefault(player => player.Id == id)
             ?? throw new ArgumentNullException($"Player with ID {id} not found.");
 
         return new PlayerResponseModel
         {
             Id = player.Id,
             FullName =
                 $"{player.FirstName} {(string.IsNullOrWhiteSpace(player.MiddleName) ? "" : player.MiddleName + " ")}{player.LastName}".Trim(),
             Birth = $"{player.DateOfBirth:MMMM d, yyyy}",
             Dorsal = player.SquadNumber,
             Position = player.Position,
             Club = player.Team,
             League = player.League,
             Starting11 = player.Starting11 ? "Yes" : "No"
         };
     }
+
+    public static List<PlayerResponseModel> MakeResponseModelsForRetrieve() =>
+        [
+            .. MakeStarting11()
+                .Select(player => new PlayerResponseModel
+                {
+                    Id = player.Id,
+                    FullName =
+                        $"{player.FirstName} {(string.IsNullOrWhiteSpace(player.MiddleName) ? "" : player.MiddleName + " ")}{player.LastName}".Trim(),
+                    Birth = $"{player.DateOfBirth:MMMM d, yyyy}",
+                    Dorsal = player.SquadNumber,
+                    Position = player.Position,
+                    Club = player.Team,
+                    League = player.League,
+                    Starting11 = player.Starting11 ? "Yes" : "No"
+                })
+        ];
+
+    /* -------------------------------------------------------------------------
+     * Update
+     * ---------------------------------------------------------------------- */
+
+    public static PlayerRequestModel MakeRequestModelForUpdate(long id)
+    {
+        return MakeRequestModelForRetrieve(id);
+    }
+
+    public static PlayerResponseModel MakeResponseModelForUpdate(long id)
+    {
+        return MakeResponseModelForRetrieve(id);
+    }
 }