Replace stored-procedure repositories with Dapper-based repositories

Removes the USP_* stored procedures for Auth, Location, and Brewery data access in favour of services built with Dapper. Adds a new Features.Locations slice and optimistic concurrency support for the Brewery slice.
2026-10-15 10:04:44 +00:00 · 2026-08-17 20:50:44 -04:00
parent e8499181cb
commit cac6d7f193
81 changed files with 1656 additions and 1401 deletions
--- a/web/backend/Features/Features.Breweries.Tests/Commands/UpdateBreweryHandlerTests.cs
+++ b/web/backend/Features/Features.Breweries.Tests/Commands/UpdateBreweryHandlerTests.cs
@@ -21,6 +21,7 @@ public class UpdateBreweryHandlerTests
    {
        UpdateBreweryCommand command = new(
            Guid.NewGuid(),
+            [0x01, 0x02],
            Guid.NewGuid(),
            "Renamed",
            "New description",
@@ -31,7 +32,7 @@ public class UpdateBreweryHandlerTests
        _repoMock
            .Setup(r => r.UpdateAsync(It.IsAny<BreweryPost>()))
            .Callback<BreweryPost>(b => persisted = b)
-            .Returns(Task.CompletedTask);
+            .ReturnsAsync(() => persisted!);

        DateTime before = DateTime.UtcNow;
        await _handler.Handle(command, CancellationToken.None);
@@ -42,6 +43,7 @@ public class UpdateBreweryHandlerTests
        persisted.PostedById.Should().Be(command.PostedById);
        persisted.BreweryName.Should().Be("Renamed");
        persisted.Description.Should().Be("New description");
+        persisted.Timer.Should().Equal(command.Timer);
        persisted.UpdatedAt.Should().NotBeNull();
        persisted.UpdatedAt!.Value.Should().BeOnOrAfter(before).And.BeOnOrBefore(after);
    }
@@ -51,6 +53,7 @@ public class UpdateBreweryHandlerTests
    {
        UpdateBreweryCommand command = new(
            Guid.NewGuid(),
+            [0x01, 0x02],
            Guid.NewGuid(),
            "Name",
            "Description",
@@ -61,7 +64,7 @@ public class UpdateBreweryHandlerTests
        _repoMock
            .Setup(r => r.UpdateAsync(It.IsAny<BreweryPost>()))
            .Callback<BreweryPost>(b => persisted = b)
-            .Returns(Task.CompletedTask);
+            .ReturnsAsync(() => persisted!);

        await _handler.Handle(command, CancellationToken.None);

@@ -81,6 +84,7 @@ public class UpdateBreweryHandlerTests
        );
        UpdateBreweryCommand command = new(
            Guid.NewGuid(),
+            [0x01, 0x02],
            Guid.NewGuid(),
            "Name",
            "Description",
@@ -91,7 +95,7 @@ public class UpdateBreweryHandlerTests
        _repoMock
            .Setup(r => r.UpdateAsync(It.IsAny<BreweryPost>()))
            .Callback<BreweryPost>(b => persisted = b)
-            .Returns(Task.CompletedTask);
+            .ReturnsAsync(() => persisted!);

        await _handler.Handle(command, CancellationToken.None);

--- a/web/backend/Features/Features.Breweries.Tests/Repository/BreweryRepositoryTests.cs
+++ b/web/backend/Features/Features.Breweries.Tests/Repository/BreweryRepositoryTests.cs
@@ -1,5 +1,6 @@
 using Apps72.Dev.Data.DbMocker;
 using Domain.Entities;
+using Domain.Exceptions;
 using Features.Breweries.Repository;
 using FluentAssertions;

@@ -18,12 +19,9 @@ public class BreweryRepositoryTests
        Guid breweryId = Guid.NewGuid();
        MockDbConnection conn = new();

-        // Repository calls the stored procedure
-        const string getByIdSql = "USP_GetBreweryById";
-
        Guid locationId = Guid.NewGuid();

-        conn.Mocks.When(cmd => cmd.CommandText == getByIdSql)
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INNER JOIN dbo.BreweryPostLocation"))
            .ReturnsTable(
                MockTable
                    .WithColumns(
@@ -70,7 +68,7 @@ public class BreweryRepositoryTests
    public async Task GetByIdAsync_ReturnsNull_WhenNotExists()
    {
        MockDbConnection conn = new();
-        conn.Mocks.When(cmd => cmd.CommandText == "USP_GetBreweryById")
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INNER JOIN dbo.BreweryPostLocation"))
            .ReturnsTable(MockTable.Empty());
        BreweryRepository repo = CreateRepo(conn);
        BreweryPost? result = await repo.GetByIdAsync(Guid.NewGuid());
@@ -81,7 +79,12 @@ public class BreweryRepositoryTests
    public async Task CreateAsync_ExecutesSuccessfully()
    {
        MockDbConnection conn = new();
-        conn.Mocks.When(cmd => cmd.CommandText == "USP_CreateBrewery").ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.UserAccount")).ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.City")).ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INSERT INTO dbo.BreweryPost (")).ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INSERT INTO dbo.BreweryPostLocation"))
+            .ReturnsScalar(1);
+
        BreweryRepository repo = CreateRepo(conn);
        BreweryPost brewery = new()
        {
@@ -104,4 +107,223 @@ public class BreweryRepositoryTests
        Func<Task> act = async () => await repo.CreateAsync(brewery);
        await act.Should().NotThrowAsync();
    }
+
+    [Fact]
+    public async Task CreateAsync_ThrowsArgumentException_WhenLocationMissing()
+    {
+        MockDbConnection conn = new();
+        BreweryRepository repo = CreateRepo(conn);
+        BreweryPost brewery = new()
+        {
+            BreweryPostId = Guid.NewGuid(),
+            PostedById = Guid.NewGuid(),
+            BreweryName = "Test Brewery",
+            Description = "A test brewery description",
+        };
+
+        Func<Task> act = async () => await repo.CreateAsync(brewery);
+        await act.Should().ThrowAsync<ArgumentException>();
+    }
+
+    [Fact]
+    public async Task CreateAsync_ThrowsNotFound_WhenUserMissing()
+    {
+        MockDbConnection conn = new();
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.UserAccount"))
+            .ReturnsScalar((int?)null);
+
+        BreweryRepository repo = CreateRepo(conn);
+        BreweryPost brewery = new()
+        {
+            BreweryPostId = Guid.NewGuid(),
+            PostedById = Guid.NewGuid(),
+            BreweryName = "Test Brewery",
+            Description = "A test brewery description",
+            Location = new BreweryPostLocation
+            {
+                BreweryPostLocationId = Guid.NewGuid(),
+                CityId = Guid.NewGuid(),
+                AddressLine1 = "123 Main St",
+                PostalCode = "12345",
+            },
+        };
+
+        Func<Task> act = async () => await repo.CreateAsync(brewery);
+        await act.Should().ThrowAsync<NotFoundException>();
+    }
+
+    [Fact]
+    public async Task CreateAsync_UsesClientProvidedIds()
+    {
+        MockDbConnection conn = new();
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.UserAccount")).ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.City")).ReturnsScalar(1);
+
+        Guid? capturedBreweryPostId = null;
+        Guid? capturedLocationId = null;
+
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INSERT INTO dbo.BreweryPost ("))
+            .ReturnsScalar(cmd =>
+            {
+                capturedBreweryPostId = (Guid?)
+                    cmd.Parameters.First(p => p.ParameterName == "BreweryPostId").Value;
+                return 1;
+            });
+
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INSERT INTO dbo.BreweryPostLocation"))
+            .ReturnsScalar(cmd =>
+            {
+                capturedLocationId = (Guid?)
+                    cmd.Parameters.First(p => p.ParameterName == "BreweryPostLocationId").Value;
+                return 1;
+            });
+
+        Guid expectedBreweryId = Guid.NewGuid();
+        Guid expectedLocationId = Guid.NewGuid();
+
+        BreweryRepository repo = CreateRepo(conn);
+        BreweryPost brewery = new()
+        {
+            BreweryPostId = expectedBreweryId,
+            PostedById = Guid.NewGuid(),
+            BreweryName = "Test Brewery",
+            Description = "A test brewery description",
+            Location = new BreweryPostLocation
+            {
+                BreweryPostLocationId = expectedLocationId,
+                CityId = Guid.NewGuid(),
+                AddressLine1 = "123 Main St",
+                PostalCode = "12345",
+            },
+        };
+
+        await repo.CreateAsync(brewery);
+
+        capturedBreweryPostId.Should().Be(expectedBreweryId);
+        capturedLocationId.Should().Be(expectedLocationId);
+    }
+
+    [Fact]
+    public async Task UpdateAsync_ReturnsFreshlyPersistedBrewery_WhenSuccessful()
+    {
+        Guid breweryId = Guid.NewGuid();
+        byte[] newTimer = [0x00, 0x02];
+        MockDbConnection conn = new();
+
+        conn.Mocks.When(cmd =>
+                cmd.CommandText.Contains("SELECT 1 FROM dbo.BreweryPost WHERE BreweryPostID")
+            )
+            .ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.City")).ReturnsScalar(1);
+        conn.Mocks.When(cmd =>
+                cmd.CommandText.Contains("WHERE BreweryPostID = @BreweryPostId AND Timer = @Timer")
+            )
+            .ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("SELECT 1 FROM dbo.BreweryPostLocation"))
+            .ReturnsScalar(1);
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("UPDATE dbo.BreweryPostLocation"))
+            .ReturnsScalar(1);
+
+        // Repository re-fetches the row after a successful update to return the new Timer.
+        conn.Mocks.When(cmd => cmd.CommandText.Contains("INNER JOIN dbo.BreweryPostLocation"))
+            .ReturnsTable(
+                MockTable
+                    .WithColumns(
+                        ("BreweryPostId", typeof(Guid)),
+                        ("PostedById", typeof(Guid)),
+                        ("BreweryName", typeof(string)),
+                        ("Description", typeof(string)),
+                        ("CreatedAt", typeof(DateTime)),
+                        ("UpdatedAt", typeof(DateTime?)),
+                        ("Timer", typeof(byte[])),
+                        ("BreweryPostLocationId", typeof(Guid)),
+                        ("CityId", typeof(Guid)),
+                        ("AddressLine1", typeof(string)),
+                        ("AddressLine2", typeof(string)),
+                        ("PostalCode", typeof(string)),
+                        ("Coordinates", typeof(byte[]))
+                    )
+                    .AddRow(
+                        breweryId,
+                        Guid.NewGuid(),
+                        "Renamed Brewery",
+                        "Updated description",
+                        DateTime.UtcNow,
+                        DateTime.UtcNow,
+                        newTimer,
+                        Guid.NewGuid(),
+                        Guid.NewGuid(),
+                        "123 Main St",
+                        null,
+                        "12345",
+                        null
+                    )
+            );
+
+        BreweryRepository repo = CreateRepo(conn);
+        BreweryPost brewery = new()
+        {
+            BreweryPostId = breweryId,
+            PostedById = Guid.NewGuid(),
+            BreweryName = "Renamed Brewery",
+            Description = "Updated description",
+            Timer = [0x00, 0x01],
+            Location = new BreweryPostLocation
+            {
+                CityId = Guid.NewGuid(),
+                AddressLine1 = "123 Main St",
+                PostalCode = "12345",
+            },
+        };
+
+        BreweryPost result = await repo.UpdateAsync(brewery);
+
+        result.BreweryPostId.Should().Be(breweryId);
+        result.Timer.Should().Equal(newTimer);
+    }
+
+    [Fact]
+    public async Task UpdateAsync_ThrowsNotFound_WhenBreweryMissing()
+    {
+        MockDbConnection conn = new();
+        conn.Mocks.When(cmd =>
+                cmd.CommandText.Contains("SELECT 1 FROM dbo.BreweryPost WHERE BreweryPostID")
+            )
+            .ReturnsScalar((int?)null);
+
+        BreweryRepository repo = CreateRepo(conn);
+        BreweryPost brewery = new() { BreweryPostId = Guid.NewGuid(), Timer = [0x00, 0x01] };
+
+        Func<Task> act = async () => await repo.UpdateAsync(brewery);
+        await act.Should().ThrowAsync<NotFoundException>();
+    }
+
+    [Fact]
+    public async Task UpdateAsync_ThrowsConflict_WhenTimerStale()
+    {
+        MockDbConnection conn = new();
+        conn.Mocks.When(cmd =>
+                cmd.CommandText.Contains("SELECT 1 FROM dbo.BreweryPost WHERE BreweryPostID")
+            )
+            .ReturnsScalar(1);
+
+        // Brewery exists but the conditional UPDATE (WHERE ... AND Timer = @Timer) matches no rows,
+        // since the caller's Timer no longer matches the stored row.
+        conn.Mocks.When(cmd =>
+                cmd.CommandText.Contains("WHERE BreweryPostID = @BreweryPostId AND Timer = @Timer")
+            )
+            .ReturnsScalar(0);
+
+        BreweryRepository repo = CreateRepo(conn);
+        BreweryPost brewery = new()
+        {
+            BreweryPostId = Guid.NewGuid(),
+            BreweryName = "Renamed Brewery",
+            Description = "Updated description",
+            Timer = [0x00, 0x01],
+        };
+
+        Func<Task> act = async () => await repo.UpdateAsync(brewery);
+        await act.Should().ThrowAsync<ConflictException>();
+    }
 }