ride reconcilation with driver profile update

Distribution.Tests/Services/RouteServiceTests.cs

@@ -1,343 +0,0 @@
-using Distribution.Features.Region;
-using Distribution.Features.Route;
-using Distribution.Infra.Authorization;
-using Distribution.Infra.UoW;
-using Distribution.Models;
-using Moq;
-using Xunit;
-
-namespace Distribution.Tests.Services;
-
-public class RouteServiceTests
-{
-    private readonly Mock<IRouteRepository> _repo = new();
-    private readonly Mock<IRegionRepository> _regionRepo = new();
-    private readonly Mock<IUnitOfWork> _uow = new();
-    private readonly Mock<ICurrentUserService> _currentUser = new();
-    private readonly Mock<IScopeAccessService> _scopeAccess = new();
-    private readonly RouteService _sut;
-
-    private static readonly Guid RepUserId = Guid.NewGuid();
-
-    public RouteServiceTests()
-    {
-        _currentUser.Setup(u => u.RoleLevel).Returns(20);
-        _currentUser.Setup(u => u.UserId).Returns(RepUserId);
-        _sut = new RouteService(_repo.Object, _regionRepo.Object, _uow.Object, _currentUser.Object, _scopeAccess.Object);
-    }
-
-    private static Models.Route ActiveRoute(Guid? ownerId = null) =>
-        new() { Id = Guid.NewGuid(), RouteName = "R1", StartPoint = "A", EndPoint = "B", Length = 10, IsActive = true, FK_OwnerUserId = ownerId };
-
-    private static Models.Route InactiveRoute() =>
-        new() { Id = Guid.NewGuid(), RouteName = "Old", StartPoint = "A", EndPoint = "B", Length = 10, IsActive = false };
-
-    private static Store ActiveStore(Guid routeId, decimal lat = 10m, decimal lon = 20m) =>
-        new() { Id = Guid.NewGuid(), FK_RouteId = routeId, IsActive = true, Latitude = lat, Longitude = lon };
-
-    // AssignStoresToRouteAsync
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenRouteNotFound()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Models.Route?)null);
-
-        var result = await _sut.AssignStoresToRouteAsync(Guid.NewGuid(), new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenRouteInactive()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync(InactiveRoute());
-
-        var result = await _sut.AssignStoresToRouteAsync(Guid.NewGuid(), new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenCallerLacksRouteScope()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(false);
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenCallerBelowRoleFloor()
-    {
-        _currentUser.Setup(u => u.RoleLevel).Returns(10);
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest([Guid.NewGuid()]));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_ReturnsNull_WhenAnyStoreIdMissing()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        var storeIds = new List<Guid> { Guid.NewGuid(), Guid.NewGuid() };
-        _repo.Setup(r => r.GetStoresByIdsAsync(storeIds)).ReturnsAsync([ActiveStore(route.Id)]); // only one of two found
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest(storeIds));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_UpdatesEachStore_AndCommits()
-    {
-        var route = ActiveRoute();
-        var otherRouteId = Guid.NewGuid();
-        var stores = new List<Store> { ActiveStore(otherRouteId), ActiveStore(otherRouteId) };
-        var storeIds = stores.Select(s => s.Id).ToList();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoresByIdsAsync(storeIds)).ReturnsAsync(stores);
-
-        var result = await _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest(storeIds));
-
-        Assert.NotNull(result);
-        Assert.All(stores, s => Assert.Equal(route.Id, s.FK_RouteId));
-        _repo.Verify(r => r.UpdateStore(It.IsAny<Store>()), Times.Exactly(2));
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task AssignStoresToRouteAsync_Rollbacks_WhenUpdateThrows()
-    {
-        var route = ActiveRoute();
-        var stores = new List<Store> { ActiveStore(route.Id) };
-        var storeIds = stores.Select(s => s.Id).ToList();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoresByIdsAsync(storeIds)).ReturnsAsync(stores);
-        _repo.Setup(r => r.UpdateStore(It.IsAny<Store>())).Throws(new Exception("db error"));
-
-        await Assert.ThrowsAsync<Exception>(() => _sut.AssignStoresToRouteAsync(route.Id, new AssignStoresToRouteRequest(storeIds)));
-
-        _uow.Verify(u => u.RollbackAsync(default), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Never);
-    }
-
-    // AssignOwnerAsync
-
-    [Fact]
-    public async Task AssignOwnerAsync_ReturnsNull_WhenRouteNotFound()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Models.Route?)null);
-
-        var result = await _sut.AssignOwnerAsync(Guid.NewGuid(), new AssignRouteOwnerRequest(Guid.NewGuid()));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task AssignOwnerAsync_ReturnsNull_WhenTargetUserNotActive()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetActiveUserAsync(It.IsAny<Guid>())).ReturnsAsync((User?)null);
-
-        var result = await _sut.AssignOwnerAsync(route.Id, new AssignRouteOwnerRequest(Guid.NewGuid()));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task AssignOwnerAsync_SetsOwner_AndCommits()
-    {
-        var route = ActiveRoute();
-        var salesRep = new User { Id = Guid.NewGuid(), IsActive = true };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetActiveUserAsync(salesRep.Id)).ReturnsAsync(salesRep);
-
-        var result = await _sut.AssignOwnerAsync(route.Id, new AssignRouteOwnerRequest(salesRep.Id));
-
-        Assert.NotNull(result);
-        Assert.Equal(salesRep.Id, result.OwnerUserId);
-        Assert.Equal(salesRep.Id, route.FK_OwnerUserId);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task AssignOwnerAsync_AllowsReassignment_ToDifferentSalesRep()
-    {
-        var firstOwner = Guid.NewGuid();
-        var route = ActiveRoute(firstOwner);
-        var newRep = new User { Id = Guid.NewGuid(), IsActive = true };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetActiveUserAsync(newRep.Id)).ReturnsAsync(newRep);
-
-        var result = await _sut.AssignOwnerAsync(route.Id, new AssignRouteOwnerRequest(newRep.Id));
-
-        Assert.NotNull(result);
-        Assert.Equal(newRep.Id, result.OwnerUserId);
-        Assert.NotEqual(firstOwner, result.OwnerUserId);
-    }
-
-    // RecordCheckInAsync
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenCallerNotAuthenticated()
-    {
-        _currentUser.Setup(u => u.UserId).Returns((Guid?)null);
-
-        var result = await _sut.RecordCheckInAsync(Guid.NewGuid(), new RecordCheckInRequest(Guid.NewGuid(), 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenRouteNotFoundOrInactive()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync(InactiveRoute());
-
-        var result = await _sut.RecordCheckInAsync(Guid.NewGuid(), new RecordCheckInRequest(Guid.NewGuid(), 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenCallerLacksRouteScope()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(false);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(Guid.NewGuid(), 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_ReturnsNull_WhenStoreNotOnRoute()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(Guid.NewGuid()); // belongs to a different route
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, 1, 2, null));
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_NotFlagged_WhenGpsMatchesStoreLocation()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(route.Id, lat: 12.9716m, lon: 77.5946m);
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, 12.9716m, 77.5946m, null));
-
-        Assert.NotNull(result);
-        Assert.False(result.IsDeviationFlagged);
-        _repo.Verify(r => r.AddVisitLogAsync(It.IsAny<RouteVisitLog>()), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_Flagged_WhenGpsFarFromStoreLocation()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(route.Id, lat: 12.9716m, lon: 77.5946m); // Bengaluru
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        // Mumbai coordinates - hundreds of km away
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, 19.0760m, 72.8777m, null));
-
-        Assert.NotNull(result);
-        Assert.True(result.IsDeviationFlagged);
-    }
-
-    [Fact]
-    public async Task RecordCheckInAsync_UsesCurrentUserId_AsVisitingRep()
-    {
-        var route = ActiveRoute();
-        var store = ActiveStore(route.Id);
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetStoreByIdAsync(store.Id)).ReturnsAsync(store);
-
-        var result = await _sut.RecordCheckInAsync(route.Id, new RecordCheckInRequest(store.Id, store.Latitude, store.Longitude, null));
-
-        Assert.NotNull(result);
-        Assert.Equal(RepUserId, result.UserId);
-    }
-
-    // RecordCheckOutAsync
-
-    [Fact]
-    public async Task RecordCheckOutAsync_ReturnsNull_WhenNoOpenVisit()
-    {
-        var route = ActiveRoute();
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetOpenVisitAsync(route.Id, It.IsAny<Guid>())).ReturnsAsync((RouteVisitLog?)null);
-
-        var result = await _sut.RecordCheckOutAsync(route.Id, new RecordCheckOutRequest(Guid.NewGuid(), null));
-
-        Assert.Null(result);
-        _uow.Verify(u => u.BeginAsync(default), Times.Never);
-    }
-
-    [Fact]
-    public async Task RecordCheckOutAsync_SetsCheckOutAt_AndCommits()
-    {
-        var route = ActiveRoute();
-        var storeId = Guid.NewGuid();
-        var log = new RouteVisitLog { Id = Guid.NewGuid(), FK_RouteId = route.Id, FK_StoreId = storeId, FK_UserId = RepUserId, CheckInAt = DateTime.Now.AddHours(-1) };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetOpenVisitAsync(route.Id, storeId)).ReturnsAsync(log);
-
-        var result = await _sut.RecordCheckOutAsync(route.Id, new RecordCheckOutRequest(storeId, null));
-
-        Assert.NotNull(result);
-        Assert.NotNull(result.CheckOutAt);
-        Assert.NotNull(log.CheckOutAt);
-        _repo.Verify(r => r.UpdateVisitLog(log), Times.Once);
-        _uow.Verify(u => u.CommitAsync(default), Times.Once);
-    }
-
-    [Fact]
-    public async Task RecordCheckOutAsync_Rollbacks_WhenUpdateThrows()
-    {
-        var route = ActiveRoute();
-        var storeId = Guid.NewGuid();
-        var log = new RouteVisitLog { Id = Guid.NewGuid(), FK_RouteId = route.Id, FK_StoreId = storeId, FK_UserId = RepUserId, CheckInAt = DateTime.Now };
-        _repo.Setup(r => r.GetByIdAsync(route.Id)).ReturnsAsync(route);
-        _scopeAccess.Setup(s => s.HasRouteScopeAsync(RepUserId, route.Id)).ReturnsAsync(true);
-        _repo.Setup(r => r.GetOpenVisitAsync(route.Id, storeId)).ReturnsAsync(log);
-        _repo.Setup(r => r.UpdateVisitLog(It.IsAny<RouteVisitLog>())).Throws(new Exception("db error"));
-
-        await Assert.ThrowsAsync<Exception>(() => _sut.RecordCheckOutAsync(route.Id, new RecordCheckOutRequest(storeId, null)));
-
-        _uow.Verify(u => u.RollbackAsync(default), Times.Once);
-    }
-}

Distribution.Tests/Services/StoreServiceTests.cs

@@ -1,85 +0,0 @@
-using Distribution.Features.Item;
-using Distribution.Features.Order;
-using Distribution.Features.Route;
-using Distribution.Features.Scheme;
-using Distribution.Features.Stock;
-using Distribution.Features.Store;
-using Distribution.Infra.Authorization;
-using Distribution.Infra.UoW;
-using Distribution.Models;
-using Moq;
-using Xunit;
-
-namespace Distribution.Tests.Services;
-
-public class StoreServiceTests
-{
-    private readonly Mock<IStoreRepository> _repo = new();
-    private readonly Mock<IUnitOfWork> _uow = new();
-    private readonly Mock<ICurrentUserService> _currentUser = new();
-    private readonly Mock<IScopeAccessService> _scopeAccess = new();
-    private readonly Mock<IRouteRepository> _routeRepo = new();
-    private readonly StoreService _sut;
-
-    public StoreServiceTests()
-    {
-        _currentUser.Setup(u => u.RoleLevel).Returns(50); // global scope, skips per-store scope lookups
-        var schemeService = new SchemeService(
-            Mock.Of<ISchemeRepository>(),
-            Mock.Of<IOrderRepository>(),
-            Mock.Of<IItemRepository>(),
-            _repo.Object,
-            Mock.Of<IStockRepository>(),
-            _uow.Object);
-        _sut = new StoreService(_repo.Object, _uow.Object, _currentUser.Object, _scopeAccess.Object, schemeService, _routeRepo.Object);
-    }
-
-    private static Store ActiveStore() =>
-        new() { Id = Guid.NewGuid(), IsActive = true };
-
-    // GetVisitHistoryAsync
-
-    [Fact]
-    public async Task GetVisitHistoryAsync_ReturnsNull_WhenStoreNotFound()
-    {
-        _repo.Setup(r => r.GetByIdAsync(It.IsAny<Guid>())).ReturnsAsync((Store?)null);
-
-        var result = await _sut.GetVisitHistoryAsync(Guid.NewGuid());
-
-        Assert.Null(result);
-    }
-
-    [Fact]
-    public async Task GetVisitHistoryAsync_ReturnsEmpty_WhenNoVisitsLogged()
-    {
-        var store = ActiveStore();
-        _repo.Setup(r => r.GetByIdAsync(store.Id)).ReturnsAsync(store);
-        _routeRepo.Setup(r => r.GetVisitsByStoreIdAsync(store.Id)).ReturnsAsync([]);
-
-        var result = await _sut.GetVisitHistoryAsync(store.Id);
-
-        Assert.NotNull(result);
-        Assert.Empty(result);
-    }
-
-    [Fact]
-    public async Task GetVisitHistoryAsync_MapsVisits_MostRecentFirst()
-    {
-        var store = ActiveStore();
-        var repId = Guid.NewGuid();
-        var older = new RouteVisitLog { Id = Guid.NewGuid(), FK_StoreId = store.Id, FK_UserId = repId, CheckInAt = DateTime.Now.AddDays(-2), CheckOutAt = DateTime.Now.AddDays(-2).AddHours(1) };
-        var newer = new RouteVisitLog { Id = Guid.NewGuid(), FK_StoreId = store.Id, FK_UserId = repId, CheckInAt = DateTime.Now.AddDays(-1), CheckOutAt = null };
-        _repo.Setup(r => r.GetByIdAsync(store.Id)).ReturnsAsync(store);
-        _routeRepo.Setup(r => r.GetVisitsByStoreIdAsync(store.Id)).ReturnsAsync([older, newer]);
-
-        var result = await _sut.GetVisitHistoryAsync(store.Id);
-
-        Assert.NotNull(result);
-        Assert.Equal(2, result.Count);
-        Assert.Equal(newer.Id, result[0].VisitId);
-        Assert.Equal("In Progress", result[0].Outcome);
-        Assert.Equal(older.Id, result[1].VisitId);
-        Assert.Equal("Completed", result[1].Outcome);
-        Assert.Equal(repId, result[0].RepUserId);
-    }
-}

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+85a16396aad31f1e82cf28f330a97dee2eafa51d")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aa7ea37ab61a149a38d83283c5dabd76bf5a39b3")]
 [assembly: System.Reflection.AssemblyProductAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Distribution.Tests")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.AssemblyInfoInputs.cache

@@ -1 +1 @@
-100cae0f5643c7476420ef14e72b5b17dcb877fe4318c0b6cb2cff0baa955aa5
+5c052f1f25bc37b6a51a3abe0e2b79d99d21422d5ab89151faea450c0ddb9cc0

Distribution.Tests/obj/Debug/net9.0/Distribution.Tests.GeneratedMSBuildEditorConfig.editorconfig

@@ -11,7 +11,7 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property.EntryPointFilePath = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Distribution.Tests
-build_property.ProjectDir = D:\HexDrive Projects\Distribution\ERP_Distribution\Distribution.Tests\
+build_property.ProjectDir = C:\Users\lenovo\Desktop\NEWGITEA\ERP_Distribution\Distribution.Tests\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 build_property.EffectiveAnalysisLevelStyle = 9.0

Distribution.Tests/obj/Distribution.Tests.csproj.nuget.dgspec.json

@@ -1,23 +1,23 @@
 {
   "format": 1,
   "restore": {
-    "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {}
+    "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {}
   },
   "projects": {
-    "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {
+    "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+        "projectUniqueName": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
         "projectName": "Distribution.Tests",
-        "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
-        "packagesPath": "C:\\Users\\dell\\.nuget\\packages\\",
-        "outputPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\obj\\",
+        "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+        "packagesPath": "C:\\Users\\lenovo\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
           "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\dell\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
@@ -26,7 +26,6 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -34,8 +33,8 @@
             "framework": "net9.0",
             "targetAlias": "net9.0",
             "projectReferences": {
-              "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj": {
-                "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj"
+              "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj": {
+                "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj"
               }
             }
           }
@@ -50,7 +49,7 @@
           "auditLevel": "low",
           "auditMode": "direct"
         },
-        "SdkAnalysisLevel": "10.0.400"
+        "SdkAnalysisLevel": "10.0.300"
       },
       "frameworks": {
         "net9.0": {
@@ -98,24 +97,24 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.302/PortableRuntimeIdentifierGraph.json"
         }
       }
     },
-    "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj": {
+    "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj",
+        "projectUniqueName": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj",
         "projectName": "Distribution",
-        "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj",
-        "packagesPath": "C:\\Users\\dell\\.nuget\\packages\\",
-        "outputPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\obj\\",
+        "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj",
+        "packagesPath": "C:\\Users\\lenovo\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
           "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\dell\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
@@ -124,7 +123,6 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -144,7 +142,7 @@
           "auditLevel": "low",
           "auditMode": "direct"
         },
-        "SdkAnalysisLevel": "10.0.400"
+        "SdkAnalysisLevel": "10.0.300"
       },
       "frameworks": {
         "net9.0": {
@@ -193,7 +191,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.302/PortableRuntimeIdentifierGraph.json"
         }
       }
     }

Distribution.Tests/obj/Distribution.Tests.csproj.nuget.g.props

@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\dell\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\lenovo\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\dell\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\lenovo\.nuget\packages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
@@ -22,7 +22,7 @@
     <Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Pkgxunit_analyzers Condition=" '$(Pkgxunit_analyzers)' == '' ">C:\Users\dell\.nuget\packages\xunit.analyzers\1.18.0</Pkgxunit_analyzers>
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\dell\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
+    <Pkgxunit_analyzers Condition=" '$(Pkgxunit_analyzers)' == '' ">C:\Users\lenovo\.nuget\packages\xunit.analyzers\1.18.0</Pkgxunit_analyzers>
+    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\lenovo\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
   </PropertyGroup>
 </Project>

Distribution.Tests/obj/project.assets.json

@@ -2542,23 +2542,23 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\dell\\.nuget\\packages\\": {},
+    "C:\\Users\\lenovo\\.nuget\\packages\\": {},
     "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+      "projectUniqueName": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
       "projectName": "Distribution.Tests",
-      "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
-      "packagesPath": "C:\\Users\\dell\\.nuget\\packages\\",
-      "outputPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\obj\\",
+      "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+      "packagesPath": "C:\\Users\\lenovo\\.nuget\\packages\\",
+      "outputPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
         "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
       ],
       "configFilePaths": [
-        "C:\\Users\\dell\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
@@ -2567,7 +2567,6 @@
       ],
       "sources": {
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "C:\\Program Files\\dotnet\\library-packs": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -2575,8 +2574,8 @@
           "framework": "net9.0",
           "targetAlias": "net9.0",
           "projectReferences": {
-            "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj": {
-              "projectPath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution\\Distribution.csproj"
+            "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj": {
+              "projectPath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution\\Distribution.csproj"
             }
           }
         }
@@ -2591,7 +2590,7 @@
         "auditLevel": "low",
         "auditMode": "direct"
       },
-      "SdkAnalysisLevel": "10.0.400"
+      "SdkAnalysisLevel": "10.0.300"
     },
     "frameworks": {
       "net9.0": {
@@ -2639,7 +2638,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.302/PortableRuntimeIdentifierGraph.json"
       }
     }
   }

Distribution.Tests/obj/project.nuget.cache

@@ -1,57 +1,57 @@
 {
   "version": 2,
-  "dgSpecHash": "JPCR3IFZHKY=",
+  "dgSpecHash": "XdH8cqlThLk=",
   "success": true,
-  "projectFilePath": "D:\\HexDrive Projects\\Distribution\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
+  "projectFilePath": "C:\\Users\\lenovo\\Desktop\\NEWGITEA\\ERP_Distribution\\Distribution.Tests\\Distribution.Tests.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\dell\\.nuget\\packages\\castle.core\\5.1.1\\castle.core.5.1.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\coverlet.collector\\6.0.2\\coverlet.collector.6.0.2.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\9.0.0\\microsoft.aspnetcore.authentication.jwtbearer.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.aspnetcore.openapi\\9.0.0\\microsoft.aspnetcore.openapi.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.codecoverage\\17.12.0\\microsoft.codecoverage.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore\\9.0.0\\microsoft.entityframeworkcore.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\9.0.0\\microsoft.entityframeworkcore.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\9.0.0\\microsoft.entityframeworkcore.analyzers.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\9.0.0\\microsoft.entityframeworkcore.relational.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\9.0.0\\microsoft.extensions.caching.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.caching.memory\\9.0.0\\microsoft.extensions.caching.memory.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\9.0.0\\microsoft.extensions.configuration.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\9.0.0\\microsoft.extensions.dependencyinjection.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\9.0.0\\microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.logging\\9.0.0\\microsoft.extensions.logging.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\9.0.0\\microsoft.extensions.logging.abstractions.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.options\\9.0.0\\microsoft.extensions.options.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.0\\microsoft.extensions.primitives.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.0.1\\microsoft.identitymodel.abstractions.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.0.1\\microsoft.identitymodel.jsonwebtokens.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.logging\\8.0.1\\microsoft.identitymodel.logging.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.protocols\\8.0.1\\microsoft.identitymodel.protocols.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\8.0.1\\microsoft.identitymodel.protocols.openidconnect.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.0.1\\microsoft.identitymodel.tokens.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.net.test.sdk\\17.12.0\\microsoft.net.test.sdk.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.openapi\\1.6.22\\microsoft.openapi.1.6.22.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.testplatform.objectmodel\\17.12.0\\microsoft.testplatform.objectmodel.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\microsoft.testplatform.testhost\\17.12.0\\microsoft.testplatform.testhost.17.12.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\moq\\4.20.72\\moq.4.20.72.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\mysqlconnector\\2.4.0\\mysqlconnector.2.4.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\9.0.0\\pomelo.entityframeworkcore.mysql.9.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore\\7.3.1\\swashbuckle.aspnetcore.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\7.3.1\\swashbuckle.aspnetcore.swagger.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\7.3.1\\swashbuckle.aspnetcore.swaggergen.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\7.3.1\\swashbuckle.aspnetcore.swaggerui.7.3.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\system.diagnostics.eventlog\\6.0.0\\system.diagnostics.eventlog.6.0.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.0.1\\system.identitymodel.tokens.jwt.8.0.1.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit\\2.9.3\\xunit.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.abstractions\\2.0.3\\xunit.abstractions.2.0.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.analyzers\\1.18.0\\xunit.analyzers.1.18.0.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.assert\\2.9.3\\xunit.assert.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.core\\2.9.3\\xunit.core.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.extensibility.core\\2.9.3\\xunit.extensibility.core.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.extensibility.execution\\2.9.3\\xunit.extensibility.execution.2.9.3.nupkg.sha512",
-    "C:\\Users\\dell\\.nuget\\packages\\xunit.runner.visualstudio\\2.8.2\\xunit.runner.visualstudio.2.8.2.nupkg.sha512"
+    "C:\\Users\\lenovo\\.nuget\\packages\\castle.core\\5.1.1\\castle.core.5.1.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\coverlet.collector\\6.0.2\\coverlet.collector.6.0.2.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\9.0.0\\microsoft.aspnetcore.authentication.jwtbearer.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.aspnetcore.openapi\\9.0.0\\microsoft.aspnetcore.openapi.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.codecoverage\\17.12.0\\microsoft.codecoverage.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore\\9.0.0\\microsoft.entityframeworkcore.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\9.0.0\\microsoft.entityframeworkcore.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\9.0.0\\microsoft.entityframeworkcore.analyzers.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\9.0.0\\microsoft.entityframeworkcore.relational.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\9.0.0\\microsoft.extensions.caching.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\9.0.0\\microsoft.extensions.caching.memory.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\9.0.0\\microsoft.extensions.configuration.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\9.0.0\\microsoft.extensions.dependencyinjection.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\9.0.0\\microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.logging\\9.0.0\\microsoft.extensions.logging.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\9.0.0\\microsoft.extensions.logging.abstractions.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.options\\9.0.0\\microsoft.extensions.options.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.0\\microsoft.extensions.primitives.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.0.1\\microsoft.identitymodel.abstractions.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.0.1\\microsoft.identitymodel.jsonwebtokens.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\8.0.1\\microsoft.identitymodel.logging.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\8.0.1\\microsoft.identitymodel.protocols.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\8.0.1\\microsoft.identitymodel.protocols.openidconnect.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.0.1\\microsoft.identitymodel.tokens.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.net.test.sdk\\17.12.0\\microsoft.net.test.sdk.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.openapi\\1.6.22\\microsoft.openapi.1.6.22.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.testplatform.objectmodel\\17.12.0\\microsoft.testplatform.objectmodel.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\microsoft.testplatform.testhost\\17.12.0\\microsoft.testplatform.testhost.17.12.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\moq\\4.20.72\\moq.4.20.72.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\mysqlconnector\\2.4.0\\mysqlconnector.2.4.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\9.0.0\\pomelo.entityframeworkcore.mysql.9.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\7.3.1\\swashbuckle.aspnetcore.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\7.3.1\\swashbuckle.aspnetcore.swagger.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\7.3.1\\swashbuckle.aspnetcore.swaggergen.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\7.3.1\\swashbuckle.aspnetcore.swaggerui.7.3.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\system.diagnostics.eventlog\\6.0.0\\system.diagnostics.eventlog.6.0.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.0.1\\system.identitymodel.tokens.jwt.8.0.1.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit\\2.9.3\\xunit.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.abstractions\\2.0.3\\xunit.abstractions.2.0.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.analyzers\\1.18.0\\xunit.analyzers.1.18.0.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.assert\\2.9.3\\xunit.assert.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.core\\2.9.3\\xunit.core.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.extensibility.core\\2.9.3\\xunit.extensibility.core.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.extensibility.execution\\2.9.3\\xunit.extensibility.execution.2.9.3.nupkg.sha512",
+    "C:\\Users\\lenovo\\.nuget\\packages\\xunit.runner.visualstudio\\2.8.2\\xunit.runner.visualstudio.2.8.2.nupkg.sha512"
   ],
   "logs": []
 }

Distribution/Data/AppDBContext.cs

@@ -60,7 +60,9 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
     public DbSet<RegionalBudget> RegionalBudgets { get; set; }
     public DbSet<RegionAgencyMap> RegionAgencyMaps { get; set; }
     public DbSet<RegionalTaxRule> RegionalTaxRules { get; set; }
-    public DbSet<RouteVisitLog> RouteVisitLogs { get; set; }
+    public DbSet<RideItemCount> RideItemCounts { get; set; }
+    public DbSet<RideVariance> RideVariances { get; set; }
+    public DbSet<RideCloseSummary> RideCloseSummaries { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
@@ -400,11 +402,23 @@ public class AppDBContext(DbContextOptions<AppDBContext> options) : DbContext(op
             .HasIndex(r => r.FK_RegionId)
             .IsUnique();
 
+        modelBuilder.Entity<RideVariance>()
+            .HasOne(v => v.ResolvedBy)
+            .WithMany()
+            .HasForeignKey(v => v.FK_ResolvedByUserId)
+            .OnDelete(DeleteBehavior.Restrict)
+            .IsRequired(false);
+
+        modelBuilder.Entity<RideCloseSummary>()
+            .HasIndex(s => s.FK_RideId)
+            .IsUnique();
+
+        modelBuilder.Entity<RideCloseSummary>()
+            .HasOne(s => s.ClosedByUser)
+            .WithMany()
+            .HasForeignKey(s => s.FK_ClosedByUserId)
+            .OnDelete(DeleteBehavior.Restrict);
+
         Seed.RoleAndPermissionSeed.Apply(modelBuilder);
-        Seed.MasterDataSeed.Apply(modelBuilder);
-        Seed.OperationsDataSeed.Apply(modelBuilder);
-        Seed.ProcurementSeed.Apply(modelBuilder);
-        Seed.CommerceSeed.Apply(modelBuilder);
-        Seed.OperationsExtrasSeed.Apply(modelBuilder);
     }
 }

Distribution/Data/Seed/CommerceSeed.cs

@@ -1,117 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class CommerceSeed
-{
-    private static readonly Guid PriceList1Id = new("39000000-0000-0000-0000-000000000001");
-    private static readonly Guid PriceListItem1Id = new("40000000-0000-0000-0000-000000000001");
-    private static readonly Guid PriceListItem2Id = new("40000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid Scheme1Id = new("48000000-0000-0000-0000-000000000001");
-    private static readonly Guid Scheme2Id = new("48000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid SchemeBundleComponent1Id = new("49000000-0000-0000-0000-000000000001");
-    private static readonly Guid SchemeRedemption1Id = new("50000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid Payment1Id = new("47000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid SaleReturn1Id = new("51000000-0000-0000-0000-000000000001");
-    private static readonly Guid SaleReturnItem1Id = new("52000000-0000-0000-0000-000000000001");
-    private static readonly Guid CreditNote1Id = new("54000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid Claim1Id = new("53000000-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<PriceList>().HasData(
-            new PriceList { Id = PriceList1Id, Name = "Western Province Price List", FK_RegionId = MasterDataSeed.WesternRegionId, EffectiveFrom = new DateTime(2026, 1, 1), EffectiveTo = new DateTime(2026, 12, 31), CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<PriceListItem>().HasData(
-            new PriceListItem { Id = PriceListItem1Id, FK_PriceListId = PriceList1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Price = 60m, MinPrice = 55m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true },
-            new PriceListItem { Id = PriceListItem2Id, FK_PriceListId = PriceList1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Price = 50m, MinPrice = 45m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<Scheme>().HasData(
-            new Scheme
-            {
-                Id = Scheme1Id,
-                Name = "Buy 10 Coke Get 1 Free",
-                RuleType = SchemeRuleType.BuyXGetY,
-                RuleConfig = null,
-                FK_TriggerItemId = MasterDataSeed.Coke500ItemId,
-                TriggerQty = 10,
-                FK_FreeItemId = MasterDataSeed.Coke500ItemId,
-                FreeQty = 1m,
-                FK_RegionId = MasterDataSeed.WesternRegionId,
-                EligibleSegment = null,
-                DateRangeFrom = new DateTime(2026, 8, 1),
-                DateRangeTo = new DateTime(2026, 12, 31),
-                AgentLimitExempt = false,
-                BaselineExpectedSales = 500000m,
-                CreatedAt = new DateTime(2026, 8, 1),
-                IsActive = true
-            },
-            new Scheme
-            {
-                Id = Scheme2Id,
-                Name = "Snack Combo Bundle",
-                RuleType = SchemeRuleType.FreeBundle,
-                RuleConfig = null,
-                FK_TriggerItemId = null,
-                TriggerQty = null,
-                FK_FreeItemId = MasterDataSeed.LaysFamilyItemId,
-                FreeQty = 1m,
-                FK_RegionId = MasterDataSeed.CentralRegionId,
-                EligibleSegment = null,
-                DateRangeFrom = new DateTime(2026, 8, 1),
-                DateRangeTo = new DateTime(2026, 12, 31),
-                AgentLimitExempt = false,
-                BaselineExpectedSales = null,
-                CreatedAt = new DateTime(2026, 8, 1),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<SchemeBundleComponent>().HasData(
-            new SchemeBundleComponent { Id = SchemeBundleComponent1Id, FK_SchemeId = Scheme2Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Qty = 5 }
-        );
-
-        modelBuilder.Entity<SchemeRedemption>().HasData(
-            new SchemeRedemption { Id = SchemeRedemption1Id, FK_SchemeId = Scheme1Id, FK_OrderId = OperationsDataSeed.Order1Id, FieldInvoiceId = null, DiscountAmount = 0m, FK_FreeItemId = MasterDataSeed.Coke500ItemId, FreeQty = 1m, FreeItemCostValue = 40m, RedeemedAt = new DateTime(2026, 8, 25, 9, 30, 0) }
-        );
-
-        modelBuilder.Entity<Payment>().HasData(
-            new Payment { Id = Payment1Id, FK_SaleId = OperationsDataSeed.Sale1Id, FK_StoreId = MasterDataSeed.FortStoreId, Amount = 3000m, Method = PaymentMethod.Cash, CollectedAt = new DateTime(2026, 8, 25, 9, 30, 0), CollectedBy = MasterDataSeed.SalesRep1UserId, CreatedAt = new DateTime(2026, 8, 25, 9, 30, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<SaleReturn>().HasData(
-            new SaleReturn { Id = SaleReturn1Id, FK_OrderId = OperationsDataSeed.Order1Id, Mode = ReturnMode.CreditDeduction, TotalCreditAmount = 300m, CreatedByUserId = MasterDataSeed.SalesRep1UserId, CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
-        );
-
-        modelBuilder.Entity<SaleReturnItem>().HasData(
-            new SaleReturnItem { Id = SaleReturnItem1Id, FK_SaleReturnId = SaleReturn1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 5m, ReasonCode = ReturnReasonCode.Damaged, UnitPrice = 60m, CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
-        );
-
-        modelBuilder.Entity<CreditNote>().HasData(
-            new CreditNote { Id = CreditNote1Id, FK_SaleReturnId = SaleReturn1Id, Amount = 300m, IssuedAt = new DateTime(2026, 8, 26), CreatedAt = new DateTime(2026, 8, 26), IsActive = true }
-        );
-
-        modelBuilder.Entity<Claim>().HasData(
-            new Claim
-            {
-                Id = Claim1Id,
-                FK_AgencyUserId = OperationsExtrasSeed.RegionalAgency1UserId,
-                Details = "Distributor margin claim for Q3 promotional shortfall",
-                Status = ClaimStatus.Settled,
-                SettlementAmount = 15000m,
-                SettledByUserId = MasterDataSeed.RegionalManager1UserId,
-                SettledAt = new DateTime(2026, 8, 28),
-                CreatedAt = new DateTime(2026, 8, 27),
-                IsActive = true
-            }
-        );
-    }
-}

Distribution/Data/Seed/MasterDataSeed.cs

@@ -1,131 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class MasterDataSeed
-{
-    private static readonly DateTime SeedDate = new(2026, 8, 20);
-
-    // Precomputed via PasswordHasher<User>().HashPassword(new User(), "Passw0rd!123") — see
-    // Implementation Notes in the plan; not derivable from HasData at migration time.
-    internal const string SeedPasswordHash = "AQAAAAIAAYagAAAAEKGnq/U4j6uM9g5mFkxbUE8WU/AhnSNiwrKCiPAqGnzNcaMgZAF5Zal/rJUUYPZPpg==";
-
-    // Role ids match Data/Seed/RoleAndPermissionSeed.cs (private there, so re-declared here by value).
-    internal static readonly Guid SalesRepRoleId = new("10000000-0000-0000-0000-000000000001");
-    internal static readonly Guid SupervisorRoleId = new("10000000-0000-0000-0000-000000000002");
-    internal static readonly Guid RegionalManagerRoleId = new("10000000-0000-0000-0000-000000000005");
-
-    internal static readonly Guid BeveragesCategoryId = new("20000000-0000-0000-0000-000000000001");
-    internal static readonly Guid SnacksCategoryId = new("20000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid CocaColaBrandId = new("21000000-0000-0000-0000-000000000001");
-    internal static readonly Guid LaysBrandId = new("21000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid PieceUomId = new("22000000-0000-0000-0000-000000000001");
-
-    internal static readonly Guid Coke500ItemId = new("23000000-0000-0000-0000-000000000001");
-    internal static readonly Guid Coke1500ItemId = new("23000000-0000-0000-0000-000000000002");
-    internal static readonly Guid LaysClassicItemId = new("23000000-0000-0000-0000-000000000003");
-    internal static readonly Guid LaysFamilyItemId = new("23000000-0000-0000-0000-000000000004");
-
-    internal static readonly Guid WesternRegionId = new("24000000-0000-0000-0000-000000000001");
-    internal static readonly Guid CentralRegionId = new("24000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid ColomboRouteId = new("25000000-0000-0000-0000-000000000001");
-    internal static readonly Guid NegomboRouteId = new("25000000-0000-0000-0000-000000000002");
-    internal static readonly Guid KandyRouteId = new("25000000-0000-0000-0000-000000000003");
-    internal static readonly Guid MataleRouteId = new("25000000-0000-0000-0000-000000000004");
-
-    internal static readonly Guid FortStoreId = new("26000000-0000-0000-0000-000000000001");
-    internal static readonly Guid DehiwalaStoreId = new("26000000-0000-0000-0000-000000000002");
-    internal static readonly Guid WattalaStoreId = new("26000000-0000-0000-0000-000000000003");
-    internal static readonly Guid NegomboStoreId = new("26000000-0000-0000-0000-000000000004");
-    internal static readonly Guid KandyStoreId = new("26000000-0000-0000-0000-000000000005");
-    internal static readonly Guid MataleStoreId = new("26000000-0000-0000-0000-000000000006");
-
-    internal static readonly Guid ColomboWarehouseId = new("27000000-0000-0000-0000-000000000001");
-    internal static readonly Guid KandyWarehouseId = new("27000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid VanVehicleId = new("28000000-0000-0000-0000-000000000001");
-    internal static readonly Guid TruckVehicleId = new("28000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid Supervisor1UserId = new("29000000-0000-0000-0000-000000000001");
-    internal static readonly Guid SalesRep1UserId = new("29000000-0000-0000-0000-000000000002");
-    internal static readonly Guid SalesRep2UserId = new("29000000-0000-0000-0000-000000000003");
-    internal static readonly Guid Driver1UserId = new("29000000-0000-0000-0000-000000000004");
-    internal static readonly Guid Driver2UserId = new("29000000-0000-0000-0000-000000000005");
-    internal static readonly Guid RegionalManager1UserId = new("29000000-0000-0000-0000-000000000006");
-
-    internal static readonly Guid Driver1ProfileId = new("30000000-0000-0000-0000-000000000001");
-    internal static readonly Guid Driver2ProfileId = new("30000000-0000-0000-0000-000000000002");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<Category>().HasData(
-            new Category { Id = BeveragesCategoryId, Name = "Beverages", CreatedAt = SeedDate, IsActive = true },
-            new Category { Id = SnacksCategoryId, Name = "Snacks", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Brand>().HasData(
-            new Brand { Id = CocaColaBrandId, Name = "Coca-Cola", CreatedAt = SeedDate, IsActive = true },
-            new Brand { Id = LaysBrandId, Name = "Lays", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Uom>().HasData(
-            new Uom { Id = PieceUomId, Name = "Piece", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Item>().HasData(
-            new Item { Id = Coke500ItemId, Sku = "BEV-COKE-500", Name = "Coca-Cola 500ml", Description = "Coca-Cola 500ml bottle", FK_CategoryId = BeveragesCategoryId, FK_BrandId = CocaColaBrandId, FK_BaseUomId = PieceUomId, SalePrice = 60m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true },
-            new Item { Id = Coke1500ItemId, Sku = "BEV-COKE-1500", Name = "Coca-Cola 1.5L", Description = "Coca-Cola 1.5L bottle", FK_CategoryId = BeveragesCategoryId, FK_BrandId = CocaColaBrandId, FK_BaseUomId = PieceUomId, SalePrice = 120m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true },
-            new Item { Id = LaysClassicItemId, Sku = "SNK-LAYS-52", Name = "Lays Classic 52g", Description = "Lays Classic Salted 52g pack", FK_CategoryId = SnacksCategoryId, FK_BrandId = LaysBrandId, FK_BaseUomId = PieceUomId, SalePrice = 50m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true },
-            new Item { Id = LaysFamilyItemId, Sku = "SNK-LAYS-FAM", Name = "Lays Family Pack 150g", Description = "Lays Family Pack 150g", FK_CategoryId = SnacksCategoryId, FK_BrandId = LaysBrandId, FK_BaseUomId = PieceUomId, SalePrice = 150m, SyncSource = SyncSource.Manual, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Region>().HasData(
-            new Region { Id = WesternRegionId, Name = "Western Province", CreatedAt = SeedDate, IsActive = true },
-            new Region { Id = CentralRegionId, Name = "Central Province", CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Models.Route>().HasData(
-            new Models.Route { Id = ColomboRouteId, RouteName = "Colombo City Route", StartPoint = "Colombo Fort", EndPoint = "Dehiwala", Length = 18.5m, FK_RegionId = WesternRegionId, FK_OwnerUserId = SalesRep1UserId, CreatedAt = SeedDate, IsActive = true },
-            new Models.Route { Id = NegomboRouteId, RouteName = "Negombo Coastal Route", StartPoint = "Wattala", EndPoint = "Negombo", Length = 32.0m, FK_RegionId = WesternRegionId, FK_OwnerUserId = SalesRep1UserId, CreatedAt = SeedDate, IsActive = true },
-            new Models.Route { Id = KandyRouteId, RouteName = "Kandy Town Route", StartPoint = "Kandy Lake", EndPoint = "Peradeniya", Length = 12.0m, FK_RegionId = CentralRegionId, FK_OwnerUserId = SalesRep2UserId, CreatedAt = SeedDate, IsActive = true },
-            new Models.Route { Id = MataleRouteId, RouteName = "Matale Route", StartPoint = "Kandy", EndPoint = "Matale", Length = 26.0m, FK_RegionId = CentralRegionId, FK_OwnerUserId = SalesRep2UserId, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Store>().HasData(
-            new Store { Id = FortStoreId, FK_RouteId = ColomboRouteId, OwnerName = "Saman Kumara", StoreName = "Fort Mini Mart", StoreAddress = "12 York Street, Colombo Fort", Latitude = 6.9344m, Longitude = 79.8428m, CreditLimit = 50000m, OutstandingBalance = 0m, Segment = "Gold", KycStatus = KycStatus.Verified, CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = DehiwalaStoreId, FK_RouteId = ColomboRouteId, OwnerName = "Nadeesha Silva", StoreName = "Dehiwala Grocery", StoreAddress = "45 Galle Road, Dehiwala", Latitude = 6.8508m, Longitude = 79.8654m, CreditLimit = 30000m, OutstandingBalance = 5000m, Segment = "Silver", KycStatus = KycStatus.Verified, CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = WattalaStoreId, FK_RouteId = NegomboRouteId, OwnerName = "Ruwan Gunasekara", StoreName = "Wattala Supermarket", StoreAddress = "88 Negombo Road, Wattala", Latitude = 6.9890m, Longitude = 79.8912m, CreditLimit = 40000m, OutstandingBalance = 1200m, Segment = "Gold", KycStatus = KycStatus.Pending, CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = NegomboStoreId, FK_RouteId = NegomboRouteId, OwnerName = "Chamari Peiris", StoreName = "Negombo Beach Store", StoreAddress = "5 Beach Road, Negombo", Latitude = 7.2094m, Longitude = 79.8380m, CreditLimit = 25000m, OutstandingBalance = 0m, KycStatus = KycStatus.Pending, CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = KandyStoreId, FK_RouteId = KandyRouteId, OwnerName = "Dinesh Wickramasinghe", StoreName = "Kandy Lake View Store", StoreAddress = "3 Lake Road, Kandy", Latitude = 7.2906m, Longitude = 80.6337m, CreditLimit = 35000m, OutstandingBalance = 0m, Segment = "Key Account", KycStatus = KycStatus.Verified, CreatedAt = SeedDate, IsActive = true },
-            new Store { Id = MataleStoreId, FK_RouteId = MataleRouteId, OwnerName = "Ishara Bandara", StoreName = "Matale Central Store", StoreAddress = "20 Main Street, Matale", Latitude = 7.4675m, Longitude = 80.6234m, CreditLimit = 20000m, OutstandingBalance = 0m, KycStatus = KycStatus.Pending, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Warehouse>().HasData(
-            new Warehouse { Id = ColomboWarehouseId, Name = "Colombo Distribution Center", Location = "Peliyagoda, Colombo", Type = WareHouseType.DistributionCenter, VehicleId = null, CreatedAt = SeedDate, IsActive = true },
-            new Warehouse { Id = KandyWarehouseId, Name = "Kandy Fulfillment Center", Location = "Katugastota, Kandy", Type = WareHouseType.FulfillmentCenter, VehicleId = null, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<Vehicle>().HasData(
-            new Vehicle { Id = VanVehicleId, RegNumber = "WP-CAB-1234", NumberPlate = "CAB-1234", Type = VehicleType.Van, DefaultWarehouseId = ColomboWarehouseId, CreatedAt = SeedDate, IsActive = true },
-            new Vehicle { Id = TruckVehicleId, RegNumber = "CP-KY-5678", NumberPlate = "KY-5678", Type = VehicleType.Truck, DefaultWarehouseId = KandyWarehouseId, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<User>().HasData(
-            new User { Id = Supervisor1UserId, Username = "sunil.fernando", PasswordHash = SeedPasswordHash, FullName = "Sunil Fernando", FK_RoleId = SupervisorRoleId, FK_ReportsToUserId = null, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = SalesRep1UserId, Username = "nimal.perera", PasswordHash = SeedPasswordHash, FullName = "Nimal Perera", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = SalesRep2UserId, Username = "kamal.silva", PasswordHash = SeedPasswordHash, FullName = "Kamal Silva", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = Driver1UserId, Username = "ruwan.jayasuriya", PasswordHash = SeedPasswordHash, FullName = "Ruwan Jayasuriya", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = Driver2UserId, Username = "priyantha.kumara", PasswordHash = SeedPasswordHash, FullName = "Priyantha Kumara", FK_RoleId = SalesRepRoleId, FK_ReportsToUserId = Supervisor1UserId, CreatedAt = SeedDate, IsActive = true },
-            new User { Id = RegionalManager1UserId, Username = "priya.rajapaksa", PasswordHash = SeedPasswordHash, FullName = "Priya Rajapaksa", FK_RoleId = RegionalManagerRoleId, FK_ReportsToUserId = null, CreatedAt = SeedDate, IsActive = true }
-        );
-
-        modelBuilder.Entity<DriverProfile>().HasData(
-            new DriverProfile { Id = Driver1ProfileId, FK_UserId = Driver1UserId, LicenseNumber = "B1234567", LicenseExpiry = new DateTime(2027, 6, 30), MedicalClearanceExpiry = new DateTime(2027, 1, 31), CreatedAt = SeedDate, IsActive = true },
-            new DriverProfile { Id = Driver2ProfileId, FK_UserId = Driver2UserId, LicenseNumber = "B7654321", LicenseExpiry = new DateTime(2027, 9, 30), MedicalClearanceExpiry = new DateTime(2027, 3, 31), CreatedAt = SeedDate, IsActive = true }
-        );
-    }
-}

Distribution/Data/Seed/OperationsDataSeed.cs

@@ -1,170 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class OperationsDataSeed
-{
-    internal static readonly Guid ClosedSaleRunId = new("31000000-0000-0000-0000-000000000001");
-    internal static readonly Guid ActiveDeliveryRunId = new("31000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid Sale1Id = new("32000000-0000-0000-0000-000000000001");
-    internal static readonly Guid Sale2Id = new("32000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid Order1Id = new("33000000-0000-0000-0000-000000000001");
-    internal static readonly Guid Order2Id = new("33000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid OrderItem1Id = new("34000000-0000-0000-0000-000000000001");
-    internal static readonly Guid OrderItem2Id = new("34000000-0000-0000-0000-000000000002");
-    internal static readonly Guid OrderItem3Id = new("34000000-0000-0000-0000-000000000003");
-
-    internal static readonly Guid LoadingSheet1Id = new("35000000-0000-0000-0000-000000000001");
-
-    internal static readonly Guid LoadingSheetItem1Id = new("36000000-0000-0000-0000-000000000001");
-    internal static readonly Guid LoadingSheetItem2Id = new("36000000-0000-0000-0000-000000000002");
-
-    internal static readonly Guid DeliveryTask1Id = new("37000000-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<DeliveryRun>().HasData(
-            new DeliveryRun
-            {
-                Id = ClosedSaleRunId,
-                RideType = RideType.Sale,
-                Status = RideStatus.Closed,
-                FK_VehicleId = MasterDataSeed.VanVehicleId,
-                FK_DriverProfileId = MasterDataSeed.Driver1ProfileId,
-                FK_RouteId = MasterDataSeed.ColomboRouteId,
-                FK_SourceWarehouseId = MasterDataSeed.ColomboWarehouseId,
-                Meterstart = 10500,
-                Meterend = 10550,
-                StartedAt = new DateTime(2026, 8, 25, 8, 0, 0),
-                ActivatedAt = new DateTime(2026, 8, 25, 8, 15, 0),
-                ClosedAt = new DateTime(2026, 8, 25, 14, 0, 0),
-                CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0),
-                IsActive = true
-            },
-            new DeliveryRun
-            {
-                Id = ActiveDeliveryRunId,
-                RideType = RideType.Delivery,
-                Status = RideStatus.Active,
-                FK_VehicleId = MasterDataSeed.TruckVehicleId,
-                FK_DriverProfileId = MasterDataSeed.Driver2ProfileId,
-                FK_RouteId = MasterDataSeed.KandyRouteId,
-                FK_SourceWarehouseId = MasterDataSeed.KandyWarehouseId,
-                Meterstart = 20300,
-                Meterend = 0,
-                StartedAt = new DateTime(2026, 8, 30, 9, 0, 0),
-                ActivatedAt = new DateTime(2026, 8, 30, 9, 20, 0),
-                ClosedAt = null,
-                CreatedAt = new DateTime(2026, 8, 30, 8, 45, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<Sale>().HasData(
-            new Sale
-            {
-                Id = Sale1Id,
-                SaleDate = new DateTime(2026, 8, 25, 9, 0, 0),
-                FK_StoreId = MasterDataSeed.FortStoreId,
-                CreatedByUserId = MasterDataSeed.SalesRep1UserId,
-                FK_RideId = ClosedSaleRunId,
-                TotalAmount = 3000m,
-                Status = SaleStatus.Completed,
-                PaymentStatus = PaymentStatus.Paid,
-                FulfillImmediately = false,
-                CompletedAt = new DateTime(2026, 8, 25, 9, 30, 0),
-                CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0),
-                IsActive = true
-            },
-            new Sale
-            {
-                Id = Sale2Id,
-                SaleDate = new DateTime(2026, 8, 30, 10, 0, 0),
-                FK_StoreId = MasterDataSeed.KandyStoreId,
-                CreatedByUserId = MasterDataSeed.SalesRep2UserId,
-                FK_RideId = ActiveDeliveryRunId,
-                TotalAmount = 1200m,
-                Status = SaleStatus.Pending,
-                PaymentStatus = PaymentStatus.Pending,
-                FulfillImmediately = false,
-                CompletedAt = null,
-                CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<Order>().HasData(
-            new Order
-            {
-                Id = Order1Id,
-                FK_SaleId = Sale1Id,
-                OrderDate = new DateTime(2026, 8, 25, 9, 0, 0),
-                FK_StoreId = MasterDataSeed.FortStoreId,
-                TotalAmount = 3000m,
-                Status = OrderStatus.Fulfilled,
-                FulfilledAt = new DateTime(2026, 8, 25, 13, 0, 0),
-                CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0),
-                IsActive = true
-            },
-            new Order
-            {
-                Id = Order2Id,
-                FK_SaleId = Sale2Id,
-                OrderDate = new DateTime(2026, 8, 30, 10, 0, 0),
-                FK_StoreId = MasterDataSeed.KandyStoreId,
-                TotalAmount = 1200m,
-                Status = OrderStatus.Pending,
-                FulfilledAt = null,
-                CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<OrderItem>().HasData(
-            new OrderItem { Id = OrderItem1Id, FK_OrderId = Order1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 30, QuantityFulfilled = 30, UnitPrice = 60m, CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
-            new OrderItem { Id = OrderItem2Id, FK_OrderId = Order1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 24, QuantityFulfilled = 24, UnitPrice = 50m, CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
-            new OrderItem { Id = OrderItem3Id, FK_OrderId = Order2Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 10, QuantityFulfilled = 0, UnitPrice = 120m, CreatedAt = new DateTime(2026, 8, 30, 10, 0, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<LoadingSheet>().HasData(
-            new LoadingSheet
-            {
-                Id = LoadingSheet1Id,
-                FK_RideId = ClosedSaleRunId,
-                FK_SourceWarehouseId = MasterDataSeed.ColomboWarehouseId,
-                Status = LoadingSheetStatus.ReceiptConfirmed,
-                DispatchConfirmedAt = new DateTime(2026, 8, 25, 7, 45, 0),
-                DispatchConfirmedBy = MasterDataSeed.Supervisor1UserId,
-                ReceiptConfirmedAt = new DateTime(2026, 8, 25, 14, 5, 0),
-                ReceiptConfirmedBy = MasterDataSeed.Driver1UserId,
-                CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<LoadingSheetItem>().HasData(
-            new LoadingSheetItem { Id = LoadingSheetItem1Id, FK_LoadingSheetId = LoadingSheet1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, QuantityDispatched = 50m, QuantityReceived = 50m, QuantityResolved = null },
-            new LoadingSheetItem { Id = LoadingSheetItem2Id, FK_LoadingSheetId = LoadingSheet1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, QuantityDispatched = 30m, QuantityReceived = 30m, QuantityResolved = null }
-        );
-
-        modelBuilder.Entity<DeliveryTask>().HasData(
-            new DeliveryTask
-            {
-                Id = DeliveryTask1Id,
-                FK_RideId = ActiveDeliveryRunId,
-                FK_OrderId = Order2Id,
-                Sequence = 1,
-                Status = DeliveryTaskStatus.Pending,
-                CustomerConfirmed = false,
-                ConfirmedAt = null,
-                Note = null,
-                CreatedAt = new DateTime(2026, 8, 30, 10, 5, 0),
-                IsActive = true
-            }
-        );
-    }
-}

Distribution/Data/Seed/OperationsExtrasSeed.cs

@@ -1,135 +0,0 @@
-using Distribution.Features.Stock;
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class OperationsExtrasSeed
-{
-    // Role id matches RegionalAgency in Data/Seed/RoleAndPermissionSeed.cs (private there).
-    private static readonly Guid RegionalAgencyRoleId = new("10000000-0000-0000-0000-000000000006");
-
-    internal static readonly Guid RegionalAgency1UserId = new("70000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid CaseUomId = new("67000000-0000-0000-0000-000000000001");
-    private static readonly Guid UomConversion1Id = new("67000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid RegionAgencyMap1Id = new("57000000-0000-0000-0000-000000000001");
-    private static readonly Guid RegionalBudget1Id = new("58000000-0000-0000-0000-000000000001");
-    private static readonly Guid RegionalTarget1Id = new("59000000-0000-0000-0000-000000000001");
-    private static readonly Guid RegionalTaxRule1Id = new("60000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid StockBalance1Id = new("61000000-0000-0000-0000-000000000001");
-    private static readonly Guid StockBalance2Id = new("61000000-0000-0000-0000-000000000002");
-    private static readonly Guid StockBalance3Id = new("61000000-0000-0000-0000-000000000003");
-
-    private static readonly Guid StockMovement1Id = new("62000000-0000-0000-0000-000000000001");
-    private static readonly Guid StockMovement2Id = new("62000000-0000-0000-0000-000000000002");
-    private static readonly Guid StockMovement3Id = new("62000000-0000-0000-0000-000000000003");
-
-    private static readonly Guid StoreKycDocument1Id = new("63000000-0000-0000-0000-000000000001");
-    private static readonly Guid StoreKycDocument2Id = new("63000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid DriverComplianceConfig1Id = new("64000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid RideCancelRequest1Id = new("65000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid RouteVisitLog1Id = new("66000000-0000-0000-0000-000000000001");
-    private static readonly Guid RouteVisitLog2Id = new("66000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid UserRegionScope1Id = new("68000000-0000-0000-0000-000000000001");
-    private static readonly Guid UserRouteScope1Id = new("68000000-0000-0000-0000-000000000002");
-    private static readonly Guid UserStoreScope1Id = new("68000000-0000-0000-0000-000000000003");
-
-    private static readonly Guid SaleRoute1Id = new("69000000-0000-0000-0000-000000000001");
-    private static readonly Guid SaleRoute2Id = new("69000000-0000-0000-0000-000000000002");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<User>().HasData(
-            new User { Id = RegionalAgency1UserId, Username = "channa.desilva", PasswordHash = MasterDataSeed.SeedPasswordHash, FullName = "Channa De Silva", FK_RoleId = RegionalAgencyRoleId, FK_ReportsToUserId = null, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<Uom>().HasData(
-            new Uom { Id = CaseUomId, Name = "Case", CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<UomConversion>().HasData(
-            new UomConversion { Id = UomConversion1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FK_FromUomId = CaseUomId, FK_ToUomId = MasterDataSeed.PieceUomId, Factor = 24m }
-        );
-
-        modelBuilder.Entity<RegionAgencyMap>().HasData(
-            new RegionAgencyMap { Id = RegionAgencyMap1Id, FK_RegionId = MasterDataSeed.WesternRegionId, FK_AgencyUserId = RegionalAgency1UserId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<RegionalBudget>().HasData(
-            new RegionalBudget { Id = RegionalBudget1Id, FK_RegionId = MasterDataSeed.WesternRegionId, Period = "2026-08", BudgetAmount = 200000m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<RegionalTarget>().HasData(
-            new RegionalTarget { Id = RegionalTarget1Id, FK_RegionId = MasterDataSeed.WesternRegionId, Period = "2026-08", TargetValue = 500000m, CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<RegionalTaxRule>().HasData(
-            new RegionalTaxRule { Id = RegionalTaxRule1Id, FK_RegionId = MasterDataSeed.WesternRegionId, RuleConfig = "{\"rate\": 0.15}", CreatedAt = new DateTime(2026, 8, 1), IsActive = true }
-        );
-
-        modelBuilder.Entity<StockBalance>().HasData(
-            new StockBalance { Id = StockBalance1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, LocationId = MasterDataSeed.ColomboWarehouseId, LocationType = LocationType.Warehouse, Quantity = 150m, UpdatedAt = new DateTime(2026, 8, 25, 9, 30, 0) },
-            new StockBalance { Id = StockBalance2Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, LocationId = MasterDataSeed.ColomboWarehouseId, LocationType = LocationType.Warehouse, Quantity = 90m, UpdatedAt = new DateTime(2026, 8, 25, 9, 30, 0) },
-            new StockBalance { Id = StockBalance3Id, FK_ItemId = MasterDataSeed.Coke500ItemId, LocationId = MasterDataSeed.VanVehicleId, LocationType = LocationType.Vehicle, Quantity = 20m, UpdatedAt = new DateTime(2026, 8, 25, 9, 30, 0) }
-        );
-
-        modelBuilder.Entity<StockMovement>().HasData(
-            new StockMovement { Id = StockMovement1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FromLocationId = StockService.ExternalLocationId, FromLocationType = LocationType.External, ToLocationId = MasterDataSeed.ColomboWarehouseId, ToLocationType = LocationType.Warehouse, Quantity = 200m, Type = MovementType.PurchaseReceipt, ReasonCode = null, ReferenceId = ProcurementSeed.GoodsReceipt1Id, CreatedAt = new DateTime(2026, 8, 15), CreatedBy = MasterDataSeed.Supervisor1UserId },
-            new StockMovement { Id = StockMovement2Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FromLocationId = MasterDataSeed.ColomboWarehouseId, FromLocationType = LocationType.Warehouse, ToLocationId = MasterDataSeed.VanVehicleId, ToLocationType = LocationType.Vehicle, Quantity = 50m, Type = MovementType.Load, ReasonCode = null, ReferenceId = OperationsDataSeed.LoadingSheet1Id, CreatedAt = new DateTime(2026, 8, 25, 7, 30, 0), CreatedBy = MasterDataSeed.Supervisor1UserId },
-            new StockMovement { Id = StockMovement3Id, FK_ItemId = MasterDataSeed.Coke500ItemId, FromLocationId = MasterDataSeed.VanVehicleId, FromLocationType = LocationType.Vehicle, ToLocationId = StockService.ExternalLocationId, ToLocationType = LocationType.External, Quantity = 30m, Type = MovementType.Sale, ReasonCode = null, ReferenceId = OperationsDataSeed.Sale1Id, CreatedAt = new DateTime(2026, 8, 25, 9, 30, 0), CreatedBy = MasterDataSeed.SalesRep1UserId }
-        );
-
-        modelBuilder.Entity<StoreKycDocument>().HasData(
-            new StoreKycDocument { Id = StoreKycDocument1Id, FK_StoreId = MasterDataSeed.FortStoreId, DocumentType = "Business Registration", FileReference = "seed/kyc/fort-mini-mart-brc.pdf", UploadedAt = new DateTime(2026, 8, 10), CreatedAt = new DateTime(2026, 8, 10), IsActive = true },
-            new StoreKycDocument { Id = StoreKycDocument2Id, FK_StoreId = MasterDataSeed.WattalaStoreId, DocumentType = "NIC", FileReference = "seed/kyc/wattala-owner-nic.pdf", UploadedAt = new DateTime(2026, 8, 12), CreatedAt = new DateTime(2026, 8, 12), IsActive = true }
-        );
-
-        modelBuilder.Entity<DriverComplianceConfig>().HasData(
-            new DriverComplianceConfig { Id = DriverComplianceConfig1Id, EnforceLicenseExpiry = true, EnforceMedicalClearance = true, UpdatedAt = new DateTime(2026, 8, 20), UpdatedBy = MasterDataSeed.Supervisor1UserId }
-        );
-
-        modelBuilder.Entity<RideCancelRequest>().HasData(
-            new RideCancelRequest
-            {
-                Id = RideCancelRequest1Id,
-                FK_RideId = OperationsDataSeed.ActiveDeliveryRunId,
-                TypeCode = CancelRequestType.VehicleBreakdown,
-                Reason = "Reported minor engine issue, resolved after inspection",
-                RequestedBy = MasterDataSeed.Driver2UserId,
-                RequestedAt = new DateTime(2026, 8, 30, 9, 10, 0),
-                Status = CancelRequestStatus.Rejected,
-                ApprovedBy = MasterDataSeed.Supervisor1UserId,
-                ApprovedAt = new DateTime(2026, 8, 30, 9, 15, 0)
-            }
-        );
-
-        modelBuilder.Entity<RouteVisitLog>().HasData(
-            new RouteVisitLog { Id = RouteVisitLog1Id, FK_RouteId = MasterDataSeed.ColomboRouteId, FK_StoreId = MasterDataSeed.FortStoreId, FK_UserId = MasterDataSeed.SalesRep1UserId, CheckInAt = new DateTime(2026, 8, 25, 9, 0, 0), CheckInLatitude = 6.9344m, CheckInLongitude = 79.8428m, IsDeviationFlagged = false, CheckOutAt = new DateTime(2026, 8, 25, 9, 25, 0), CreatedAt = new DateTime(2026, 8, 25, 9, 0, 0), IsActive = true },
-            new RouteVisitLog { Id = RouteVisitLog2Id, FK_RouteId = MasterDataSeed.ColomboRouteId, FK_StoreId = MasterDataSeed.DehiwalaStoreId, FK_UserId = MasterDataSeed.SalesRep1UserId, CheckInAt = new DateTime(2026, 8, 25, 10, 0, 0), CheckInLatitude = 6.9000m, CheckInLongitude = 79.8654m, IsDeviationFlagged = true, CheckOutAt = null, CreatedAt = new DateTime(2026, 8, 25, 10, 0, 0), IsActive = true }
-        );
-
-        modelBuilder.Entity<UserRegionScope>().HasData(
-            new UserRegionScope { Id = UserRegionScope1Id, FK_UserId = MasterDataSeed.RegionalManager1UserId, FK_RegionId = MasterDataSeed.WesternRegionId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<UserRouteScope>().HasData(
-            new UserRouteScope { Id = UserRouteScope1Id, FK_UserId = MasterDataSeed.Supervisor1UserId, FK_RouteId = MasterDataSeed.ColomboRouteId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<UserStoreScope>().HasData(
-            new UserStoreScope { Id = UserStoreScope1Id, FK_UserId = MasterDataSeed.SalesRep2UserId, FK_StoreId = MasterDataSeed.KandyStoreId, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-
-        modelBuilder.Entity<SaleRoute>().HasData(
-            new SaleRoute { Id = SaleRoute1Id, CreatedAt = new DateTime(2026, 8, 20), IsActive = true },
-            new SaleRoute { Id = SaleRoute2Id, CreatedAt = new DateTime(2026, 8, 20), IsActive = true }
-        );
-    }
-}

Distribution/Data/Seed/ProcurementSeed.cs

@@ -1,88 +0,0 @@
-using Distribution.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Data.Seed;
-
-public static class ProcurementSeed
-{
-    private static readonly Guid Supplier1Id = new("38000000-0000-0000-0000-000000000001");
-    private static readonly Guid Supplier2Id = new("38000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid PurchaseOrder1Id = new("41000000-0000-0000-0000-000000000001");
-    private static readonly Guid PurchaseOrder2Id = new("41000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid PurchaseOrderItem1Id = new("42000000-0000-0000-0000-000000000001");
-    private static readonly Guid PurchaseOrderItem2Id = new("42000000-0000-0000-0000-000000000002");
-    private static readonly Guid PurchaseOrderItem3Id = new("42000000-0000-0000-0000-000000000003");
-
-    internal static readonly Guid GoodsReceipt1Id = new("43000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid GoodsReceiptItem1Id = new("44000000-0000-0000-0000-000000000001");
-    private static readonly Guid GoodsReceiptItem2Id = new("44000000-0000-0000-0000-000000000002");
-
-    private static readonly Guid PurchaseReturn1Id = new("45000000-0000-0000-0000-000000000001");
-    private static readonly Guid PurchaseReturnItem1Id = new("46000000-0000-0000-0000-000000000001");
-
-    private static readonly Guid SupplierClaim1Id = new("55000000-0000-0000-0000-000000000001");
-    private static readonly Guid SupplierClaimItem1Id = new("56000000-0000-0000-0000-000000000001");
-
-    public static void Apply(ModelBuilder modelBuilder)
-    {
-        modelBuilder.Entity<Supplier>().HasData(
-            new Supplier { Id = Supplier1Id, Name = "Ceylon Beverages Ltd", ContactInfo = "+94 11 234 5678", PerformanceScore = 4.2m, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new Supplier { Id = Supplier2Id, Name = "Snack Foods (Pvt) Ltd", ContactInfo = "+94 11 876 5432", PerformanceScore = null, CreatedAt = new DateTime(2026, 8, 14), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseOrder>().HasData(
-            new PurchaseOrder { Id = PurchaseOrder1Id, FK_SupplierId = Supplier1Id, FK_CreatedByUserId = MasterDataSeed.Supervisor1UserId, Status = PurchaseOrderStatus.Received, CancelReason = null, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new PurchaseOrder { Id = PurchaseOrder2Id, FK_SupplierId = Supplier2Id, FK_CreatedByUserId = MasterDataSeed.Supervisor1UserId, Status = PurchaseOrderStatus.Received, CancelReason = null, CreatedAt = new DateTime(2026, 8, 14), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseOrderItem>().HasData(
-            new PurchaseOrderItem { Id = PurchaseOrderItem1Id, FK_PurchaseOrderId = PurchaseOrder1Id, FK_ItemId = MasterDataSeed.Coke500ItemId, Quantity = 200, UnitCost = 40m, ReceivedQuantity = 200, CancelledQuantity = 0, IsCancelled = false, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new PurchaseOrderItem { Id = PurchaseOrderItem2Id, FK_PurchaseOrderId = PurchaseOrder1Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 100, UnitCost = 80m, ReceivedQuantity = 98, CancelledQuantity = 0, IsCancelled = false, CreatedAt = new DateTime(2026, 8, 14), IsActive = true },
-            new PurchaseOrderItem { Id = PurchaseOrderItem3Id, FK_PurchaseOrderId = PurchaseOrder2Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 150, UnitCost = 35m, ReceivedQuantity = 150, CancelledQuantity = 0, IsCancelled = false, CreatedAt = new DateTime(2026, 8, 14), IsActive = true }
-        );
-
-        modelBuilder.Entity<GoodsReceipt>().HasData(
-            new GoodsReceipt { Id = GoodsReceipt1Id, FK_PurchaseOrderId = PurchaseOrder1Id, FK_ReceivedByUserId = MasterDataSeed.Supervisor1UserId, FK_WarehouseId = MasterDataSeed.ColomboWarehouseId, ReceivedAt = new DateTime(2026, 8, 15), CreatedAt = new DateTime(2026, 8, 15), IsActive = true }
-        );
-
-        modelBuilder.Entity<GoodsReceiptItem>().HasData(
-            new GoodsReceiptItem { Id = GoodsReceiptItem1Id, FK_GoodsReceiptId = GoodsReceipt1Id, FK_PurchaseOrderItemId = PurchaseOrderItem1Id, AcceptedQuantity = 200, RejectedQuantity = 0, CreatedAt = new DateTime(2026, 8, 15), IsActive = true },
-            new GoodsReceiptItem { Id = GoodsReceiptItem2Id, FK_GoodsReceiptId = GoodsReceipt1Id, FK_PurchaseOrderItemId = PurchaseOrderItem2Id, AcceptedQuantity = 98, RejectedQuantity = 2, CreatedAt = new DateTime(2026, 8, 15), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseReturn>().HasData(
-            new PurchaseReturn { Id = PurchaseReturn1Id, FK_PurchaseOrderId = PurchaseOrder2Id, Reason = "Damaged in transit", CreatedAt = new DateTime(2026, 8, 16), IsActive = true }
-        );
-
-        modelBuilder.Entity<PurchaseReturnItem>().HasData(
-            new PurchaseReturnItem { Id = PurchaseReturnItem1Id, FK_PurchaseReturnId = PurchaseReturn1Id, FK_ItemId = MasterDataSeed.LaysClassicItemId, Quantity = 10, CreatedAt = new DateTime(2026, 8, 16), IsActive = true }
-        );
-
-        modelBuilder.Entity<SupplierClaim>().HasData(
-            new SupplierClaim
-            {
-                Id = SupplierClaim1Id,
-                FK_PurchaseOrderId = PurchaseOrder1Id,
-                FK_GoodsReceiptId = GoodsReceipt1Id,
-                Details = "2 units of Coke 1.5L received damaged",
-                EvidenceUrl = null,
-                Status = SupplierClaimStatus.Approved,
-                ResolutionType = SupplierClaimResolutionType.Credit,
-                ResolutionAmount = 160m,
-                ResolutionNotes = "Credited against next invoice",
-                RaisedByUserId = MasterDataSeed.Supervisor1UserId,
-                ResolvedByUserId = MasterDataSeed.RegionalManager1UserId,
-                ResolvedAt = new DateTime(2026, 8, 16),
-                CreatedAt = new DateTime(2026, 8, 15),
-                IsActive = true
-            }
-        );
-
-        modelBuilder.Entity<SupplierClaimItem>().HasData(
-            new SupplierClaimItem { Id = SupplierClaimItem1Id, FK_SupplierClaimId = SupplierClaim1Id, FK_ItemId = MasterDataSeed.Coke1500ItemId, Quantity = 2m, IssueType = SupplierClaimIssueType.Damaged, CreatedAt = new DateTime(2026, 8, 15), IsActive = true }
-        );
-    }
-}

Distribution/Features/Brand/BrandDTOs.cs

@@ -1,5 +1,5 @@
 namespace Distribution.Features.Brand;
 
 public record CreateBrandRequest(string Name);
-public record UpdateBrandRequest(string Name, bool IsActive = true);
+public record UpdateBrandRequest(string Name);
 public record BrandResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);

Distribution/Features/Brand/BrandService.cs

@@ -5,16 +5,15 @@ namespace Distribution.Features.Brand;
 public class BrandService(IBrandRepository repo, IUnitOfWork uow)
 {
     public async Task<List<BrandResponse>> GetAllAsync() =>
-        // Deleted brands stay IsActive=false but remain visible showing Inactive — delete
-        // never removes the row, only marks it (same rule as Items/Stores/Categories).
         (await repo.GetAllAsync())
+            .Where(b => b.IsActive)
             .Select(b => new BrandResponse(b.Id, b.Name, b.IsActive, b.CreatedAt))
             .ToList();
 
     public async Task<BrandResponse?> GetByIdAsync(Guid id)
     {
         var brand = await repo.GetByIdAsync(id);
-        if (brand is null) return null;
+        if (brand is null || !brand.IsActive) return null;
         return new BrandResponse(brand.Id, brand.Name, brand.IsActive, brand.CreatedAt);
     }
 
@@ -30,10 +29,9 @@ public class BrandService(IBrandRepository repo, IUnitOfWork uow)
     public async Task<BrandResponse?> UpdateAsync(Guid id, UpdateBrandRequest request, CancellationToken ct = default)
     {
         var brand = await repo.GetByIdAsync(id);
-        if (brand is null) return null;
+        if (brand is null || !brand.IsActive) return null;
         if (brand.ExternalErpId.HasValue) return null;
         brand.Name = request.Name;
-        brand.IsActive = request.IsActive;
         await uow.BeginAsync(ct);
         try { repo.Update(brand); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }
@@ -42,11 +40,10 @@ public class BrandService(IBrandRepository repo, IUnitOfWork uow)
 
     public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
     {
-        // Soft-delete only — never blocked by items still referencing this brand, same rule
-        // as Categories.
         var brand = await repo.GetByIdAsync(id);
         if (brand is null || !brand.IsActive) return false;
         if (brand.ExternalErpId.HasValue) return false;
+        if (await repo.HasActiveItemsAsync(id)) return false;
         await uow.BeginAsync(ct);
         try { repo.Remove(brand); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }

Distribution/Features/Category/CategoryDTOs.cs

@@ -1,9 +1,9 @@
 namespace Distribution.Features.Category;
 
 public record CreateCategoryRequest(string Name);
-public record UpdateCategoryRequest(string Name, bool IsActive = true);
+public record UpdateCategoryRequest(string Name);
 public record CreateSubCategoryRequest(string Name);
-public record UpdateSubCategoryRequest(string Name, bool IsActive = true);
+public record UpdateSubCategoryRequest(string Name);
 
 public record SubCategoryResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);
 public record CategorySummaryResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);

Distribution/Features/Category/CategoryService.cs

@@ -4,27 +4,18 @@ namespace Distribution.Features.Category;
 
 public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepository subCategoryRepo, IUnitOfWork uow)
 {
-    public async Task<List<CategoryResponse>> GetAllAsync()
-    {
-        // Deleted categories/sub-categories stay IsActive=false but remain visible showing
-        // Inactive — delete never removes the row, only marks it (same rule as Orders/Stores/Items).
-        var categoryList = await categoryRepo.GetAllAsync();
-        var result = new List<CategoryResponse>();
-        foreach (var category in categoryList)
-        {
-            var subs = (await subCategoryRepo.GetByCategoryIdAsync(category.Id))
-                .Select(s => new SubCategoryResponse(s.Id, s.Name, s.IsActive, s.CreatedAt))
+    public async Task<List<CategorySummaryResponse>> GetAllAsync() =>
+        (await categoryRepo.GetAllAsync())
+            .Where(c => c.IsActive)
+            .Select(c => new CategorySummaryResponse(c.Id, c.Name, c.IsActive, c.CreatedAt))
             .ToList();
-            result.Add(new CategoryResponse(category.Id, category.Name, category.IsActive, category.CreatedAt, subs));
-        }
-        return result;
-    }
 
     public async Task<CategoryResponse?> GetByIdAsync(Guid id)
     {
         var category = await categoryRepo.GetByIdAsync(id);
-        if (category is null) return null;
+        if (category is null || !category.IsActive) return null;
         var subs = (await subCategoryRepo.GetByCategoryIdAsync(id))
+            .Where(s => s.IsActive)
             .Select(s => new SubCategoryResponse(s.Id, s.Name, s.IsActive, s.CreatedAt))
             .ToList();
         return new CategoryResponse(category.Id, category.Name, category.IsActive, category.CreatedAt, subs);
@@ -42,10 +33,9 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos
     public async Task<CategorySummaryResponse?> UpdateAsync(Guid id, UpdateCategoryRequest request, CancellationToken ct = default)
     {
         var category = await categoryRepo.GetByIdAsync(id);
-        if (category is null) return null;
+        if (category is null || !category.IsActive) return null;
         if (category.ExternalErpId.HasValue) return null;
         category.Name = request.Name;
-        category.IsActive = request.IsActive;
         await uow.BeginAsync(ct);
         try { categoryRepo.Update(category); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }
@@ -54,11 +44,11 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos
 
     public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
     {
-        // Soft-delete only — never blocked by child sub-categories/items, same rule as
-        // Items/Stores/Orders. The row stays visible showing Inactive.
         var category = await categoryRepo.GetByIdAsync(id);
         if (category is null || !category.IsActive) return false;
         if (category.ExternalErpId.HasValue) return false;
+        if (await categoryRepo.HasActiveSubCategoriesAsync(id)) return false;
+        if (await categoryRepo.HasActiveItemsAsync(id)) return false;
         await uow.BeginAsync(ct);
         try { categoryRepo.Remove(category); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }
@@ -79,10 +69,9 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos
     public async Task<SubCategoryResponse?> UpdateSubCategoryAsync(Guid id, UpdateSubCategoryRequest request, CancellationToken ct = default)
     {
         var sub = await subCategoryRepo.GetByIdAsync(id);
-        if (sub is null) return null;
+        if (sub is null || !sub.IsActive) return null;
         if (sub.ExternalErpId.HasValue) return null;
         sub.Name = request.Name;
-        sub.IsActive = request.IsActive;
         await uow.BeginAsync(ct);
         try { subCategoryRepo.Update(sub); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }
@@ -91,10 +80,10 @@ public class CategoryService(ICategoryRepository categoryRepo, ISubCategoryRepos
 
     public async Task<bool> DeleteSubCategoryAsync(Guid id, CancellationToken ct = default)
     {
-        // Soft-delete only — never blocked by child items, same rule as the parent category.
         var sub = await subCategoryRepo.GetByIdAsync(id);
         if (sub is null || !sub.IsActive) return false;
         if (sub.ExternalErpId.HasValue) return false;
+        if (await subCategoryRepo.HasActiveItemsAsync(id)) return false;
         await uow.BeginAsync(ct);
         try { subCategoryRepo.Remove(sub); await uow.CommitAsync(ct); }
         catch { await uow.RollbackAsync(ct); throw; }

Distribution/Features/Claims/ClaimController.cs

@@ -6,10 +6,6 @@ namespace Distribution.Features.Claims;
 [ApiController]
 public class ClaimController(ClaimService service, ICurrentUserService currentUser) : ControllerBase
 {
-    [HttpGet("api/claims")]
-    public async Task<IActionResult> GetAll() =>
-        Ok(await service.GetAllAsync());
-
     [HttpGet("api/claims/{id:guid}")]
     public async Task<IActionResult> GetById(Guid id)
     {
@@ -28,25 +24,13 @@ public class ClaimController(ClaimService service, ICurrentUserService currentUs
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
     }
 
-    [HttpPut("api/claims/{id:guid}")]
-    public async Task<IActionResult> Update(Guid id, UpdateClaimRequest request, CancellationToken ct)
-    {
-        try
-        {
-            var result = await service.UpdateAsync(id, request, ct);
-            return Ok(result);
-        }
-        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
-    }
-
     [HttpPost("api/claims/{id:guid}/settle")]
     public async Task<IActionResult> Settle(Guid id, SettleClaimRequest request, CancellationToken ct)
     {
-        var userId = currentUser.UserId ?? request.SettledByUserId;
-        if (userId is null) return BadRequest(new { error = "SettledByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
         try
         {
-            var result = await service.SettleAsync(id, request, userId.Value, ct);
+            var result = await service.SettleAsync(id, request, userId, ct);
             return Ok(result);
         }
         catch (KeyNotFoundException) { return NotFound(); }

Distribution/Features/Claims/ClaimDTOs.cs

@@ -4,14 +4,7 @@ namespace Distribution.Features.Claims;
 
 public record CreateClaimRequest(Guid AgencyUserId, string Details);
 
-// Only editable while the claim is still Open — once settled, the settlement amount is a
-// financial record and the claim details it was settled against should not silently change.
-public record UpdateClaimRequest(Guid AgencyUserId, string Details);
-
-public record SettleClaimRequest(
-    decimal SettlementAmount,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? SettledByUserId = null);
+public record SettleClaimRequest(decimal SettlementAmount);
 
 public record ClaimResponse(
     Guid Id,

Distribution/Features/Claims/ClaimRepository.cs

@@ -8,12 +8,6 @@ public class ClaimRepository(AppDBContext context) : IClaimRepository
     public async Task<Models.Claim?> GetByIdAsync(Guid id) =>
         await context.Claims.FirstOrDefaultAsync(c => c.Id == id);
 
-    public async Task<List<Models.Claim>> GetAllAsync() =>
-        await context.Claims
-            .Where(c => c.IsActive)
-            .OrderByDescending(c => c.CreatedAt)
-            .ToListAsync();
-
     public async Task<List<Models.Claim>> GetByAgencyUserIdAsync(Guid agencyUserId) =>
         await context.Claims
             .Where(c => c.FK_AgencyUserId == agencyUserId && c.IsActive)

Distribution/Features/Claims/ClaimService.cs

@@ -15,9 +15,6 @@ public class ClaimService(IClaimRepository repo, IUnitOfWork uow)
         return Map(c);
     }
 
-    public async Task<List<ClaimResponse>> GetAllAsync() =>
-        (await repo.GetAllAsync()).Select(Map).ToList();
-
     public async Task<List<ClaimResponse>> GetByAgencyUserIdAsync(Guid agencyUserId) =>
         (await repo.GetByAgencyUserIdAsync(agencyUserId)).Select(Map).ToList();
 
@@ -43,26 +40,6 @@ public class ClaimService(IClaimRepository repo, IUnitOfWork uow)
         return Map(claim);
     }
 
-    public async Task<ClaimResponse> UpdateAsync(Guid id, UpdateClaimRequest request, CancellationToken ct = default)
-    {
-        var claim = await repo.GetByIdAsync(id);
-        if (claim is null || !claim.IsActive)
-            throw new InvalidOperationException("Claim not found.");
-        if (claim.Status == ClaimStatus.Settled)
-            throw new InvalidOperationException("Cannot edit a claim that has already been settled.");
-        if (string.IsNullOrWhiteSpace(request.Details))
-            throw new InvalidOperationException("Claim details are required.");
-
-        claim.FK_AgencyUserId = request.AgencyUserId;
-        claim.Details = request.Details;
-
-        await uow.BeginAsync(ct);
-        try { repo.Update(claim); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
-
-        return Map(claim);
-    }
-
     public async Task<ClaimResponse> SettleAsync(Guid id, SettleClaimRequest request, Guid approverId, CancellationToken ct = default)
     {
         var claim = await repo.GetByIdAsync(id);

Distribution/Features/Claims/IClaimRepository.cs

@@ -3,7 +3,6 @@ namespace Distribution.Features.Claims;
 public interface IClaimRepository
 {
     Task<Models.Claim?> GetByIdAsync(Guid id);
-    Task<List<Models.Claim>> GetAllAsync();
     Task<List<Models.Claim>> GetByAgencyUserIdAsync(Guid agencyUserId);
     Task AddAsync(Models.Claim entity);
     void Update(Models.Claim entity);

Distribution/Features/DeliveryRide/DeliveryTaskService.cs

@@ -159,15 +159,13 @@ public class DeliveryTaskService(
         {
             foreach (var item in task.Order.OrderItems.Where(i => i.QuantityFulfilled > 0))
             {
-                var vehicleBalance = await stockRepo.GetBalanceAsync(item.FK_ItemId, vehicleId);
-                var availableQuantity = vehicleBalance?.Quantity ?? 0;
-                var itemName = item.Item?.Name ?? item.FK_ItemId.ToString();
+                var vehicleBalance = await stockRepo.GetBalanceAsync(item.FK_ItemId, vehicleId)
+                    ?? throw new InvalidOperationException($"No vehicle stock found for item {item.FK_ItemId}");
 
-                if (availableQuantity < item.QuantityFulfilled)
-                    throw new InvalidOperationException(
-                        $"Insufficient vehicle stock for item '{itemName}': available {availableQuantity}, required {item.QuantityFulfilled}");
+                if (vehicleBalance.Quantity < item.QuantityFulfilled)
+                    throw new InvalidOperationException($"Insufficient vehicle stock for item {item.FK_ItemId}");
 
-                vehicleBalance!.Quantity -= item.QuantityFulfilled;
+                vehicleBalance.Quantity -= item.QuantityFulfilled;
                 vehicleBalance.UpdatedAt = DateTime.Now;
                 stockRepo.UpdateBalance(vehicleBalance);
 
@@ -176,8 +174,6 @@ public class DeliveryTaskService(
                     FK_ItemId = item.FK_ItemId,
                     FromLocationId = vehicleId,
                     FromLocationType = LocationType.Vehicle,
-                    ToLocationId = StockService.ExternalLocationId,
-                    ToLocationType = LocationType.External,
                     Quantity = item.QuantityFulfilled,
                     Type = MovementType.Sale,
                     ReferenceId = task.FK_OrderId

Distribution/Features/DriverComplianceConfig/DriverComplianceConfigDTOs.cs

@@ -1,12 +0,0 @@
-namespace Distribution.Features.DriverComplianceConfig;
-
-public record DriverComplianceConfigResponse(
-    Guid Id,
-    bool EnforceLicenseExpiry,
-    bool EnforceMedicalClearance,
-    DateTime UpdatedAt,
-    Guid UpdatedBy);
-
-public record UpdateDriverComplianceConfigRequest(
-    bool EnforceLicenseExpiry,
-    bool EnforceMedicalClearance);

Distribution/Features/DriverComplianceConfig/DriverComplianceConfigRepository.cs

@@ -1,16 +0,0 @@
-using Distribution.Data;
-using Microsoft.EntityFrameworkCore;
-
-namespace Distribution.Features.DriverComplianceConfig;
-
-public class DriverComplianceConfigRepository(AppDBContext context) : IDriverComplianceConfigRepository
-{
-    public async Task<Models.DriverComplianceConfig?> GetAsync() =>
-        await context.DriverComplianceConfigs.FirstOrDefaultAsync();
-
-    public async Task AddAsync(Models.DriverComplianceConfig config) =>
-        await context.DriverComplianceConfigs.AddAsync(config);
-
-    public void Update(Models.DriverComplianceConfig config) =>
-        context.DriverComplianceConfigs.Update(config);
-}

Distribution/Features/DriverComplianceConfig/DriverComplianceConfigService.cs

@@ -1,62 +0,0 @@
-using Distribution.Infra.UoW;
-
-namespace Distribution.Features.DriverComplianceConfig;
-
-public class DriverComplianceConfigService(IDriverComplianceConfigRepository repo, IUnitOfWork uow)
-{
-    public async Task<DriverComplianceConfigResponse?> GetAsync()
-    {
-        var config = await repo.GetAsync();
-        return config is null
-            ? null
-            : new DriverComplianceConfigResponse(
-                config.Id,
-                config.EnforceLicenseExpiry,
-                config.EnforceMedicalClearance,
-                config.UpdatedAt,
-                config.UpdatedBy);
-    }
-
-    public async Task<DriverComplianceConfigResponse> UpsertAsync(UpdateDriverComplianceConfigRequest request, Guid updatedBy, CancellationToken ct = default)
-    {
-        var config = await repo.GetAsync();
-
-        await uow.BeginAsync(ct);
-        try
-        {
-            if (config is null)
-            {
-                config = new global::Distribution.Models.DriverComplianceConfig
-                {
-                    EnforceLicenseExpiry = request.EnforceLicenseExpiry,
-                    EnforceMedicalClearance = request.EnforceMedicalClearance,
-                    UpdatedBy = updatedBy,
-                    UpdatedAt = DateTime.Now
-                };
-                await repo.AddAsync(config);
-            }
-            else
-            {
-                config.EnforceLicenseExpiry = request.EnforceLicenseExpiry;
-                config.EnforceMedicalClearance = request.EnforceMedicalClearance;
-                config.UpdatedBy = updatedBy;
-                config.UpdatedAt = DateTime.Now;
-                repo.Update(config);
-            }
-
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-
-        return new DriverComplianceConfigResponse(
-            config.Id,
-            config.EnforceLicenseExpiry,
-            config.EnforceMedicalClearance,
-            config.UpdatedAt,
-            config.UpdatedBy);
-    }
-}

Distribution/Features/DriverComplianceConfig/IDriverComplianceConfigRepository.cs

@@ -1,8 +0,0 @@
-namespace Distribution.Features.DriverComplianceConfig;
-
-public interface IDriverComplianceConfigRepository
-{
-    Task<Models.DriverComplianceConfig?> GetAsync();
-    Task AddAsync(Models.DriverComplianceConfig config);
-    void Update(Models.DriverComplianceConfig config);
-}

Distribution/Features/DriverProfile/DriverProfileController.cs

@@ -1,4 +1,3 @@
-using Distribution.Features.DriverComplianceConfig;
 using Distribution.Infra.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -8,7 +7,6 @@ namespace Distribution.Features.DriverProfile;
 [Route("api/driver-profiles")]
 public class DriverProfileController(
     DriverProfileService service,
-    DriverComplianceConfigService complianceService,
     ICurrentUserService currentUser) : ControllerBase
 {
     [HttpGet]
@@ -60,7 +58,7 @@ public class DriverProfileController(
     [HttpGet("compliance")]
     public async Task<IActionResult> GetCompliance()
     {
-        var result = await complianceService.GetAsync();
+        var result = await service.GetComplianceConfigAsync();
         return result is null ? NoContent() : Ok(result);
     }
 
@@ -68,7 +66,7 @@ public class DriverProfileController(
     public async Task<IActionResult> UpsertCompliance(UpdateDriverComplianceConfigRequest request, CancellationToken ct)
     {
         var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
-        var result = await complianceService.UpsertAsync(request, userId, ct);
+        var result = await service.UpsertComplianceConfigAsync(request, userId, ct);
         return Ok(result);
     }
 }

Distribution/Features/DriverProfile/DriverProfileDTOs.cs

@@ -20,3 +20,14 @@ public record UpdateDriverProfileRequest(
     string LicenseNumber,
     DateTime LicenseExpiry,
     DateTime MedicalClearanceExpiry);
+
+public record DriverComplianceConfigResponse(
+    Guid Id,
+    bool EnforceLicenseExpiry,
+    bool EnforceMedicalClearance,
+    DateTime UpdatedAt,
+    Guid UpdatedBy);
+
+public record UpdateDriverComplianceConfigRequest(
+    bool EnforceLicenseExpiry,
+    bool EnforceMedicalClearance);

Distribution/Features/DriverProfile/DriverProfileRepository.cs

@@ -37,4 +37,13 @@ public class DriverProfileRepository(AppDBContext context) : IDriverProfileRepos
         profile.IsActive = false;
         context.DriverProfiles.Update(profile);
     }
+
+    public async Task<global::Distribution.Models.DriverComplianceConfig?> GetComplianceConfigAsync() =>
+        await context.DriverComplianceConfigs.FirstOrDefaultAsync();
+
+    public async Task AddComplianceConfigAsync(global::Distribution.Models.DriverComplianceConfig config) =>
+        await context.DriverComplianceConfigs.AddAsync(config);
+
+    public void UpdateComplianceConfig(global::Distribution.Models.DriverComplianceConfig config) =>
+        context.DriverComplianceConfigs.Update(config);
 }

Distribution/Features/DriverProfile/DriverProfileService.cs

@@ -98,6 +98,56 @@ public class DriverProfileService(IDriverProfileRepository repo, IUnitOfWork uow
         return true;
     }
 
+    public async Task<DriverComplianceConfigResponse?> GetComplianceConfigAsync()
+    {
+        var config = await repo.GetComplianceConfigAsync();
+        return config is null ? null
+            : new DriverComplianceConfigResponse(
+                config.Id, config.EnforceLicenseExpiry, config.EnforceMedicalClearance,
+                config.UpdatedAt, config.UpdatedBy);
+    }
+
+    public async Task<DriverComplianceConfigResponse> UpsertComplianceConfigAsync(
+        UpdateDriverComplianceConfigRequest request, Guid updatedBy, CancellationToken ct = default)
+    {
+        var config = await repo.GetComplianceConfigAsync();
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            if (config is null)
+            {
+                config = new global::Distribution.Models.DriverComplianceConfig
+                {
+                    EnforceLicenseExpiry = request.EnforceLicenseExpiry,
+                    EnforceMedicalClearance = request.EnforceMedicalClearance,
+                    UpdatedBy = updatedBy,
+                    UpdatedAt = DateTime.Now
+                };
+                await repo.AddComplianceConfigAsync(config);
+            }
+            else
+            {
+                config.EnforceLicenseExpiry = request.EnforceLicenseExpiry;
+                config.EnforceMedicalClearance = request.EnforceMedicalClearance;
+                config.UpdatedBy = updatedBy;
+                config.UpdatedAt = DateTime.Now;
+                repo.UpdateComplianceConfig(config);
+            }
+
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return new DriverComplianceConfigResponse(
+            config.Id, config.EnforceLicenseExpiry, config.EnforceMedicalClearance,
+            config.UpdatedAt, config.UpdatedBy);
+    }
+
     private static DriverProfileResponse ToResponse(global::Distribution.Models.DriverProfile p) =>
         new(p.Id, p.FK_UserId, p.User?.FullName ?? string.Empty,
             p.LicenseNumber, p.LicenseExpiry, p.MedicalClearanceExpiry,

Distribution/Features/DriverProfile/IDriverProfileRepository.cs

@@ -9,4 +9,8 @@ public interface IDriverProfileRepository
     Task AddAsync(global::Distribution.Models.DriverProfile profile);
     void Update(global::Distribution.Models.DriverProfile profile);
     void Deactivate(global::Distribution.Models.DriverProfile profile);
+
+    Task<global::Distribution.Models.DriverComplianceConfig?> GetComplianceConfigAsync();
+    Task AddComplianceConfigAsync(global::Distribution.Models.DriverComplianceConfig config);
+    void UpdateComplianceConfig(global::Distribution.Models.DriverComplianceConfig config);
 }

Distribution/Features/Grn/GrnController.cs

@@ -26,14 +26,11 @@ public class GrnController(GrnService service, ICurrentUserService currentUser)
     [HttpPost("api/goods-receipts")]
     public async Task<IActionResult> CreateFlat(CreateFlatGrnRequest request, CancellationToken ct)
     {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.ReceivedByUserId;
-        if (userId is null) return BadRequest(new { error = "ReceivedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
         try
         {
             var inner = new CreateGrnRequest(request.WarehouseId, request.Items);
-            var result = await service.CreateAsync(request.PurchaseOrderId, inner, userId.Value, ct);
+            var result = await service.CreateAsync(request.PurchaseOrderId, inner, userId, ct);
             return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
@@ -46,11 +43,10 @@ public class GrnController(GrnService service, ICurrentUserService currentUser)
     [HttpPost("api/purchase-orders/{id:guid}/goods-receipts")]
     public async Task<IActionResult> Create(Guid id, CreateGrnRequest request, CancellationToken ct)
     {
-        var userId = currentUser.UserId ?? request.ReceivedByUserId;
-        if (userId is null) return BadRequest(new { error = "ReceivedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
         try
         {
-            var result = await service.CreateAsync(id, request, userId.Value, ct);
+            var result = await service.CreateAsync(id, request, userId, ct);
             return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }

Distribution/Features/Grn/GrnDTOs.cs

@@ -2,18 +2,9 @@ namespace Distribution.Features.Grn;
 
 public record GrnItemRequest(Guid PurchaseOrderItemId, int AcceptedQuantity, int RejectedQuantity);
 
-public record CreateGrnRequest(
-    Guid WarehouseId,
-    List<GrnItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? ReceivedByUserId = null);
+public record CreateGrnRequest(Guid WarehouseId, List<GrnItemRequest> Items);
 
-public record CreateFlatGrnRequest(
-    Guid PurchaseOrderId,
-    Guid WarehouseId,
-    List<GrnItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? ReceivedByUserId = null);
+public record CreateFlatGrnRequest(Guid PurchaseOrderId, Guid WarehouseId, List<GrnItemRequest> Items);
 
 public record GrnItemResponse(
     Guid Id,

Distribution/Features/Grn/GrnService.cs

@@ -124,8 +124,6 @@ public class GrnService(
                 await stockRepo.AddMovementAsync(new StockMovement
                 {
                     FK_ItemId = poItem.FK_ItemId,
-                    FromLocationId = StockService.ExternalLocationId,
-                    FromLocationType = LocationType.External,
                     ToLocationId = request.WarehouseId,
                     ToLocationType = LocationType.Warehouse,
                     Quantity = line.AcceptedQuantity,

Distribution/Features/Item/ItemDTOs.cs

@@ -20,8 +20,7 @@ public record UpdateItemRequest(
     Guid? SubCategoryId,
     Guid? BrandId,
     Guid BaseUomId,
-    decimal? SalePrice,
-    bool IsActive = true);
+    decimal? SalePrice);
 
 public record ReplaceConversionsRequest(List<UomConversionRequest> Conversions);
 

Distribution/Features/Item/ItemRepository.cs

@@ -20,14 +20,12 @@ public class ItemRepository(AppDBContext context) : IItemRepository
 
     public async Task<List<Models.Item>> GetAllAsync(Guid? categoryId = null, Guid? subCategoryId = null, Guid? brandId = null)
     {
-        // Deleted items stay IsActive=false but remain visible with an Inactive status —
-        // Delete never removes the row, only marks it (same rule as Orders/Stores).
         var query = context.Items
             .Include(i => i.Category)
             .Include(i => i.SubCategory)
             .Include(i => i.Brand)
             .Include(i => i.BaseUom)
-            .AsQueryable();
+            .Where(i => i.IsActive);
 
         if (categoryId.HasValue) query = query.Where(i => i.FK_CategoryId == categoryId);
         if (subCategoryId.HasValue) query = query.Where(i => i.FK_SubCategoryId == subCategoryId);

Distribution/Features/Item/ItemService.cs

@@ -32,7 +32,7 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow)
     public async Task<ItemDetailResponse?> GetByIdAsync(Guid id)
     {
         var item = await repo.GetByIdAsync(id);
-        if (item is null) return null;
+        if (item is null || !item.IsActive) return null;
         return MapDetail(item);
     }
 
@@ -74,7 +74,7 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow)
     public async Task<ItemDetailResponse?> UpdateAsync(Guid id, UpdateItemRequest request, CancellationToken ct = default)
     {
         var item = await repo.GetByIdAsync(id);
-        if (item is null) return null;
+        if (item is null || !item.IsActive) return null;
         if (item.SyncSource == Models.SyncSource.Erp) return null;
 
         item.Name = request.Name;
@@ -84,7 +84,6 @@ public class ItemService(IItemRepository repo, IUnitOfWork uow)
         item.FK_BrandId = request.BrandId;
         item.FK_BaseUomId = request.BaseUomId;
         item.SalePrice = request.SalePrice;
-        item.IsActive = request.IsActive;
 
         await uow.BeginAsync(ct);
         try { repo.Update(item); await uow.CommitAsync(ct); }

Distribution/Features/Order/OrderController.cs

@@ -21,7 +21,7 @@ public class OrderController(OrderService service) : ControllerBase
     public async Task<IActionResult> GetByStore(Guid storeId)
     {
         var result = await service.GetByStoreIdAsync(storeId);
-        return result is null ? StatusCode(StatusCodes.Status403Forbidden) : Ok(result);
+        return result is null ? Forbid() : Ok(result);
     }
 
     [HttpPost]
@@ -30,7 +30,7 @@ public class OrderController(OrderService service) : ControllerBase
         try
         {
             var result = await service.CreateAsync(request, ct);
-            return result is null ? StatusCode(StatusCodes.Status403Forbidden) : CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
+            return result is null ? Forbid() : CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
         catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
     }

Distribution/Features/Order/OrderService.cs

@@ -37,9 +37,7 @@ public class OrderService(
 
     public async Task<List<OrderResponse>> GetAllAsync()
     {
-        // Deleted orders stay IsActive=false but remain visible with a Cancelled status —
-        // Delete never removes the row from the list, only marks it cancelled.
-        var orders = (await repo.GetAllAsync()).ToList();
+        var orders = (await repo.GetAllAsync()).Where(o => o.IsActive).ToList();
         if (!HasGlobalScope && currentUser.UserId is not null)
         {
             var accessibleStoreIds = (await scopeAccess.GetAccessibleStoreIdsAsync(currentUser.UserId.Value)).ToHashSet();
@@ -91,10 +89,9 @@ public class OrderService(
 
     public async Task<OrderResponse?> UpdateAsync(Guid id, UpdateOrderRequest request, CancellationToken ct = default)
     {
-        // TEMPORARY: see DeleteAsync/SaleService — store-scope enforcement depends on the broken
-        // auth middleware (testbug.md #28) and would reject every update. Skipped for now.
         var order = await repo.GetByIdAsync(id);
         if (order is null || !order.IsActive) return null;
+        if (!await HasStoreScopeAsync(order.FK_StoreId)) return null;
 
         var sale = await saleRepo.GetByIdAsync(order.FK_SaleId)
             ?? throw new InvalidOperationException("Sale not found for this order");
@@ -129,10 +126,9 @@ public class OrderService(
 
     public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
     {
-        // TEMPORARY: see SaleService — store-scope enforcement depends on the broken auth
-        // middleware (testbug.md #28) and would reject every delete. Skipped for now.
         var order = await repo.GetByIdAsync(id);
         if (order is null || !order.IsActive) return false;
+        if (!await HasStoreScopeAsync(order.FK_StoreId)) return false;
 
         var sale = await saleRepo.GetByIdAsync(order.FK_SaleId);
 

Distribution/Features/Payment/FlatPaymentController.cs

@@ -29,7 +29,7 @@ public class FlatPaymentController(PaymentService service) : ControllerBase
     {
         try
         {
-            var inner = new CreatePaymentRequest(request.Amount, request.Method, request.CollectedByUserId);
+            var inner = new CreatePaymentRequest(request.Amount, request.Method);
             var result = await service.CreateAsync(request.SaleId, inner, ct);
             return result is null ? NotFound(new { error = "Sale not found or access denied" }) : Ok(result);
         }

Distribution/Features/Payment/PaymentDTOs.cs

@@ -2,17 +2,9 @@ using Distribution.Models;
 
 namespace Distribution.Features.Payment;
 
-public record CreatePaymentRequest(
-    decimal Amount,
-    PaymentMethod Method,
-    // TEMPORARY: auth middleware doesn't resolve a logged-in user yet — see testbug.md #28.
-    Guid? CollectedByUserId = null);
+public record CreatePaymentRequest(decimal Amount, PaymentMethod Method);
 
-public record CreateFlatPaymentRequest(
-    Guid SaleId,
-    decimal Amount,
-    PaymentMethod Method,
-    Guid? CollectedByUserId = null);
+public record CreateFlatPaymentRequest(Guid SaleId, decimal Amount, PaymentMethod Method);
 
 public record PaymentResponse(
     Guid Id,

Distribution/Features/Payment/PaymentService.cs

@@ -44,10 +44,7 @@ public class PaymentService(
         if (sale.Status == SaleStatus.Cancelled)
             throw new InvalidOperationException("Cannot record a payment against a cancelled sale");
 
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.CollectedByUserId
-            ?? throw new InvalidOperationException("CollectedByUserId is required while auth is unavailable");
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
 
         var payment = new Models.Payment
         {

Distribution/Features/PriceList/PriceListController.cs

@@ -10,13 +10,6 @@ public class PriceListController(PriceListService service) : ControllerBase
     public async Task<IActionResult> GetAll([FromQuery] Guid? regionId) =>
         Ok(await service.GetAllAsync(regionId));
 
-    [HttpGet("resolve")]
-    public async Task<IActionResult> Resolve([FromQuery] Guid itemId, [FromQuery] Guid storeId, [FromQuery] DateTime saleDate)
-    {
-        var result = await service.ResolveByStoreAsync(itemId, storeId, saleDate);
-        return result is null ? NotFound() : Ok(result);
-    }
-
     [HttpGet("{id:guid}")]
     public async Task<IActionResult> GetById(Guid id)
     {
@@ -68,15 +61,8 @@ public class PriceListController(PriceListService service) : ControllerBase
 
     [HttpDelete("{id:guid}/items/{sku}")]
     public async Task<IActionResult> RemoveItem(Guid id, string sku, CancellationToken ct)
-    {
-        try
     {
         var result = await service.RemoveItemAsync(id, sku, ct);
         return result is null ? NotFound() : Ok(result);
     }
-        catch (InvalidOperationException ex)
-        {
-            return Conflict(new { error = ex.Message });
-        }
-    }
 }

Distribution/Features/PriceList/PriceListDTOs.cs

@@ -2,30 +2,16 @@ namespace Distribution.Features.PriceList;
 
 public record CreatePriceListRequest(string Name, Guid? RegionId, DateTime EffectiveFrom, DateTime EffectiveTo);
 
-public record UpdatePriceListRequest(string Name, Guid? RegionId, DateTime EffectiveFrom, DateTime EffectiveTo, bool IsActive);
+public record UpdatePriceListRequest(string Name, Guid? RegionId, DateTime EffectiveFrom, DateTime EffectiveTo);
 
-public record UpsertPriceListItemRequest(
-    decimal Price,
-    decimal? MinPrice = null,
-    decimal? RetailPrice = null,
-    decimal? AgencyMarginPercent = null);
+public record UpsertPriceListItemRequest(decimal Price, decimal? MinPrice = null);
 
-public record PriceListItemResponse(
-    Guid Id,
-    Guid ItemId,
-    string Sku,
-    string ItemName,
-    decimal Price,
-    decimal? MinPrice,
-    decimal? RetailPrice,
-    decimal? AgencyMarginPercent);
+public record PriceListItemResponse(Guid Id, Guid ItemId, string Sku, string ItemName, decimal Price, decimal? MinPrice);
 
 /// <summary>
-/// A resolved price with its negotiable floor, plus the informational retail price and agency
-/// margin when the resolution came from an actual PriceListItem (both null on the Item.SalePrice
-/// fallback, since neither is tracked at the item level).
+/// A resolved price with its negotiable floor. MinPrice null = no negotiation, Price is fixed.
 /// </summary>
-public record PriceResolution(decimal Price, decimal? MinPrice, decimal? RetailPrice, decimal? AgencyMarginPercent);
+public record PriceResolution(decimal Price, decimal? MinPrice);
 
 public record PriceListResponse(
     Guid Id,

Distribution/Features/PriceList/PriceListRepository.cs

@@ -13,7 +13,9 @@ public class PriceListRepository(AppDBContext context) : IPriceListRepository
 
     public async Task<List<Models.PriceList>> GetAllAsync(Guid? regionId = null)
     {
-        var query = context.PriceLists.Include(pl => pl.Region).AsQueryable();
+        var query = context.PriceLists
+            .Include(pl => pl.Region)
+            .Where(pl => pl.IsActive);
 
         if (regionId.HasValue) query = query.Where(pl => pl.FK_RegionId == regionId);
 

Distribution/Features/PriceList/PriceListService.cs

@@ -1,13 +1,12 @@
 using Distribution.Features.Item;
-using Distribution.Features.Store;
 using Distribution.Infra.UoW;
 
 namespace Distribution.Features.PriceList;
 
-public class PriceListService(IPriceListRepository repo, IItemRepository itemRepo, IStoreRepository storeRepo, IUnitOfWork uow)
+public class PriceListService(IPriceListRepository repo, IItemRepository itemRepo, IUnitOfWork uow)
 {
     private static PriceListItemResponse MapItem(Models.PriceListItem i) =>
-        new(i.Id, i.FK_ItemId, i.Item.Sku, i.Item.Name, i.Price, i.MinPrice, i.RetailPrice, i.AgencyMarginPercent);
+        new(i.Id, i.FK_ItemId, i.Item.Sku, i.Item.Name, i.Price, i.MinPrice);
 
     private static PriceListResponse MapDetail(Models.PriceList pl) =>
         new(pl.Id, pl.Name, pl.FK_RegionId, pl.Region?.Name,
@@ -25,7 +24,7 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
     public async Task<PriceListResponse?> GetByIdAsync(Guid id)
     {
         var pl = await repo.GetByIdAsync(id);
-        if (pl is null) return null;
+        if (pl is null || !pl.IsActive) return null;
         return MapDetail(pl);
     }
 
@@ -49,7 +48,7 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
     public async Task<PriceListResponse?> UpdateAsync(Guid id, UpdatePriceListRequest request, CancellationToken ct = default)
     {
         var priceList = await repo.GetByIdAsync(id);
-        if (priceList is null) return null;
+        if (priceList is null || !priceList.IsActive) return null;
 
         foreach (var item in priceList.Items.Where(i => i.IsActive))
         {
@@ -62,7 +61,6 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
         priceList.FK_RegionId = request.RegionId;
         priceList.EffectiveFrom = request.EffectiveFrom;
         priceList.EffectiveTo = request.EffectiveTo;
-        priceList.IsActive = request.IsActive;
 
         await uow.BeginAsync(ct);
         try { repo.Update(priceList); await uow.CommitAsync(ct); }
@@ -92,9 +90,7 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
     public async Task<PriceListResponse?> UpsertItemAsync(Guid priceListId, string sku, UpsertPriceListItemRequest request, CancellationToken ct = default)
     {
         var priceList = await repo.GetByIdAsync(priceListId);
-        if (priceList is null) return null;
-        if (!priceList.IsActive)
-            throw new InvalidOperationException("Cannot price items on an inactive price list. Reactivate it first.");
+        if (priceList is null || !priceList.IsActive) return null;
 
         var item = await itemRepo.GetBySkuAsync(sku);
         if (item is null) return null;
@@ -103,13 +99,6 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
             throw new InvalidOperationException(
                 $"MinPrice ({request.MinPrice}) cannot exceed Price ({request.Price}) for item '{sku}'.");
 
-        if (request.RetailPrice.HasValue && request.RetailPrice.Value < request.Price)
-            throw new InvalidOperationException(
-                $"RetailPrice ({request.RetailPrice}) cannot be less than Price ({request.Price}) for item '{sku}' — the store would sell at a loss.");
-
-        if (request.AgencyMarginPercent is < 0 or > 100)
-            throw new InvalidOperationException("AgencyMarginPercent must be between 0 and 100.");
-
         if (await repo.HasOverlapAsync(item.Id, priceList.FK_RegionId, priceList.EffectiveFrom, priceList.EffectiveTo, priceListId))
             throw new InvalidOperationException(
                 $"Overlapping price list already exists for item '{sku}' in the same region for this date range.");
@@ -126,17 +115,13 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
                     FK_PriceListId = priceListId,
                     FK_ItemId = item.Id,
                     Price = request.Price,
-                    MinPrice = request.MinPrice,
-                    RetailPrice = request.RetailPrice,
-                    AgencyMarginPercent = request.AgencyMarginPercent
+                    MinPrice = request.MinPrice
                 });
             }
             else
             {
                 existing.Price = request.Price;
                 existing.MinPrice = request.MinPrice;
-                existing.RetailPrice = request.RetailPrice;
-                existing.AgencyMarginPercent = request.AgencyMarginPercent;
                 repo.UpdateItem(existing);
             }
             await uow.CommitAsync(ct);
@@ -149,9 +134,7 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
     public async Task<PriceListResponse?> RemoveItemAsync(Guid priceListId, string sku, CancellationToken ct = default)
     {
         var priceList = await repo.GetByIdAsync(priceListId);
-        if (priceList is null) return null;
-        if (!priceList.IsActive)
-            throw new InvalidOperationException("Cannot remove items from an inactive price list. Reactivate it first.");
+        if (priceList is null || !priceList.IsActive) return null;
 
         var item = await itemRepo.GetBySkuAsync(sku);
         if (item is null) return null;
@@ -177,36 +160,12 @@ public class PriceListService(IPriceListRepository repo, IItemRepository itemRep
         if (regionId.HasValue)
         {
             var regionMatches = await repo.GetActiveItemsAsync(itemId, regionId, orderDate);
-            if (regionMatches.Count > 0)
-            {
-                var m = regionMatches[0];
-                return new PriceResolution(m.Price, m.MinPrice, m.RetailPrice, m.AgencyMarginPercent);
-            }
+            if (regionMatches.Count > 0) return new PriceResolution(regionMatches[0].Price, regionMatches[0].MinPrice);
         }
 
         var globalMatches = await repo.GetActiveItemsAsync(itemId, null, orderDate);
-        if (globalMatches.Count > 0)
-        {
-            var m = globalMatches[0];
-            return new PriceResolution(m.Price, m.MinPrice, m.RetailPrice, m.AgencyMarginPercent);
-        }
+        if (globalMatches.Count > 0) return new PriceResolution(globalMatches[0].Price, globalMatches[0].MinPrice);
 
-        return itemSalePrice.HasValue ? new PriceResolution(itemSalePrice.Value, null, null, null) : null;
-    }
-
-    /// <summary>
-    /// Same resolution `SaleService.ResolveUnitPriceAsync` uses internally, exposed read-only so
-    /// the frontend can show the real price (region/date-scoped price list, else Item.SalePrice)
-    /// before a sale is ever submitted, instead of guessing from the flat catalogue price.
-    /// </summary>
-    public async Task<PriceResolution?> ResolveByStoreAsync(Guid itemId, Guid storeId, DateTime saleDate)
-    {
-        var item = await itemRepo.GetByIdAsync(itemId);
-        if (item is null) return null;
-
-        var store = await storeRepo.GetByIdWithRegionAsync(storeId);
-        if (store is null) return null;
-
-        return await ResolvePriceAsync(itemId, store.Route?.FK_RegionId, item.SalePrice, saleDate);
+        return itemSalePrice.HasValue ? new PriceResolution(itemSalePrice.Value, null) : null;
     }
 }

Distribution/Features/PurchaseOrder/PoController.cs

@@ -22,13 +22,10 @@ public class PoController(PoService service, ICurrentUserService currentUser) :
     [HttpPost]
     public async Task<IActionResult> Create(CreatePoRequest request, CancellationToken ct)
     {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.CreatedByUserId;
-        if (userId is null) return BadRequest(new { error = "CreatedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
         try
         {
-            var result = await service.CreateAsync(request, userId.Value, ct);
+            var result = await service.CreateAsync(request, userId, ct);
             return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }

Distribution/Features/PurchaseOrder/PoDTOs.cs

@@ -4,11 +4,7 @@ namespace Distribution.Features.Po;
 
 public record PoItemRequest(Guid ItemId, int Quantity, decimal UnitCost);
 
-public record CreatePoRequest(
-    Guid SupplierId,
-    List<PoItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? CreatedByUserId = null);
+public record CreatePoRequest(Guid SupplierId, List<PoItemRequest> Items);
 
 /// <summary>
 /// Update line: PurchaseOrderItemId set = update an existing unreceived line (Quantity/UnitCost),

Distribution/Features/PurchaseReturn/PurchaseReturnController.cs

@@ -20,13 +20,10 @@ public class PurchaseReturnController(PurchaseReturnService service, ICurrentUse
     [HttpPost("api/purchase-orders/{id:guid}/returns")]
     public async Task<IActionResult> Create(Guid id, CreatePurchaseReturnRequest request, CancellationToken ct)
     {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.CreatedByUserId;
-        if (userId is null) return BadRequest(new { error = "CreatedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
         try
         {
-            var result = await service.CreateAsync(id, request, userId.Value, ct);
+            var result = await service.CreateAsync(id, request, userId, ct);
             return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }

Distribution/Features/PurchaseReturn/PurchaseReturnDTOs.cs

@@ -2,11 +2,7 @@ namespace Distribution.Features.PurchaseReturn;
 
 public record PurchaseReturnItemRequest(Guid ItemId, int Quantity);
 
-public record CreatePurchaseReturnRequest(
-    string Reason,
-    List<PurchaseReturnItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? CreatedByUserId = null);
+public record CreatePurchaseReturnRequest(string Reason, List<PurchaseReturnItemRequest> Items);
 
 public record PurchaseReturnItemResponse(Guid Id, Guid ItemId, string Sku, string ItemName, int Quantity);
 

Distribution/Features/PurchaseReturn/PurchaseReturnService.cs

@@ -104,8 +104,6 @@ public class PurchaseReturnService(
                     FK_ItemId = line.FK_ItemId,
                     FromLocationId = warehouseId,
                     FromLocationType = LocationType.Warehouse,
-                    ToLocationId = StockService.ExternalLocationId,
-                    ToLocationType = LocationType.External,
                     Quantity = line.Quantity,
                     Type = MovementType.PurchaseReturn,
                     ReasonCode = request.Reason,

Distribution/Features/Reconciliation/IReconciliationRepository.cs

@@ -0,0 +1,21 @@
+using Distribution.Models;
+
+namespace Distribution.Features.Reconciliation;
+
+public interface IReconciliationRepository
+{
+    Task AddItemCountAsync(RideItemCount count);
+    Task<List<RideItemCount>> GetItemCountsByRideAsync(Guid rideId);
+
+    Task AddVarianceAsync(RideVariance variance);
+    Task<List<RideVariance>> GetVariancesByRideAsync(Guid rideId);
+    Task<RideVariance?> GetVarianceByIdAsync(Guid id);
+    void UpdateVariance(RideVariance variance);
+    Task<bool> HasPendingVariancesAsync(Guid rideId);
+
+    Task AddCloseSummaryAsync(RideCloseSummary summary);
+    Task<RideCloseSummary?> GetCloseSummaryByRideAsync(Guid rideId);
+
+    /// <summary>Sum of Cash payments on sales belonging to the given ride.</summary>
+    Task<decimal> GetCashCollectedByRideAsync(Guid rideId);
+}

Distribution/Features/Reconciliation/ReconciliationController.cs

@@ -0,0 +1,73 @@
+using Distribution.Infra.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Distribution.Features.Reconciliation;
+
+[ApiController]
+[Route("api/rides/{rideId:guid}")]
+public class ReconciliationController(ReconciliationService service, ICurrentUserService currentUser) : ControllerBase
+{
+    [HttpPost("cycle-count")]
+    public async Task<IActionResult> SubmitCycleCount(Guid rideId, SubmitCycleCountRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.SubmitCycleCountAsync(rideId, request, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpGet("variances")]
+    public async Task<IActionResult> GetVariances(Guid rideId)
+    {
+        try
+        {
+            var result = await service.GetVariancesAsync(rideId);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("variances/{id:guid}/approve")]
+    public async Task<IActionResult> ApproveVariance(Guid rideId, Guid id, ResolveVarianceRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.ApproveVarianceAsync(id, request, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("variances/{id:guid}/reject")]
+    public async Task<IActionResult> RejectVariance(Guid rideId, Guid id, ResolveVarianceRequest request, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.RejectVarianceAsync(id, request, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+
+    [HttpPost("close-ride")]
+    public async Task<IActionResult> CloseRide(Guid rideId, CancellationToken ct)
+    {
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        try
+        {
+            var result = await service.CloseRideAsync(rideId, userId, ct);
+            return Ok(result);
+        }
+        catch (KeyNotFoundException) { return NotFound(); }
+        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+    }
+}

Distribution/Features/Reconciliation/ReconciliationDTOs.cs

@@ -0,0 +1,19 @@
+using Distribution.Models;
+
+namespace Distribution.Features.Reconciliation;
+
+public record CycleCountItemLine(Guid ItemId, decimal PhysicalQuantity);
+public record SubmitCycleCountRequest(List<CycleCountItemLine> Items, decimal CashOnHand);
+
+public record RideVarianceResponse(
+    Guid Id, Guid RideId, Guid? ItemId, string? ItemName,
+    bool IsCash, decimal ExpectedQuantity, decimal ActualQuantity, decimal VarianceQuantity,
+    string? ReasonCode, VarianceStatus Status, Guid? ResolvedByUserId, DateTime? ResolvedAt);
+
+public record ResolveVarianceRequest(string ReasonCode);
+
+public record CycleCountResult(bool HasVariances, List<RideVarianceResponse> Variances);
+
+public record RideCloseSummaryResponse(
+    Guid Id, Guid RideId, decimal ExpectedCash, decimal ActualCash, decimal CashVariance,
+    Guid ClosedByUserId, DateTime ClosedAt);

Distribution/Features/Reconciliation/ReconciliationRepository.cs

@@ -0,0 +1,51 @@
+using Distribution.Data;
+using Distribution.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace Distribution.Features.Reconciliation;
+
+public class ReconciliationRepository(AppDBContext db) : IReconciliationRepository
+{
+    public async Task AddItemCountAsync(RideItemCount count)
+        => await db.RideItemCounts.AddAsync(count);
+
+    public async Task<List<RideItemCount>> GetItemCountsByRideAsync(Guid rideId)
+        => await db.RideItemCounts
+            .Where(c => c.FK_RideId == rideId)
+            .ToListAsync();
+
+    public async Task AddVarianceAsync(RideVariance variance)
+        => await db.RideVariances.AddAsync(variance);
+
+    public async Task<List<RideVariance>> GetVariancesByRideAsync(Guid rideId)
+        => await db.RideVariances
+            .Include(v => v.Item)
+            .Include(v => v.ResolvedBy)
+            .Where(v => v.FK_RideId == rideId)
+            .ToListAsync();
+
+    public async Task<RideVariance?> GetVarianceByIdAsync(Guid id)
+        => await db.RideVariances
+            .Include(v => v.Item)
+            .Include(v => v.ResolvedBy)
+            .FirstOrDefaultAsync(v => v.Id == id);
+
+    public void UpdateVariance(RideVariance variance)
+        => db.RideVariances.Update(variance);
+
+    public async Task<bool> HasPendingVariancesAsync(Guid rideId)
+        => await db.RideVariances
+            .AnyAsync(v => v.FK_RideId == rideId && v.Status == VarianceStatus.Pending);
+
+    public async Task AddCloseSummaryAsync(RideCloseSummary summary)
+        => await db.RideCloseSummaries.AddAsync(summary);
+
+    public async Task<RideCloseSummary?> GetCloseSummaryByRideAsync(Guid rideId)
+        => await db.RideCloseSummaries
+            .FirstOrDefaultAsync(s => s.FK_RideId == rideId);
+
+    public async Task<decimal> GetCashCollectedByRideAsync(Guid rideId)
+        => await db.Payments
+            .Where(p => p.Sale.FK_RideId == rideId && p.Method == PaymentMethod.Cash)
+            .SumAsync(p => p.Amount);
+}

Distribution/Features/Reconciliation/ReconciliationService.cs

@@ -0,0 +1,396 @@
+using Distribution.Features.Ride;
+using Distribution.Features.Stock;
+using Distribution.Infra.UoW;
+using Distribution.Models;
+
+namespace Distribution.Features.Reconciliation;
+
+public class ReconciliationService(
+    IReconciliationRepository reconciliationRepo,
+    IRideRepository rideRepo,
+    IStockRepository stockRepo,
+    IUnitOfWork uow)
+{
+    public async Task<CycleCountResult> SubmitCycleCountAsync(
+        Guid rideId, SubmitCycleCountRequest request, Guid userId, CancellationToken ct = default)
+    {
+        var ride = await rideRepo.GetByIdAsync(rideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.Active)
+            throw new InvalidOperationException($"Cannot submit cycle count for a ride in {ride.Status} status");
+
+        var existingCounts = await reconciliationRepo.GetItemCountsByRideAsync(rideId);
+        if (existingCounts.Count > 0)
+            throw new InvalidOperationException("Cycle count has already been submitted for this ride");
+
+        // Build submitted counts lookup
+        var submittedCounts = request.Items.ToDictionary(i => i.ItemId, i => i.PhysicalQuantity);
+
+        // Save all item count records
+        var itemCounts = request.Items.Select(line => new RideItemCount
+        {
+            FK_RideId = rideId,
+            FK_ItemId = line.ItemId,
+            PhysicalQuantity = line.PhysicalQuantity
+        }).ToList();
+
+        // Get current vehicle stock balances
+        var vehicleBalances = await stockRepo.GetBalancesByLocationAsync(ride.FK_VehicleId, LocationType.Vehicle);
+
+        var variances = new List<RideVariance>();
+
+        // Compare each stock balance against the physical count
+        foreach (var balance in vehicleBalances)
+        {
+            var physicalQty = submittedCounts.TryGetValue(balance.FK_ItemId, out var qty) ? qty : 0m;
+
+            if (balance.Quantity != physicalQty)
+            {
+                variances.Add(new RideVariance
+                {
+                    FK_RideId = rideId,
+                    FK_ItemId = balance.FK_ItemId,
+                    IsCash = false,
+                    ExpectedQuantity = balance.Quantity,
+                    ActualQuantity = physicalQty,
+                    VarianceQuantity = balance.Quantity - physicalQty,
+                    Status = VarianceStatus.Pending
+                });
+            }
+        }
+
+        // Cash variance check
+        var expectedCash = await reconciliationRepo.GetCashCollectedByRideAsync(rideId);
+        if (expectedCash != request.CashOnHand)
+        {
+            variances.Add(new RideVariance
+            {
+                FK_RideId = rideId,
+                FK_ItemId = null,
+                IsCash = true,
+                ExpectedQuantity = expectedCash,
+                ActualQuantity = request.CashOnHand,
+                VarianceQuantity = expectedCash - request.CashOnHand,
+                Status = VarianceStatus.Pending
+            });
+        }
+
+        ride.Status = RideStatus.PendingClose;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            foreach (var count in itemCounts)
+                await reconciliationRepo.AddItemCountAsync(count);
+
+            foreach (var variance in variances)
+                await reconciliationRepo.AddVarianceAsync(variance);
+
+            rideRepo.Update(ride);
+
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        var varianceResponses = variances.Select(ToVarianceResponse).ToList();
+        return new CycleCountResult(varianceResponses.Count > 0, varianceResponses);
+    }
+
+    public async Task<List<RideVarianceResponse>> GetVariancesAsync(Guid rideId)
+    {
+        var variances = await reconciliationRepo.GetVariancesByRideAsync(rideId);
+        return variances.Select(ToVarianceResponse).ToList();
+    }
+
+    public async Task<RideVarianceResponse> ApproveVarianceAsync(
+        Guid varianceId, ResolveVarianceRequest request, Guid userId, CancellationToken ct = default)
+    {
+        var variance = await reconciliationRepo.GetVarianceByIdAsync(varianceId)
+            ?? throw new KeyNotFoundException("Variance not found");
+
+        if (variance.Status != VarianceStatus.Pending)
+            throw new InvalidOperationException($"Variance is not in Pending status");
+
+        var ride = await rideRepo.GetByIdAsync(variance.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.PendingClose)
+            throw new InvalidOperationException($"Ride is not in PendingClose status");
+
+        StockMovement? movement = null;
+        StockBalance? balance = null;
+
+        if (!variance.IsCash)
+        {
+            // adjustmentQty = -variance.VarianceQuantity
+            // positive variance = short → debit vehicle (reduce stock)
+            // negative variance = surplus → credit vehicle (add stock)
+            var adjustmentQty = -variance.VarianceQuantity;
+
+            balance = await stockRepo.GetBalanceAsync(variance.FK_ItemId!.Value, ride.FK_VehicleId);
+
+            if (adjustmentQty < 0)
+            {
+                // Debit vehicle: FromLocationId=vehicleId, Quantity=abs(adjustmentQty)
+                var absQty = Math.Abs(adjustmentQty);
+                movement = new StockMovement
+                {
+                    FK_ItemId = variance.FK_ItemId!.Value,
+                    FromLocationId = ride.FK_VehicleId,
+                    FromLocationType = LocationType.Vehicle,
+                    ToLocationId = null,
+                    ToLocationType = null,
+                    Quantity = absQty,
+                    Type = MovementType.Adjustment,
+                    ReasonCode = request.ReasonCode,
+                    ReferenceId = variance.Id,
+                    CreatedAt = DateTime.Now,
+                    CreatedBy = userId
+                };
+
+                if (balance is not null)
+                {
+                    balance.Quantity -= absQty;
+                    balance.UpdatedAt = DateTime.Now;
+                }
+            }
+            else if (adjustmentQty > 0)
+            {
+                // Credit vehicle: ToLocationId=vehicleId, Quantity=adjustmentQty
+                movement = new StockMovement
+                {
+                    FK_ItemId = variance.FK_ItemId!.Value,
+                    FromLocationId = null,
+                    FromLocationType = null,
+                    ToLocationId = ride.FK_VehicleId,
+                    ToLocationType = LocationType.Vehicle,
+                    Quantity = adjustmentQty,
+                    Type = MovementType.Adjustment,
+                    ReasonCode = request.ReasonCode,
+                    ReferenceId = variance.Id,
+                    CreatedAt = DateTime.Now,
+                    CreatedBy = userId
+                };
+
+                if (balance is not null)
+                {
+                    balance.Quantity += adjustmentQty;
+                    balance.UpdatedAt = DateTime.Now;
+                }
+                else
+                {
+                    balance = new StockBalance
+                    {
+                        FK_ItemId = variance.FK_ItemId!.Value,
+                        LocationId = ride.FK_VehicleId,
+                        LocationType = LocationType.Vehicle,
+                        Quantity = adjustmentQty,
+                        UpdatedAt = DateTime.Now
+                    };
+                }
+            }
+        }
+
+        variance.Status = VarianceStatus.Approved;
+        variance.ReasonCode = request.ReasonCode;
+        variance.FK_ResolvedByUserId = userId;
+        variance.ResolvedAt = DateTime.Now;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            reconciliationRepo.UpdateVariance(variance);
+
+            if (movement is not null)
+                await stockRepo.AddMovementAsync(movement);
+
+            if (balance is not null)
+                stockRepo.UpdateBalance(balance);
+
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return ToVarianceResponse(variance);
+    }
+
+    public async Task<RideVarianceResponse> RejectVarianceAsync(
+        Guid varianceId, ResolveVarianceRequest request, Guid userId, CancellationToken ct = default)
+    {
+        var variance = await reconciliationRepo.GetVarianceByIdAsync(varianceId)
+            ?? throw new KeyNotFoundException("Variance not found");
+
+        if (variance.Status != VarianceStatus.Pending)
+            throw new InvalidOperationException($"Variance is not in Pending status");
+
+        var ride = await rideRepo.GetByIdAsync(variance.FK_RideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.PendingClose)
+            throw new InvalidOperationException($"Ride is not in PendingClose status");
+
+        StockMovement? movement = null;
+        StockBalance? balance = null;
+
+        if (!variance.IsCash)
+        {
+            var adjustmentQty = -variance.VarianceQuantity;
+
+            balance = await stockRepo.GetBalanceAsync(variance.FK_ItemId!.Value, ride.FK_VehicleId);
+
+            if (adjustmentQty < 0)
+            {
+                var absQty = Math.Abs(adjustmentQty);
+                movement = new StockMovement
+                {
+                    FK_ItemId = variance.FK_ItemId!.Value,
+                    FromLocationId = ride.FK_VehicleId,
+                    FromLocationType = LocationType.Vehicle,
+                    ToLocationId = null,
+                    ToLocationType = null,
+                    Quantity = absQty,
+                    Type = MovementType.Adjustment,
+                    ReasonCode = request.ReasonCode,
+                    ReferenceId = variance.Id,
+                    CreatedAt = DateTime.Now,
+                    CreatedBy = userId
+                };
+
+                if (balance is not null)
+                {
+                    balance.Quantity -= absQty;
+                    balance.UpdatedAt = DateTime.Now;
+                }
+            }
+            else if (adjustmentQty > 0)
+            {
+                movement = new StockMovement
+                {
+                    FK_ItemId = variance.FK_ItemId!.Value,
+                    FromLocationId = null,
+                    FromLocationType = null,
+                    ToLocationId = ride.FK_VehicleId,
+                    ToLocationType = LocationType.Vehicle,
+                    Quantity = adjustmentQty,
+                    Type = MovementType.Adjustment,
+                    ReasonCode = request.ReasonCode,
+                    ReferenceId = variance.Id,
+                    CreatedAt = DateTime.Now,
+                    CreatedBy = userId
+                };
+
+                if (balance is not null)
+                {
+                    balance.Quantity += adjustmentQty;
+                    balance.UpdatedAt = DateTime.Now;
+                }
+                else
+                {
+                    balance = new StockBalance
+                    {
+                        FK_ItemId = variance.FK_ItemId!.Value,
+                        LocationId = ride.FK_VehicleId,
+                        LocationType = LocationType.Vehicle,
+                        Quantity = adjustmentQty,
+                        UpdatedAt = DateTime.Now
+                    };
+                }
+            }
+        }
+
+        variance.Status = VarianceStatus.Rejected;
+        variance.ReasonCode = request.ReasonCode;
+        variance.FK_ResolvedByUserId = userId;
+        variance.ResolvedAt = DateTime.Now;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            reconciliationRepo.UpdateVariance(variance);
+
+            if (movement is not null)
+                await stockRepo.AddMovementAsync(movement);
+
+            if (balance is not null)
+                stockRepo.UpdateBalance(balance);
+
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return ToVarianceResponse(variance);
+    }
+
+    public async Task<RideCloseSummaryResponse> CloseRideAsync(
+        Guid rideId, Guid userId, CancellationToken ct = default)
+    {
+        var ride = await rideRepo.GetByIdAsync(rideId)
+            ?? throw new KeyNotFoundException("Ride not found");
+
+        if (ride.Status != RideStatus.PendingClose)
+            throw new InvalidOperationException($"Cannot close a ride in {ride.Status} status");
+
+        if (await reconciliationRepo.HasPendingVariancesAsync(rideId))
+            throw new InvalidOperationException("All variances must be resolved before the ride can be closed");
+
+        var allVariances = await reconciliationRepo.GetVariancesByRideAsync(rideId);
+        var cashVariance = allVariances.FirstOrDefault(v => v.IsCash);
+
+        var expectedCash = cashVariance?.ExpectedQuantity ?? 0m;
+        var actualCash = cashVariance?.ActualQuantity ?? 0m;
+        var cashVarianceAmount = cashVariance?.VarianceQuantity ?? 0m;
+
+        var summary = new RideCloseSummary
+        {
+            FK_RideId = rideId,
+            ExpectedCash = expectedCash,
+            ActualCash = actualCash,
+            CashVariance = cashVarianceAmount,
+            FK_ClosedByUserId = userId,
+            ClosedAt = DateTime.Now
+        };
+
+        ride.Status = RideStatus.Closed;
+        ride.ClosedAt = DateTime.Now;
+
+        await uow.BeginAsync(ct);
+        try
+        {
+            await reconciliationRepo.AddCloseSummaryAsync(summary);
+            rideRepo.Update(ride);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+
+        return new RideCloseSummaryResponse(
+            summary.Id,
+            summary.FK_RideId,
+            summary.ExpectedCash,
+            summary.ActualCash,
+            summary.CashVariance,
+            summary.FK_ClosedByUserId,
+            summary.ClosedAt);
+    }
+
+    private static RideVarianceResponse ToVarianceResponse(RideVariance v) =>
+        new(v.Id, v.FK_RideId, v.FK_ItemId, v.Item?.Name,
+            v.IsCash, v.ExpectedQuantity, v.ActualQuantity, v.VarianceQuantity,
+            v.ReasonCode, v.Status, v.FK_ResolvedByUserId, v.ResolvedAt);
+}

Distribution/Features/Region/IRegionRepository.cs

@@ -11,31 +11,17 @@ public interface IRegionRepository
     Task<Models.RegionalTarget?> GetTargetAsync(Guid regionId, string period);
     Task AddTargetAsync(Models.RegionalTarget target);
     void UpdateTarget(Models.RegionalTarget target);
-    Task<List<Models.RegionalTarget>> GetAllTargetsAsync();
-    Task<Models.RegionalTarget?> GetTargetByIdAsync(Guid id);
-    void RemoveTarget(Models.RegionalTarget target);
 
     Task<Models.RegionalBudget?> GetBudgetAsync(Guid regionId, string period);
     Task AddBudgetAsync(Models.RegionalBudget budget);
     void UpdateBudget(Models.RegionalBudget budget);
-    Task<List<Models.RegionalBudget>> GetAllBudgetsAsync();
-    Task<Models.RegionalBudget?> GetBudgetByIdAsync(Guid id);
-    void RemoveBudget(Models.RegionalBudget budget);
 
     Task<Models.RegionAgencyMap?> GetAgencyMapAsync(Guid regionId, Guid agencyUserId);
     Task AddAgencyMapAsync(Models.RegionAgencyMap map);
-    void UpdateAgencyMap(Models.RegionAgencyMap map);
-    Task<List<Models.RegionAgencyMap>> GetAgencyMapsForRegionAsync(Guid regionId);
-    Task<List<Models.RegionAgencyMap>> GetAllAgencyMapsAsync();
-    Task<Models.RegionAgencyMap?> GetAgencyMapByIdAsync(Guid id);
-    void RemoveAgencyMap(Models.RegionAgencyMap map);
 
     Task<Models.RegionalTaxRule?> GetTaxRuleAsync(Guid regionId);
     Task AddTaxRuleAsync(Models.RegionalTaxRule rule);
     void UpdateTaxRule(Models.RegionalTaxRule rule);
-    Task<List<Models.RegionalTaxRule>> GetAllTaxRulesAsync();
-    Task<Models.RegionalTaxRule?> GetTaxRuleByIdAsync(Guid id);
-    void RemoveTaxRule(Models.RegionalTaxRule rule);
 
     Task<int?> GetUserRoleLevelAsync(Guid userId);
 

Distribution/Features/Region/RegionController.cs

@@ -38,11 +38,31 @@ public class RegionController(RegionService service) : ControllerBase
         return deleted ? NoContent() : NotFound();
     }
 
-    //targets/budgets/agencies/tax-rule.
-    [HttpPut("{id:guid}/manage")]
-    public async Task<IActionResult> Manage(Guid id, ManageRegionRequest request, CancellationToken ct)
+    [HttpPut("{id:guid}/targets/{period}")]
+    public async Task<IActionResult> SetTarget(Guid id, string period, SetRegionalTargetRequest request, CancellationToken ct)
     {
-        var result = await service.ManageAsync(id, request, ct);
+        var result = await service.SetTargetAsync(id, period, request, ct);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpPut("{id:guid}/budgets/{period}")]
+    public async Task<IActionResult> SetBudget(Guid id, string period, SetRegionalBudgetRequest request, CancellationToken ct)
+    {
+        var result = await service.SetBudgetAsync(id, period, request, ct);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpPost("{id:guid}/agencies")]
+    public async Task<IActionResult> MapAgency(Guid id, MapAgencyToRegionRequest request, CancellationToken ct)
+    {
+        var result = await service.MapAgencyAsync(id, request, ct);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpPut("{id:guid}/tax-rule")]
+    public async Task<IActionResult> SetTaxRule(Guid id, SetRegionalTaxRuleRequest request, CancellationToken ct)
+    {
+        var result = await service.SetTaxRuleAsync(id, request, ct);
         return result is null ? NotFound() : Ok(result);
     }
 
@@ -59,16 +79,4 @@ public class RegionController(RegionService service) : ControllerBase
         var result = await service.GetDashboardAsync(id, period);
         return result is null ? NotFound() : Ok(result);
     }
-
-    // Flat CRUD-list view over targets/budgets/tax-rules/agency-maps across all regions.
-    [HttpGet("manage-entries")]
-    public async Task<IActionResult> GetManageEntries() =>
-        Ok(await service.GetManageEntriesAsync());
-
-    [HttpDelete("manage-entries/{entryType}/{id:guid}")]
-    public async Task<IActionResult> DeleteManageEntry(RegionManageEntryType entryType, Guid id, CancellationToken ct)
-    {
-        var deleted = await service.DeleteManageEntryAsync(entryType, id, ct);
-        return deleted ? NoContent() : NotFound();
-    }
 }

Distribution/Features/Region/RegionDTOs.cs

@@ -6,6 +6,14 @@ public record UpdateRegionRequest(string Name);
 
 public record RegionResponse(Guid Id, string Name, bool IsActive, DateTime CreatedAt);
 
+public record SetRegionalTargetRequest(decimal TargetValue);
+
+public record SetRegionalBudgetRequest(decimal BudgetAmount);
+
+public record MapAgencyToRegionRequest(Guid AgencyUserId);
+
+public record SetRegionalTaxRuleRequest(string RuleConfig);
+
 public record RegionalTargetResponse(Guid RegionId, string Period, decimal TargetValue);
 
 public record RegionalBudgetResponse(Guid RegionId, string Period, decimal BudgetAmount);
@@ -14,23 +22,6 @@ public record RegionAgencyMapResponse(Guid RegionId, Guid AgencyUserId);
 
 public record RegionalTaxRuleResponse(Guid RegionId, string RuleConfig);
 
-// Consolidated "beyond CRUD" management endpoint — replaces the separate
-// SetTarget/SetBudget/MapAgency/SetTaxRule endpoints. Every field is optional; only the
-// sub-actions whose fields are supplied get applied. Target/Budget both need Period.
-public record ManageRegionRequest(
-    string? Period,
-    decimal? TargetValue,
-    decimal? BudgetAmount,
-    Guid? AgencyUserId,
-    string? RuleConfig);
-
-public record ManageRegionResponse(
-    Guid RegionId,
-    RegionalTargetResponse? Target,
-    RegionalBudgetResponse? Budget,
-    RegionAgencyMapResponse? AgencyMap,
-    RegionalTaxRuleResponse? TaxRule);
-
 public record RegionHierarchyRouteItem(Guid RouteId, string RouteName, List<Guid> StoreIds);
 
 public record RegionHierarchyResponse(Guid RegionId, string RegionName, List<RegionHierarchyRouteItem> Routes);
@@ -42,22 +33,4 @@ public record RegionDashboardResponse(
     decimal? BudgetAmount,
     int OrderCount,
     decimal ActualSales,
-    DateTime? LastOrderDate,
-    string? TaxRuleConfig,
-    List<Guid> AgencyUserIds);
-
-// Flat, CRUD-list-friendly view over the four "manage" sub-resources (RegionalTarget,
-// RegionalBudget, RegionalTaxRule, RegionAgencyMap), so the frontend can render one table like
-// any other resource list (e.g. Rides) instead of one row per region with derived columns.
-public enum RegionManageEntryType { Target, Budget, TaxRule, AgencyMap }
-
-public record RegionManageEntryResponse(
-    Guid Id,
-    Guid RegionId,
-    string RegionName,
-    RegionManageEntryType EntryType,
-    string? Period,
-    decimal? Amount,
-    string? RuleConfig,
-    Guid? AgencyUserId,
-    DateTime CreatedAt);
+    DateTime? LastOrderDate);

Distribution/Features/Region/RegionRepository.cs

@@ -23,13 +23,9 @@ public class RegionRepository(AppDBContext context) : IRegionRepository
         context.Regions.Update(entity);
     }
 
-    // Note: no IsActive filter on any RegionalTarget lookup below — this entity is hard-deleted
-    // (see RemoveTarget), so IsActive is always true for rows that still exist. Querying without
-    // the filter also means a pre-existing orphaned row (e.g. soft-deleted before this fix
-    // shipped) is found and reused/cleaned up here instead of silently blocking a re-add.
     public async Task<Models.RegionalTarget?> GetTargetAsync(Guid regionId, string period) =>
         await context.RegionalTargets.FirstOrDefaultAsync(t =>
-            t.FK_RegionId == regionId && t.Period == period);
+            t.FK_RegionId == regionId && t.Period == period && t.IsActive);
 
     public async Task AddTargetAsync(Models.RegionalTarget target) =>
         await context.RegionalTargets.AddAsync(target);
@@ -37,22 +33,9 @@ public class RegionRepository(AppDBContext context) : IRegionRepository
     public void UpdateTarget(Models.RegionalTarget target) =>
         context.RegionalTargets.Update(target);
 
-    public async Task<List<Models.RegionalTarget>> GetAllTargetsAsync() =>
-        await context.RegionalTargets.ToListAsync();
-
-    public async Task<Models.RegionalTarget?> GetTargetByIdAsync(Guid id) =>
-        await context.RegionalTargets.FirstOrDefaultAsync(t => t.Id == id);
-
-    // Hard delete, not the usual IsActive soft-delete: RegionalTarget has a unique index on
-    // (FK_RegionId, Period) at the DB level, which doesn't know about IsActive — soft-deleting
-    // and then re-adding a target for the same region+period would violate that constraint.
-    public void RemoveTarget(Models.RegionalTarget target) =>
-        context.RegionalTargets.Remove(target);
-
-    // No IsActive filter — see GetTargetAsync's comment; same reasoning for RegionalBudget.
     public async Task<Models.RegionalBudget?> GetBudgetAsync(Guid regionId, string period) =>
         await context.RegionalBudgets.FirstOrDefaultAsync(b =>
-            b.FK_RegionId == regionId && b.Period == period);
+            b.FK_RegionId == regionId && b.Period == period && b.IsActive);
 
     public async Task AddBudgetAsync(Models.RegionalBudget budget) =>
         await context.RegionalBudgets.AddAsync(budget);
@@ -60,45 +43,15 @@ public class RegionRepository(AppDBContext context) : IRegionRepository
     public void UpdateBudget(Models.RegionalBudget budget) =>
         context.RegionalBudgets.Update(budget);
 
-    public async Task<List<Models.RegionalBudget>> GetAllBudgetsAsync() =>
-        await context.RegionalBudgets.ToListAsync();
-
-    public async Task<Models.RegionalBudget?> GetBudgetByIdAsync(Guid id) =>
-        await context.RegionalBudgets.FirstOrDefaultAsync(b => b.Id == id);
-
-    // Hard delete — see RemoveTarget's comment; same unique-index-vs-soft-delete conflict
-    // applies to RegionalBudget's (FK_RegionId, Period) unique index.
-    public void RemoveBudget(Models.RegionalBudget budget) =>
-        context.RegionalBudgets.Remove(budget);
-
-    // No IsActive filter — see GetTargetAsync's comment; same reasoning for RegionAgencyMap.
     public async Task<Models.RegionAgencyMap?> GetAgencyMapAsync(Guid regionId, Guid agencyUserId) =>
         await context.RegionAgencyMaps.FirstOrDefaultAsync(m =>
-            m.FK_RegionId == regionId && m.FK_AgencyUserId == agencyUserId);
+            m.FK_RegionId == regionId && m.FK_AgencyUserId == agencyUserId && m.IsActive);
 
     public async Task AddAgencyMapAsync(Models.RegionAgencyMap map) =>
         await context.RegionAgencyMaps.AddAsync(map);
 
-    public void UpdateAgencyMap(Models.RegionAgencyMap map) =>
-        context.RegionAgencyMaps.Update(map);
-
-    public async Task<List<Models.RegionAgencyMap>> GetAgencyMapsForRegionAsync(Guid regionId) =>
-        await context.RegionAgencyMaps.Where(m => m.FK_RegionId == regionId).ToListAsync();
-
-    public async Task<List<Models.RegionAgencyMap>> GetAllAgencyMapsAsync() =>
-        await context.RegionAgencyMaps.ToListAsync();
-
-    public async Task<Models.RegionAgencyMap?> GetAgencyMapByIdAsync(Guid id) =>
-        await context.RegionAgencyMaps.FirstOrDefaultAsync(m => m.Id == id);
-
-    // Hard delete — see RemoveTarget's comment; same conflict applies to RegionAgencyMap's
-    // (FK_RegionId, FK_AgencyUserId) unique index.
-    public void RemoveAgencyMap(Models.RegionAgencyMap map) =>
-        context.RegionAgencyMaps.Remove(map);
-
-    // No IsActive filter — see GetTargetAsync's comment; same reasoning for RegionalTaxRule.
     public async Task<Models.RegionalTaxRule?> GetTaxRuleAsync(Guid regionId) =>
-        await context.RegionalTaxRules.FirstOrDefaultAsync(r => r.FK_RegionId == regionId);
+        await context.RegionalTaxRules.FirstOrDefaultAsync(r => r.FK_RegionId == regionId && r.IsActive);
 
     public async Task AddTaxRuleAsync(Models.RegionalTaxRule rule) =>
         await context.RegionalTaxRules.AddAsync(rule);
@@ -106,17 +59,6 @@ public class RegionRepository(AppDBContext context) : IRegionRepository
     public void UpdateTaxRule(Models.RegionalTaxRule rule) =>
         context.RegionalTaxRules.Update(rule);
 
-    public async Task<List<Models.RegionalTaxRule>> GetAllTaxRulesAsync() =>
-        await context.RegionalTaxRules.ToListAsync();
-
-    public async Task<Models.RegionalTaxRule?> GetTaxRuleByIdAsync(Guid id) =>
-        await context.RegionalTaxRules.FirstOrDefaultAsync(r => r.Id == id);
-
-    // Hard delete — see RemoveTarget's comment; same conflict applies to RegionalTaxRule's
-    // unique index on FK_RegionId alone (one tax rule per region).
-    public void RemoveTaxRule(Models.RegionalTaxRule rule) =>
-        context.RegionalTaxRules.Remove(rule);
-
     public async Task<int?> GetUserRoleLevelAsync(Guid userId) =>
         await context.Users
             .Where(u => u.Id == userId && u.IsActive)

Distribution/Features/Region/RegionService.cs

@@ -5,11 +5,15 @@ namespace Distribution.Features.Region;
 
 public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUserService currentUser, IScopeAccessService scopeAccess)
 {
+    private const int RegionalManagerRoleLevel = 50;
     private const int RegionalAgencyRoleLevel = 60;
 
-    // TODO: re-enable the RegionalManager+scope / RegionalAgency role gate on ManageAsync once
-    // the role model for this endpoint is finalized. Left open (allow-all) for now on purpose.
-    private Task<bool> CanManageRegionAsync(Guid regionId) => Task.FromResult(true);
+    private async Task<bool> CanManageRegionAsync(Guid regionId)
+    {
+        if (currentUser.RoleLevel >= RegionalAgencyRoleLevel) return true;
+        if (currentUser.RoleLevel < RegionalManagerRoleLevel || currentUser.UserId is null) return false;
+        return await scopeAccess.HasRegionScopeAsync(currentUser.UserId.Value, regionId);
+    }
 
     public async Task<List<RegionResponse>> GetAllAsync() =>
         (await repo.GetAllAsync())
@@ -78,83 +82,103 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
         return true;
     }
 
-    // Consolidated replacement for the old separate SetTarget/SetBudget/MapAgency/SetTaxRule
-    // endpoints. Each sub-action only runs if its fields are present on the request, so callers
-    // can update just one thing (as the UI does) or several at once in a single round trip.
-    public async Task<ManageRegionResponse?> ManageAsync(Guid regionId, ManageRegionRequest request, CancellationToken ct = default)
+    public async Task<RegionalTargetResponse?> SetTargetAsync(Guid regionId, string period, SetRegionalTargetRequest request, CancellationToken ct = default)
     {
         var region = await repo.GetByIdAsync(regionId);
         if (region is null || !region.IsActive) return null;
         if (!await CanManageRegionAsync(regionId)) return null;
 
-        RegionalTargetResponse? targetResponse = null;
-        RegionalBudgetResponse? budgetResponse = null;
-        RegionAgencyMapResponse? agencyMapResponse = null;
-        RegionalTaxRuleResponse? taxRuleResponse = null;
-
+        var target = await repo.GetTargetAsync(regionId, period);
         await uow.BeginAsync(ct);
         try
         {
-            if (request.TargetValue is not null && !string.IsNullOrWhiteSpace(request.Period))
-            {
-                var target = await repo.GetTargetAsync(regionId, request.Period);
             if (target is null)
             {
-                    target = new Models.RegionalTarget { FK_RegionId = regionId, Period = request.Period, TargetValue = request.TargetValue.Value };
+                target = new Models.RegionalTarget { FK_RegionId = regionId, Period = period, TargetValue = request.TargetValue };
                 await repo.AddTargetAsync(target);
             }
             else
             {
-                    target.TargetValue = request.TargetValue.Value;
-                    target.IsActive = true;
+                target.TargetValue = request.TargetValue;
                 repo.UpdateTarget(target);
             }
-                targetResponse = new RegionalTargetResponse(regionId, request.Period, target.TargetValue);
+            await uow.CommitAsync(ct);
+        }
+        catch
+        {
+            await uow.RollbackAsync(ct);
+            throw;
+        }
+        return new RegionalTargetResponse(regionId, period, target.TargetValue);
     }
 
-            if (request.BudgetAmount is not null && !string.IsNullOrWhiteSpace(request.Period))
+    public async Task<RegionalBudgetResponse?> SetBudgetAsync(Guid regionId, string period, SetRegionalBudgetRequest request, CancellationToken ct = default)
+    {
+        var region = await repo.GetByIdAsync(regionId);
+        if (region is null || !region.IsActive) return null;
+        if (!await CanManageRegionAsync(regionId)) return null;
+
+        var budget = await repo.GetBudgetAsync(regionId, period);
+        await uow.BeginAsync(ct);
+        try
         {
-                var budget = await repo.GetBudgetAsync(regionId, request.Period);
             if (budget is null)
             {
-                    budget = new Models.RegionalBudget { FK_RegionId = regionId, Period = request.Period, BudgetAmount = request.BudgetAmount.Value };
+                budget = new Models.RegionalBudget { FK_RegionId = regionId, Period = period, BudgetAmount = request.BudgetAmount };
                 await repo.AddBudgetAsync(budget);
             }
             else
             {
-                    budget.BudgetAmount = request.BudgetAmount.Value;
-                    budget.IsActive = true;
+                budget.BudgetAmount = request.BudgetAmount;
                 repo.UpdateBudget(budget);
             }
-                budgetResponse = new RegionalBudgetResponse(regionId, request.Period, budget.BudgetAmount);
+            await uow.CommitAsync(ct);
         }
-
-            if (request.AgencyUserId is not null)
-            {
-                var agencyRoleLevel = await repo.GetUserRoleLevelAsync(request.AgencyUserId.Value);
-                if (agencyRoleLevel is null || agencyRoleLevel < RegionalAgencyRoleLevel)
+        catch
         {
             await uow.RollbackAsync(ct);
-                    return null;
+            throw;
+        }
+        return new RegionalBudgetResponse(regionId, period, budget.BudgetAmount);
     }
 
-                var existing = await repo.GetAgencyMapAsync(regionId, request.AgencyUserId.Value);
-                if (existing is null)
+    public async Task<RegionAgencyMapResponse?> MapAgencyAsync(Guid regionId, MapAgencyToRegionRequest request, CancellationToken ct = default)
+    {
+        var region = await repo.GetByIdAsync(regionId);
+        if (region is null || !region.IsActive) return null;
+        if (!await CanManageRegionAsync(regionId)) return null;
+
+        var agencyRoleLevel = await repo.GetUserRoleLevelAsync(request.AgencyUserId);
+        if (agencyRoleLevel is null || agencyRoleLevel < RegionalAgencyRoleLevel) return null;
+
+        var existing = await repo.GetAgencyMapAsync(regionId, request.AgencyUserId);
+        if (existing is not null) return new RegionAgencyMapResponse(regionId, request.AgencyUserId);
+
+        var map = new Models.RegionAgencyMap { FK_RegionId = regionId, FK_AgencyUserId = request.AgencyUserId };
+        await uow.BeginAsync(ct);
+        try
         {
-                    var map = new Models.RegionAgencyMap { FK_RegionId = regionId, FK_AgencyUserId = request.AgencyUserId.Value };
             await repo.AddAgencyMapAsync(map);
+            await uow.CommitAsync(ct);
         }
-                else if (!existing.IsActive)
+        catch
         {
-                    existing.IsActive = true;
-                    repo.UpdateAgencyMap(existing);
+            await uow.RollbackAsync(ct);
+            throw;
         }
-                agencyMapResponse = new RegionAgencyMapResponse(regionId, request.AgencyUserId.Value);
+        return new RegionAgencyMapResponse(regionId, request.AgencyUserId);
     }
 
-            if (request.RuleConfig is not null)
+    public async Task<RegionalTaxRuleResponse?> SetTaxRuleAsync(Guid regionId, SetRegionalTaxRuleRequest request, CancellationToken ct = default)
     {
+        var region = await repo.GetByIdAsync(regionId);
+        if (region is null || !region.IsActive) return null;
+        if (!await CanManageRegionAsync(regionId)) return null;
+
         var rule = await repo.GetTaxRuleAsync(regionId);
+        await uow.BeginAsync(ct);
+        try
+        {
             if (rule is null)
             {
                 rule = new Models.RegionalTaxRule { FK_RegionId = regionId, RuleConfig = request.RuleConfig };
@@ -163,12 +187,8 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
             else
             {
                 rule.RuleConfig = request.RuleConfig;
-                    rule.IsActive = true;
                 repo.UpdateTaxRule(rule);
             }
-                taxRuleResponse = new RegionalTaxRuleResponse(regionId, rule.RuleConfig);
-            }
-
             await uow.CommitAsync(ct);
         }
         catch
@@ -176,8 +196,7 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
             await uow.RollbackAsync(ct);
             throw;
         }
-
-        return new ManageRegionResponse(regionId, targetResponse, budgetResponse, agencyMapResponse, taxRuleResponse);
+        return new RegionalTaxRuleResponse(regionId, rule.RuleConfig);
     }
 
     public async Task<RegionHierarchyResponse?> GetHierarchyAsync(Guid regionId)
@@ -209,8 +228,6 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
         var target = await repo.GetTargetAsync(regionId, normalizedPeriod);
         var budget = await repo.GetBudgetAsync(regionId, normalizedPeriod);
         var orders = await repo.GetOrdersForDashboardAsync(regionId, periodStart, periodEndExclusive);
-        var taxRule = await repo.GetTaxRuleAsync(regionId);
-        var agencyMaps = await repo.GetAgencyMapsForRegionAsync(regionId);
 
         return new RegionDashboardResponse(
             regionId,
@@ -219,79 +236,6 @@ public class RegionService(IRegionRepository repo, IUnitOfWork uow, ICurrentUser
             budget?.BudgetAmount,
             orders.Count,
             orders.Sum(o => o.TotalAmount),
-            orders.Count == 0 ? null : orders.Max(o => o.OrderDate),
-            taxRule?.RuleConfig,
-            agencyMaps.Select(m => m.FK_AgencyUserId).ToList());
-    }
-
-    public async Task<List<RegionManageEntryResponse>> GetManageEntriesAsync()
-    {
-        var regionNames = (await repo.GetAllAsync()).ToDictionary(r => r.Id, r => r.Name);
-        string RegionName(Guid id) => regionNames.TryGetValue(id, out var name) ? name : "Unknown";
-
-        var entries = new List<RegionManageEntryResponse>();
-
-        entries.AddRange((await repo.GetAllTargetsAsync()).Select(t =>
-            new RegionManageEntryResponse(t.Id, t.FK_RegionId, RegionName(t.FK_RegionId), RegionManageEntryType.Target, t.Period, t.TargetValue, null, null, t.CreatedAt)));
-
-        entries.AddRange((await repo.GetAllBudgetsAsync()).Select(b =>
-            new RegionManageEntryResponse(b.Id, b.FK_RegionId, RegionName(b.FK_RegionId), RegionManageEntryType.Budget, b.Period, b.BudgetAmount, null, null, b.CreatedAt)));
-
-        entries.AddRange((await repo.GetAllTaxRulesAsync()).Select(r =>
-            new RegionManageEntryResponse(r.Id, r.FK_RegionId, RegionName(r.FK_RegionId), RegionManageEntryType.TaxRule, null, null, r.RuleConfig, null, r.CreatedAt)));
-
-        entries.AddRange((await repo.GetAllAgencyMapsAsync()).Select(m =>
-            new RegionManageEntryResponse(m.Id, m.FK_RegionId, RegionName(m.FK_RegionId), RegionManageEntryType.AgencyMap, null, null, null, m.FK_AgencyUserId, m.CreatedAt)));
-
-        return entries.OrderByDescending(e => e.CreatedAt).ToList();
-    }
-
-    public async Task<bool> DeleteManageEntryAsync(RegionManageEntryType entryType, Guid id, CancellationToken ct = default)
-    {
-        await uow.BeginAsync(ct);
-        try
-        {
-            bool found;
-            switch (entryType)
-            {
-                case RegionManageEntryType.Target:
-                    var target = await repo.GetTargetByIdAsync(id);
-                    found = target is not null;
-                    if (target is not null) repo.RemoveTarget(target);
-                    break;
-                case RegionManageEntryType.Budget:
-                    var budget = await repo.GetBudgetByIdAsync(id);
-                    found = budget is not null;
-                    if (budget is not null) repo.RemoveBudget(budget);
-                    break;
-                case RegionManageEntryType.TaxRule:
-                    var rule = await repo.GetTaxRuleByIdAsync(id);
-                    found = rule is not null;
-                    if (rule is not null) repo.RemoveTaxRule(rule);
-                    break;
-                case RegionManageEntryType.AgencyMap:
-                    var map = await repo.GetAgencyMapByIdAsync(id);
-                    found = map is not null;
-                    if (map is not null) repo.RemoveAgencyMap(map);
-                    break;
-                default:
-                    found = false;
-                    break;
-            }
-
-            if (!found)
-            {
-                await uow.RollbackAsync(ct);
-                return false;
-            }
-
-            await uow.CommitAsync(ct);
-            return true;
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
+            orders.Count == 0 ? null : orders.Max(o => o.OrderDate));
     }
 }

Distribution/Features/Returns/IReturnRepository.cs

@@ -3,10 +3,8 @@ namespace Distribution.Features.Returns;
 public interface IReturnRepository
 {
     Task<Models.SaleReturn?> GetByIdAsync(Guid id);
-    Task<List<Models.SaleReturn>> GetAllAsync();
     Task<List<Models.SaleReturn>> GetByOrderIdAsync(Guid orderId);
     Task AddAsync(Models.SaleReturn entity);
-    void Update(Models.SaleReturn entity);
     Task AddCreditNoteAsync(Models.CreditNote entity);
 
     /// <summary>Whether this store has ever had this item on any of its (active) orders.</summary>

Distribution/Features/Returns/ReturnController.cs

@@ -6,10 +6,6 @@ namespace Distribution.Features.Returns;
 [ApiController]
 public class ReturnController(ReturnService service, ICurrentUserService currentUser) : ControllerBase
 {
-    [HttpGet("api/returns")]
-    public async Task<IActionResult> GetAll() =>
-        Ok(await service.GetAllAsync());
-
     [HttpGet("api/returns/{id:guid}")]
     public async Task<IActionResult> GetById(Guid id)
     {
@@ -17,17 +13,6 @@ public class ReturnController(ReturnService service, ICurrentUserService current
         return result is null ? NotFound() : Ok(result);
     }
 
-    [HttpPatch("api/returns/{id:guid}/reasons")]
-    public async Task<IActionResult> UpdateReasons(Guid id, UpdateSaleReturnReasonsRequest request, CancellationToken ct)
-    {
-        try
-        {
-            var result = await service.UpdateReasonsAsync(id, request, ct);
-            return Ok(result);
-        }
-        catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }
-    }
-
     [HttpGet("api/orders/{id:guid}/returns")]
     public async Task<IActionResult> GetByOrder(Guid id) =>
         Ok(await service.GetByOrderIdAsync(id));
@@ -35,13 +20,10 @@ public class ReturnController(ReturnService service, ICurrentUserService current
     [HttpPost("api/orders/{id:guid}/returns")]
     public async Task<IActionResult> Create(Guid id, CreateSaleReturnRequest request, CancellationToken ct)
     {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.CreatedByUserId;
-        if (userId is null) return BadRequest(new { error = "CreatedByUserId is required while auth is unavailable" });
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
         try
         {
-            var result = await service.CreateAsync(id, request, userId.Value, ct);
+            var result = await service.CreateAsync(id, request, userId, ct);
             return CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
         }
         catch (InvalidOperationException ex) { return Conflict(new { error = ex.Message }); }

Distribution/Features/Returns/ReturnDTOs.cs

@@ -4,17 +4,7 @@ namespace Distribution.Features.Returns;
 
 public record ReturnItemRequest(Guid ItemId, decimal Quantity, ReturnReasonCode ReasonCode);
 
-public record CreateSaleReturnRequest(
-    ReturnMode Mode,
-    List<ReturnItemRequest> Items,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? CreatedByUserId = null);
-
-// The return's financial/stock effect (credit, order total, vehicle stock credit) is applied
-// immediately on create with no separate approval step, so quantities/mode can never be edited
-// after the fact without desyncing stock and order totals. Only each line's reason code is editable.
-public record UpdateReturnReasonItem(Guid ItemId, ReturnReasonCode ReasonCode);
-public record UpdateSaleReturnReasonsRequest(List<UpdateReturnReasonItem> Items);
+public record CreateSaleReturnRequest(ReturnMode Mode, List<ReturnItemRequest> Items);
 
 public record SaleReturnItemResponse(
     Guid Id,

Distribution/Features/Returns/ReturnRepository.cs

@@ -11,14 +11,6 @@ public class ReturnRepository(AppDBContext context) : IReturnRepository
             .Include(r => r.Items).ThenInclude(i => i.Item)
             .FirstOrDefaultAsync(r => r.Id == id);
 
-    public async Task<List<Models.SaleReturn>> GetAllAsync() =>
-        await context.SaleReturns
-            .Include(r => r.Order)
-            .Include(r => r.Items).ThenInclude(i => i.Item)
-            .Where(r => r.IsActive)
-            .OrderByDescending(r => r.CreatedAt)
-            .ToListAsync();
-
     public async Task<List<Models.SaleReturn>> GetByOrderIdAsync(Guid orderId) =>
         await context.SaleReturns
             .Include(r => r.Order)
@@ -30,9 +22,6 @@ public class ReturnRepository(AppDBContext context) : IReturnRepository
     public async Task AddAsync(Models.SaleReturn entity) =>
         await context.SaleReturns.AddAsync(entity);
 
-    public void Update(Models.SaleReturn entity) =>
-        context.SaleReturns.Update(entity);
-
     public async Task AddCreditNoteAsync(Models.CreditNote entity) =>
         await context.CreditNotes.AddAsync(entity);
 

Distribution/Features/Returns/ReturnService.cs

@@ -31,33 +31,6 @@ public class ReturnService(
         return Map(r);
     }
 
-    public async Task<List<SaleReturnResponse>> GetAllAsync() =>
-        (await repo.GetAllAsync()).Select(Map).ToList();
-
-    /// <summary>
-    /// Quantities/mode are immutable once created (the stock/order effect already happened) —
-    /// only each line's reason code can be corrected after the fact.
-    /// </summary>
-    public async Task<SaleReturnResponse> UpdateReasonsAsync(Guid id, UpdateSaleReturnReasonsRequest request, CancellationToken ct = default)
-    {
-        var r = await repo.GetByIdAsync(id);
-        if (r is null || !r.IsActive)
-            throw new InvalidOperationException("Return not found.");
-
-        foreach (var line in request.Items)
-        {
-            var item = r.Items.FirstOrDefault(i => i.FK_ItemId == line.ItemId && i.IsActive)
-                ?? throw new InvalidOperationException($"Item {line.ItemId} not found on this return.");
-            item.ReasonCode = line.ReasonCode;
-        }
-
-        await uow.BeginAsync(ct);
-        try { repo.Update(r); await uow.CommitAsync(ct); }
-        catch { await uow.RollbackAsync(ct); throw; }
-
-        return Map(r);
-    }
-
     public async Task<List<SaleReturnResponse>> GetByOrderIdAsync(Guid orderId) =>
         (await repo.GetByOrderIdAsync(orderId)).Select(Map).ToList();
 
@@ -147,8 +120,6 @@ public class ReturnService(
                 await stockRepo.AddMovementAsync(new StockMovement
                 {
                     FK_ItemId = line.FK_ItemId,
-                    FromLocationId = StockService.ExternalLocationId,
-                    FromLocationType = LocationType.External,
                     ToLocationId = vehicleId,
                     ToLocationType = LocationType.Vehicle,
                     Quantity = line.Quantity,

Distribution/Features/Ride/RideController.cs

@@ -40,7 +40,7 @@ public class RideController(RideService service, ICurrentUserService currentUser
     {
         try
         {
-            var result = await service.AssignDriverAsync(id, request.DriverProfileId, ct);
+            var result = await service.AssignDriverAsync(id, request.FK_DriverProfileId, ct);
             return Ok(result);
         }
         catch (KeyNotFoundException) { return NotFound(); }

Distribution/Features/Ride/RideDTOs.cs

@@ -25,12 +25,12 @@ public record RideResponse(
 
 public record CreateRideRequest(
     RideType RideType,
-    Guid VehicleId,
-    Guid DriverProfileId,
-    Guid RouteId,
-    Guid? SourceWarehouseId);
+    Guid FK_VehicleId,
+    Guid FK_DriverProfileId,
+    Guid FK_RouteId,
+    Guid? FK_SourceWarehouseId);
 
-public record AssignRideDriverRequest(Guid DriverProfileId);
+public record AssignRideDriverRequest(Guid FK_DriverProfileId);
 
 public record ActivateRideRequest(int Meterstart);
 

Distribution/Features/Ride/RideService.cs

@@ -1,5 +1,4 @@
 using Distribution.Features.Stock;
-using Distribution.Features.DriverComplianceConfig;
 using Distribution.Features.DriverProfile;
 using Distribution.Infra.UoW;
 using Distribution.Models;
@@ -9,7 +8,6 @@ namespace Distribution.Features.Ride;
 public class RideService(
     IRideRepository rideRepo,
     IDriverProfileRepository driverRepo,
-    IDriverComplianceConfigRepository complianceRepo,
     IRideCancelRequestRepository cancelRepo,
     Features.Vehicle.IVehicleRepository vehicleRepo,
     IStockRepository stockRepo,
@@ -36,19 +34,19 @@ public class RideService(
 
     public async Task<RideResponse> CreateAsync(CreateRideRequest request, CancellationToken ct = default)
     {
-        var vehicle = await vehicleRepo.GetByIdAsync(request.VehicleId)
+        var vehicle = await vehicleRepo.GetByIdAsync(request.FK_VehicleId)
             ?? throw new InvalidOperationException("Vehicle not found");
 
-        var sourceWarehouseId = vehicle.DefaultWarehouseId ?? request.SourceWarehouseId;
+        var sourceWarehouseId = vehicle.DefaultWarehouseId ?? request.FK_SourceWarehouseId;
         if (!sourceWarehouseId.HasValue)
             throw new InvalidOperationException("Source warehouse is required for this vehicle");
 
         var ride = new DeliveryRun
         {
             RideType = request.RideType,
-            FK_VehicleId = request.VehicleId,
-            FK_DriverProfileId = request.DriverProfileId,
-            FK_RouteId = request.RouteId,
+            FK_VehicleId = request.FK_VehicleId,
+            FK_DriverProfileId = request.FK_DriverProfileId,
+            FK_RouteId = request.FK_RouteId,
             FK_SourceWarehouseId = sourceWarehouseId.Value,
             Status = RideStatus.Draft
         };
@@ -138,14 +136,9 @@ public class RideService(
         var ride = await rideRepo.GetByIdAsync(rideId)
             ?? throw new KeyNotFoundException("Ride not found");
 
-        if (ride.Status != RideStatus.Active)
+        if (ride.Status != RideStatus.PendingClose)
             throw new InvalidOperationException($"Cannot close a ride in {ride.Status} status");
 
-        if (request.Meterend < ride.Meterstart)
-            throw new InvalidOperationException($"Meter end ({request.Meterend}) cannot be less than meter start ({ride.Meterstart})");
-
-        await EnsureVehicleStockClearedAsync(ride.FK_VehicleId);
-
         ride.Status = RideStatus.Closed;
         ride.ClosedAt = DateTime.Now;
         ride.Meterend = request.Meterend;
@@ -298,8 +291,7 @@ public class RideService(
                     b.LocationId,
                     b.LocationType,
                     b.Quantity,
-                    b.UpdatedAt,
-                    ride.Vehicle?.NumberPlate ?? string.Empty)).ToList()));
+                    b.UpdatedAt)).ToList()));
         }
 
         var openOrders = await rideRepo.GetActiveOrdersByRouteIdAsync(strandedRide.FK_RouteId);
@@ -323,7 +315,7 @@ public class RideService(
         if (!driver.IsActive)
             throw new InvalidOperationException("Driver profile is inactive");
 
-        var config = await complianceRepo.GetAsync();
+        var config = await driverRepo.GetComplianceConfigAsync();
         if (config is null) return;
 
         var today = DateTime.Now.Date;

Distribution/Features/Route/IRouteRepository.cs

@@ -7,14 +7,4 @@ public interface IRouteRepository
     Task AddAsync(Models.Route entity);
     void Update(Models.Route entity);
     void Remove(Models.Route entity);
-
-    Task<Models.User?> GetActiveUserAsync(Guid userId);
-    Task<List<Models.Store>> GetStoresByIdsAsync(List<Guid> storeIds);
-    Task<Models.Store?> GetStoreByIdAsync(Guid storeId);
-    void UpdateStore(Models.Store store);
-
-    Task<Models.RouteVisitLog?> GetOpenVisitAsync(Guid routeId, Guid storeId);
-    Task AddVisitLogAsync(Models.RouteVisitLog log);
-    void UpdateVisitLog(Models.RouteVisitLog log);
-    Task<List<Models.RouteVisitLog>> GetVisitsByStoreIdAsync(Guid storeId);
 }

Distribution/Features/Route/RouteController.cs

@@ -44,40 +44,4 @@ public class RouteController(RouteService service) : ControllerBase
         var deleted = await service.DeleteAsync(id, ct);
         return deleted ? NoContent() : NotFound();
     }
-
-    [HttpPost("{id:guid}/stores")]
-    public async Task<IActionResult> AssignStores(Guid id, AssignStoresToRouteRequest request, CancellationToken ct)
-    {
-        var result = await service.AssignStoresToRouteAsync(id, request, ct);
-        return result is null ? NotFound() : Ok(result);
-    }
-
-    [HttpPut("{id:guid}/owner")]
-    public async Task<IActionResult> AssignOwner(Guid id, AssignRouteOwnerRequest request, CancellationToken ct)
-    {
-        var result = await service.AssignOwnerAsync(id, request, ct);
-        return result is null ? NotFound() : Ok(result);
-    }
-
-    [HttpPost("{id:guid}/optimize")]
-    public IActionResult OptimizeSequence(Guid id) =>
-        StatusCode(StatusCodes.Status501NotImplemented);
-
-    [HttpPost("{id:guid}/visits/check-in")]
-    public async Task<IActionResult> CheckIn(Guid id, RecordCheckInRequest request, CancellationToken ct)
-    {
-        try
-        {
-            var result = await service.RecordCheckInAsync(id, request, ct);
-            return result is null ? NotFound() : Ok(result);
-        }
-        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
-    }
-
-    [HttpPost("{id:guid}/visits/check-out")]
-    public async Task<IActionResult> CheckOut(Guid id, RecordCheckOutRequest request, CancellationToken ct)
-    {
-        var result = await service.RecordCheckOutAsync(id, request, ct);
-        return result is null ? NotFound() : Ok(result);
-    }
 }

Distribution/Features/Route/RouteDTOs.cs

@@ -4,22 +4,6 @@ public record CreateRouteRequest(Guid RegionId, string RouteName, string StartPo
 
 public record UpdateRouteRequest(Guid RegionId, string RouteName, string StartPoint, string EndPoint, decimal Length);
 
-public record RouteResponse(Guid Id, Guid RegionId, string RouteName, string StartPoint, string EndPoint, decimal Length, Guid? OwnerUserId, bool IsActive, DateTime CreatedAt);
+public record RouteResponse(Guid Id, Guid RegionId, string RouteName, string StartPoint, string EndPoint, decimal Length, bool IsActive, DateTime CreatedAt);
 
 public record AssignRouteToRegionRequest(Guid RegionId);
-
-public record AssignStoresToRouteRequest(List<Guid> StoreIds);
-
-public record AssignRouteOwnerRequest(Guid SalesRepId);
-
-public record RecordCheckInRequest(
-    Guid StoreId,
-    decimal Latitude,
-    decimal Longitude,
-    DateTime? Timestamp,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? CheckedInByUserId = null);
-
-public record RecordCheckOutRequest(Guid StoreId, DateTime? Timestamp);
-
-public record RouteVisitResponse(Guid Id, Guid RouteId, Guid StoreId, Guid UserId, DateTime CheckInAt, bool IsDeviationFlagged, DateTime? CheckOutAt);

Distribution/Features/Route/RouteRepository.cs

@@ -22,31 +22,4 @@ public class RouteRepository(AppDBContext context) : IRouteRepository
         entity.IsActive = false;
         context.Routes.Update(entity);
     }
-
-    public async Task<Models.User?> GetActiveUserAsync(Guid userId) =>
-        await context.Users.FirstOrDefaultAsync(u => u.Id == userId && u.IsActive);
-
-    public async Task<List<Models.Store>> GetStoresByIdsAsync(List<Guid> storeIds) =>
-        await context.Stores.Where(s => storeIds.Contains(s.Id)).ToListAsync();
-
-    public async Task<Models.Store?> GetStoreByIdAsync(Guid storeId) =>
-        await context.Stores.FindAsync(storeId);
-
-    public void UpdateStore(Models.Store store) =>
-        context.Stores.Update(store);
-
-    public async Task<Models.RouteVisitLog?> GetOpenVisitAsync(Guid routeId, Guid storeId) =>
-        await context.RouteVisitLogs
-            .Where(v => v.FK_RouteId == routeId && v.FK_StoreId == storeId && v.CheckOutAt == null)
-            .OrderByDescending(v => v.CheckInAt)
-            .FirstOrDefaultAsync();
-
-    public async Task AddVisitLogAsync(Models.RouteVisitLog log) =>
-        await context.RouteVisitLogs.AddAsync(log);
-
-    public void UpdateVisitLog(Models.RouteVisitLog log) =>
-        context.RouteVisitLogs.Update(log);
-
-    public async Task<List<Models.RouteVisitLog>> GetVisitsByStoreIdAsync(Guid storeId) =>
-        await context.RouteVisitLogs.Where(v => v.FK_StoreId == storeId).ToListAsync();
 }

Distribution/Features/Route/RouteService.cs

@@ -1,50 +1,20 @@
-using Distribution.Infra.Authorization;
 using Distribution.Infra.UoW;
 
 namespace Distribution.Features.Route;
 
-public class RouteService(IRouteRepository repo, Region.IRegionRepository regionRepo, IUnitOfWork uow, ICurrentUserService currentUser, IScopeAccessService scopeAccess)
+public class RouteService(IRouteRepository repo, Region.IRegionRepository regionRepo, IUnitOfWork uow)
 {
-    private const int RouteManagerRoleLevel = 20;
-    private const double DeviationThresholdMeters = 500;
-
-    private async Task<bool> CanManageRouteAsync(Guid routeId)
-    {
-        if (currentUser.RoleLevel < RouteManagerRoleLevel || currentUser.UserId is null) return false;
-        return await scopeAccess.HasRouteScopeAsync(currentUser.UserId.Value, routeId);
-    }
-
-    private static double DistanceMeters(decimal lat1, decimal lon1, decimal lat2, decimal lon2)
-    {
-        const double earthRadiusMeters = 6371000;
-        var dLat = ToRadians((double)(lat2 - lat1));
-        var dLon = ToRadians((double)(lon2 - lon1));
-        var a = Math.Sin(dLat / 2) * Math.Sin(dLat / 2) +
-                Math.Cos(ToRadians((double)lat1)) * Math.Cos(ToRadians((double)lat2)) *
-                Math.Sin(dLon / 2) * Math.Sin(dLon / 2);
-        var c = 2 * Math.Atan2(Math.Sqrt(a), Math.Sqrt(1 - a));
-        return earthRadiusMeters * c;
-    }
-
-    private static double ToRadians(double degrees) => degrees * Math.PI / 180;
-
-    private static RouteResponse ToResponse(Models.Route route) =>
-        new(route.Id, route.FK_RegionId, route.RouteName, route.StartPoint, route.EndPoint, route.Length, route.FK_OwnerUserId, route.IsActive, route.CreatedAt);
-
-    private static RouteVisitResponse ToVisitResponse(Models.RouteVisitLog log) =>
-        new(log.Id, log.FK_RouteId, log.FK_StoreId, log.FK_UserId, log.CheckInAt, log.IsDeviationFlagged, log.CheckOutAt);
-
     public async Task<List<RouteResponse>> GetAllAsync() =>
         (await repo.GetAllAsync())
             .Where(r => r.IsActive)
-            .Select(r => new RouteResponse(r.Id, r.FK_RegionId, r.RouteName, r.StartPoint, r.EndPoint, r.Length, r.FK_OwnerUserId, r.IsActive, r.CreatedAt))
+            .Select(r => new RouteResponse(r.Id, r.FK_RegionId, r.RouteName, r.StartPoint, r.EndPoint, r.Length, r.IsActive, r.CreatedAt))
             .ToList();
 
     public async Task<RouteResponse?> GetByIdAsync(Guid id)
     {
         var route = await repo.GetByIdAsync(id);
         if (route is null || !route.IsActive) return null;
-        return new RouteResponse(route.Id, route.FK_RegionId, route.RouteName, route.StartPoint, route.EndPoint, route.Length, route.FK_OwnerUserId, route.IsActive, route.CreatedAt);
+        return new RouteResponse(route.Id, route.FK_RegionId, route.RouteName, route.StartPoint, route.EndPoint, route.Length, route.IsActive, route.CreatedAt);
     }
 
     public async Task<RouteResponse> CreateAsync(CreateRouteRequest request, CancellationToken ct = default)
@@ -68,7 +38,7 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
             await uow.RollbackAsync(ct);
             throw;
         }
-        return ToResponse(route);
+        return new RouteResponse(route.Id, route.FK_RegionId, route.RouteName, route.StartPoint, route.EndPoint, route.Length, route.IsActive, route.CreatedAt);
     }
 
     public async Task<RouteResponse?> UpdateAsync(Guid id, UpdateRouteRequest request, CancellationToken ct = default)
@@ -91,7 +61,7 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
             await uow.RollbackAsync(ct);
             throw;
         }
-        return ToResponse(route);
+        return new RouteResponse(route.Id, route.FK_RegionId, route.RouteName, route.StartPoint, route.EndPoint, route.Length, route.IsActive, route.CreatedAt);
     }
 
     public async Task<RouteResponse?> AssignToRegionAsync(Guid id, AssignRouteToRegionRequest request, CancellationToken ct = default)
@@ -114,7 +84,7 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
             await uow.RollbackAsync(ct);
             throw;
         }
-        return ToResponse(route);
+        return new RouteResponse(route.Id, route.FK_RegionId, route.RouteName, route.StartPoint, route.EndPoint, route.Length, route.IsActive, route.CreatedAt);
     }
 
     public async Task<bool> DeleteAsync(Guid id, CancellationToken ct = default)
@@ -134,121 +104,4 @@ public class RouteService(IRouteRepository repo, Region.IRegionRepository region
         }
         return true;
     }
-
-    public async Task<RouteResponse?> AssignStoresToRouteAsync(Guid id, AssignStoresToRouteRequest request, CancellationToken ct = default)
-    {
-        var route = await repo.GetByIdAsync(id);
-        if (route is null || !route.IsActive) return null;
-        if (!await CanManageRouteAsync(id)) return null;
-
-        var stores = await repo.GetStoresByIdsAsync(request.StoreIds);
-        if (stores.Count != request.StoreIds.Distinct().Count()) return null;
-
-        await uow.BeginAsync(ct);
-        try
-        {
-            foreach (var store in stores)
-            {
-                store.FK_RouteId = id;
-                repo.UpdateStore(store);
 }
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return ToResponse(route);
-    }
-
-    public async Task<RouteResponse?> AssignOwnerAsync(Guid id, AssignRouteOwnerRequest request, CancellationToken ct = default)
-    {
-        var route = await repo.GetByIdAsync(id);
-        if (route is null || !route.IsActive) return null;
-        if (!await CanManageRouteAsync(id)) return null;
-
-        var salesRep = await repo.GetActiveUserAsync(request.SalesRepId);
-        if (salesRep is null) return null;
-
-        route.FK_OwnerUserId = request.SalesRepId;
-        await uow.BeginAsync(ct);
-        try
-        {
-            repo.Update(route);
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return ToResponse(route);
-    }
-
-    public async Task<RouteVisitResponse?> RecordCheckInAsync(Guid id, RecordCheckInRequest request, CancellationToken ct = default)
-    {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user, and skip the route-scope
-        // check (which also depends on a resolved user) until that's fixed.
-        var userId = currentUser.UserId ?? request.CheckedInByUserId
-            ?? throw new InvalidOperationException("CheckedInByUserId is required while auth is unavailable");
-
-        var route = await repo.GetByIdAsync(id);
-        if (route is null || !route.IsActive) return null;
-
-        var store = await repo.GetStoreByIdAsync(request.StoreId);
-        if (store is null || !store.IsActive || store.FK_RouteId != id) return null;
-
-        var distance = DistanceMeters(request.Latitude, request.Longitude, store.Latitude, store.Longitude);
-
-        var log = new Models.RouteVisitLog
-        {
-            FK_RouteId = id,
-            FK_StoreId = request.StoreId,
-            FK_UserId = userId,
-            CheckInAt = request.Timestamp ?? DateTime.Now,
-            CheckInLatitude = request.Latitude,
-            CheckInLongitude = request.Longitude,
-            IsDeviationFlagged = distance > DeviationThresholdMeters
-        };
-        await uow.BeginAsync(ct);
-        try
-        {
-            await repo.AddVisitLogAsync(log);
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return ToVisitResponse(log);
-    }
-
-    public async Task<RouteVisitResponse?> RecordCheckOutAsync(Guid id, RecordCheckOutRequest request, CancellationToken ct = default)
-    {
-        // TEMPORARY: the route-scope check depends on the broken auth middleware
-        // (testbug.md #28) — skipped for now, same as check-in.
-        var route = await repo.GetByIdAsync(id);
-        if (route is null || !route.IsActive) return null;
-
-        var log = await repo.GetOpenVisitAsync(id, request.StoreId);
-        if (log is null) return null;
-
-        log.CheckOutAt = request.Timestamp ?? DateTime.Now;
-        await uow.BeginAsync(ct);
-        try
-        {
-            repo.UpdateVisitLog(log);
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return ToVisitResponse(log);
-    }
-}
-

Distribution/Features/Sale/SaleController.cs

@@ -24,18 +24,14 @@ public class SaleController(SaleService service) : ControllerBase
     public async Task<IActionResult> GetByStore(Guid storeId)
     {
         var result = await service.GetByStoreIdAsync(storeId);
-        return result is null ? StatusCode(StatusCodes.Status403Forbidden) : Ok(result);
+        return result is null ? Forbid() : Ok(result);
     }
 
     [HttpPost]
     public async Task<IActionResult> Create(CreateSaleRequest request, CancellationToken ct)
-    {
-        try
     {
         var result = await service.CreateAsync(request, ct);
-            return result is null ? StatusCode(StatusCodes.Status403Forbidden) : CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
-        }
-        catch (InvalidOperationException ex) { return BadRequest(new { error = ex.Message }); }
+        return result is null ? Forbid() : CreatedAtAction(nameof(GetById), new { id = result.Id }, result);
     }
 
     [HttpPatch("{id:guid}/cancel")]

Distribution/Features/Sale/SaleDTOs.cs

@@ -10,10 +10,7 @@ public record CreateSaleRequest(
     decimal TotalAmount,
     bool FulfillImmediately,
     Guid? RideId,
-    List<SaleItemRequest> Items,
-    // TEMPORARY: auth middleware doesn't attach a resolvable user yet (see testbug.md #28), so the
-    // caller supplies the acting user explicitly. Remove once currentUser.UserId is reliable again.
-    Guid? CreatedByUserId = null);
+    List<SaleItemRequest> Items);
 
 public record SaleItemResponse(Guid ItemId, int Quantity, int QuantityFulfilled, decimal UnitPrice);
 

Distribution/Features/Sale/SaleService.cs

@@ -121,10 +121,9 @@ public class SaleService(
 
     public async Task<SaleResponse?> CancelAsync(Guid id, CancellationToken ct = default)
     {
-        // TEMPORARY: see CreateAsync — store-scope enforcement depends on the broken auth
-        // middleware (testbug.md #28) and would reject every cancel. Skipped for now.
         var sale = await repo.GetByIdAsync(id);
         if (sale is null || !sale.IsActive) return null;
+        if (!await HasStoreScopeAsync(sale.FK_StoreId)) return null;
         if (sale.Status == SaleStatus.Cancelled)
             throw new InvalidOperationException("Sale is already cancelled");
 
@@ -142,45 +141,46 @@ public class SaleService(
 
     public async Task<SaleResponse?> CreateAsync(CreateSaleRequest request, CancellationToken ct = default)
     {
-        // TEMPORARY: store-scope enforcement and currentUser resolution both depend on the broken
-        // auth middleware (see testbug.md #28) — currentUser.UserId/RoleLevel are always unset, so
-        // both checks would reject every sale. Skipped for now; restore once auth is fixed.
-        var userId = currentUser.UserId ?? request.CreatedByUserId
-            ?? throw new InvalidOperationException("CreatedByUserId is required while auth is unavailable");
-        var store = await storeRepo.GetByIdWithRegionAsync(request.StoreId)
-            ?? throw new InvalidOperationException("Store not found");
-        if (!store.IsActive)
-            throw new InvalidOperationException("Store is inactive");
+        if (!await HasStoreScopeAsync(request.StoreId)) return null;
+
+        var userId = currentUser.UserId ?? throw new UnauthorizedAccessException();
+        var store = await storeRepo.GetByIdWithRegionAsync(request.StoreId);
+        if (store is null || !store.IsActive) return null;
 
         if (store.KycStatus != KycStatus.Verified)
         {
             var threshold = configuration.GetValue<decimal>("StoreManagement:UnverifiedKycOrderThreshold");
-            if (request.TotalAmount > threshold)
-                throw new InvalidOperationException(
-                    $"Store KYC is not verified — sale amount ({request.TotalAmount}) exceeds the unverified-store threshold ({threshold})");
+            if (request.TotalAmount > threshold) return null;
         }
 
+        var saleStatus = request.FulfillImmediately ? SaleStatus.Completed : SaleStatus.Pending;
+        var orderStatus = request.FulfillImmediately ? OrderStatus.Fulfilled : OrderStatus.Pending;
+        var fulfilledAt = request.FulfillImmediately ? DateTime.Now : (DateTime?)null;
+
         var sale = new Models.Sale
         {
             FK_StoreId = request.StoreId,
             SaleDate = request.SaleDate,
             CreatedByUserId = userId,
             FK_RideId = request.RideId,
-            FulfillImmediately = request.FulfillImmediately
+            TotalAmount = request.TotalAmount,
+            Status = saleStatus,
+            FulfillImmediately = request.FulfillImmediately,
+            CompletedAt = request.FulfillImmediately ? DateTime.Now : null
         };
 
         var orderItems = new List<Models.OrderItem>();
         foreach (var item in request.Items)
         {
-            var unitPrice = await ResolveUnitPriceAsync(item.ItemId, item.UnitPrice, store, request.SaleDate)
-                ?? throw new InvalidOperationException(
-                    $"Could not resolve a price for item {item.ItemId} on {request.SaleDate:yyyy-MM-dd} — check the item exists, an active price list covers this date/region, and any supplied unit price is within its min/max range");
+            var unitPrice = await ResolveUnitPriceAsync(item.ItemId, item.UnitPrice, store, request.SaleDate);
+            if (unitPrice is null) return null;
 
             orderItems.Add(new Models.OrderItem
             {
                 FK_ItemId = item.ItemId,
                 Quantity = item.Quantity,
-                UnitPrice = unitPrice
+                QuantityFulfilled = request.FulfillImmediately ? item.Quantity : 0,
+                UnitPrice = unitPrice.Value
             });
         }
 
@@ -189,47 +189,29 @@ public class SaleService(
             FK_SaleId = sale.Id,
             FK_StoreId = request.StoreId,
             OrderDate = request.SaleDate,
+            TotalAmount = request.TotalAmount,
+            Status = orderStatus,
+            FulfilledAt = fulfilledAt
         };
 
         foreach (var orderItem in orderItems)
             orderItem.FK_OrderId = order.Id;
 
-        // For a van sale against a specific ride, sell whatever quantity is actually on that
-        // vehicle instead of rejecting the whole sale over one short item — the sale is always a
-        // clean, completed sale of what's handed over, never a "partially fulfilled" order.
         Guid? vehicleId = null;
         if (request.FulfillImmediately && request.RideId.HasValue)
         {
-            var ride = await rideRepo.GetByIdAsync(request.RideId.Value)
-                ?? throw new InvalidOperationException("Ride not found");
+            var ride = await rideRepo.GetByIdAsync(request.RideId.Value);
+            if (ride is null) return null;
             vehicleId = ride.FK_VehicleId;
 
             foreach (var item in orderItems)
             {
                 var balance = await stockRepo.GetBalanceAsync(item.FK_ItemId, vehicleId.Value);
-                item.Quantity = Math.Min(item.Quantity, (int)(balance?.Quantity ?? 0));
+                if (balance is null || balance.Quantity < item.Quantity)
+                    return null;
             }
         }
 
-        foreach (var item in orderItems)
-            item.QuantityFulfilled = request.FulfillImmediately ? item.Quantity : 0;
-
-        if (request.FulfillImmediately)
-        {
-            sale.Status = SaleStatus.Completed;
-            sale.CompletedAt = DateTime.Now;
-            order.Status = OrderStatus.Fulfilled;
-            order.FulfilledAt = DateTime.Now;
-        }
-        else
-        {
-            sale.Status = SaleStatus.Pending;
-            order.Status = OrderStatus.Pending;
-        }
-
-        sale.TotalAmount = orderItems.Sum(i => i.Quantity * i.UnitPrice);
-        order.TotalAmount = sale.TotalAmount;
-
         await uow.BeginAsync(ct);
         try
         {
@@ -239,10 +221,10 @@ public class SaleService(
 
             if (vehicleId.HasValue)
             {
-                foreach (var item in orderItems.Where(i => i.QuantityFulfilled > 0))
+                foreach (var item in orderItems)
                 {
                     var balance = await stockRepo.GetBalanceAsync(item.FK_ItemId, vehicleId.Value);
-                    balance!.Quantity -= item.QuantityFulfilled;
+                    balance!.Quantity -= item.Quantity;
                     balance.UpdatedAt = DateTime.Now;
                     stockRepo.UpdateBalance(balance);
 
@@ -251,9 +233,7 @@ public class SaleService(
                         FK_ItemId = item.FK_ItemId,
                         FromLocationId = vehicleId.Value,
                         FromLocationType = LocationType.Vehicle,
-                        ToLocationId = StockService.ExternalLocationId,
-                        ToLocationType = LocationType.External,
-                        Quantity = item.QuantityFulfilled,
+                        Quantity = item.Quantity,
                         Type = MovementType.Sale,
                         ReferenceId = order.Id
                     });

Distribution/Features/Scheme/SchemeDTOs.cs

@@ -46,8 +46,7 @@ public record UpdateSchemeRequest(
     DateTime DateRangeFrom,
     DateTime DateRangeTo,
     bool AgentLimitExempt,
-    decimal? BaselineExpectedSales,
-    bool IsActive);
+    decimal? BaselineExpectedSales);
 
 public record ApplySchemeRequest(Guid SchemeId);
 

Distribution/Features/Scheme/SchemeRepository.cs

@@ -20,7 +20,7 @@ public class SchemeRepository(AppDBContext context) : ISchemeRepository
             .Include(s => s.TriggerItem)
             .Include(s => s.FreeItem)
             .Include(s => s.BundleComponents).ThenInclude(c => c.Item)
-            .AsQueryable();
+            .Where(s => s.IsActive);
 
         if (regionId.HasValue) query = query.Where(s => s.FK_RegionId == regionId);
 

Distribution/Features/Scheme/SchemeService.cs

@@ -41,7 +41,7 @@ public class SchemeService(
     public async Task<SchemeResponse?> GetByIdAsync(Guid id)
     {
         var scheme = await repo.GetByIdAsync(id);
-        return scheme is null ? null : ToResponse(scheme);
+        return scheme is null || !scheme.IsActive ? null : ToResponse(scheme);
     }
 
     /// <summary>
@@ -114,7 +114,7 @@ public class SchemeService(
     public async Task<SchemeResponse?> UpdateAsync(Guid id, UpdateSchemeRequest request, CancellationToken ct = default)
     {
         var scheme = await repo.GetByIdAsync(id);
-        if (scheme is null) return null;
+        if (scheme is null || !scheme.IsActive) return null;
 
         ValidatePercentRuleConfig(scheme.RuleType, request.RuleConfig);
         if (request.DateRangeFrom > request.DateRangeTo)
@@ -128,7 +128,6 @@ public class SchemeService(
         scheme.DateRangeTo = request.DateRangeTo;
         scheme.AgentLimitExempt = request.AgentLimitExempt;
         scheme.BaselineExpectedSales = request.BaselineExpectedSales;
-        scheme.IsActive = request.IsActive;
 
         await uow.BeginAsync(ct);
         try { repo.Update(scheme); await uow.CommitAsync(ct); }
@@ -256,7 +255,7 @@ public class SchemeService(
         var orderItems = await orderRepo.GetItemsByOrderIdAsync(orderId);
         var regionId = store.Route?.FK_RegionId;
 
-        var candidates = (await repo.GetAllAsync()).Where(s => s.IsActive);
+        var candidates = await repo.GetAllAsync();
         var result = new List<SchemeEligibilityResponse>();
 
         foreach (var scheme in candidates)

Distribution/Features/Stock/IStockRepository.cs

@@ -15,8 +15,6 @@ public interface IStockRepository
 
     // Movements
     Task AddMovementAsync(StockMovement movement);
-    Task<StockMovement?> GetMovementByIdAsync(Guid id);
-    void UpdateMovement(StockMovement movement);
     Task<List<StockMovement>> GetMovementsAsync(Guid? locationId, Guid? itemId, MovementType? type, DateTime? from, DateTime? to, int page, int pageSize);
     Task<int> GetMovementsCountAsync(Guid? locationId, Guid? itemId, MovementType? type, DateTime? from, DateTime? to);
 }

Distribution/Features/Stock/StockController.cs

@@ -85,24 +85,10 @@ public class StockController(StockService service, ICurrentUserService currentUs
     [HttpPost("adjustment")]
     public async Task<IActionResult> Adjust(AdjustmentRequest request, CancellationToken ct)
     {
-        // TEMPORARY: currentUser.UserId is always unset due to the broken auth middleware
-        // (testbug.md #28) — fall back to the explicitly supplied user until that's fixed.
-        var userId = currentUser.UserId ?? request.AdjustedByUserId;
-        if (userId is null) return BadRequest(new { error = "AdjustedByUserId is required while auth is unavailable" });
+        if (currentUser.UserId is null) return Unauthorized();
         try
         {
-            var result = await service.AdjustAsync(request, userId.Value, ct);
-            return Ok(result);
-        }
-        catch (InvalidOperationException ex) { return BadRequest(ex.Message); }
-    }
-
-    [HttpPatch("movements/{id}/reason")]
-    public async Task<IActionResult> UpdateMovementReason(Guid id, UpdateMovementReasonRequest request, CancellationToken ct)
-    {
-        try
-        {
-            var result = await service.UpdateMovementReasonAsync(id, request, ct);
+            var result = await service.AdjustAsync(request, currentUser.UserId.Value, ct);
             return Ok(result);
         }
         catch (InvalidOperationException ex) { return BadRequest(ex.Message); }

Distribution/Features/Stock/StockDTOs.cs

@@ -12,8 +12,7 @@ public record StockBalanceResponse(
     Guid LocationId,
     LocationType LocationType,
     decimal Quantity,
-    DateTime UpdatedAt,
-    string LocationName);
+    DateTime UpdatedAt);
 
 public record StockTotalResponse(
     Guid ItemId,
@@ -35,9 +34,7 @@ public record StockMovementResponse(
     string? ReasonCode,
     Guid? ReferenceId,
     DateTime CreatedAt,
-    Guid CreatedBy,
-    string? FromLocationName,
-    string? ToLocationName);
+    Guid CreatedBy);
 
 // Write requests
 public record TransferRequest(
@@ -67,10 +64,4 @@ public record AdjustmentRequest(
     Guid LocationId,
     LocationType LocationType,
     decimal Quantity,
-    string ReasonCode,
-    // TEMPORARY: required while auth doesn't resolve a logged-in user server-side — see testbug.md #28.
-    Guid? AdjustedByUserId = null);
-
-// Movements are an immutable ledger — quantity, locations, and type can never change once recorded
-// (the running stock balance is the sum of all movements). Only the free-text reason/note is editable.
-public record UpdateMovementReasonRequest(string ReasonCode);
+    string ReasonCode);

Distribution/Features/Stock/StockRepository.cs

@@ -50,12 +50,6 @@ public class StockRepository(AppDBContext db) : IStockRepository
     public async Task AddMovementAsync(StockMovement movement) =>
         await db.StockMovements.AddAsync(movement);
 
-    public Task<StockMovement?> GetMovementByIdAsync(Guid id) =>
-        db.StockMovements.Include(m => m.Item).FirstOrDefaultAsync(m => m.Id == id);
-
-    public void UpdateMovement(StockMovement movement) =>
-        db.StockMovements.Update(movement);
-
     public Task<List<StockMovement>> GetMovementsAsync(Guid? locationId, Guid? itemId, MovementType? type, DateTime? from, DateTime? to, int page, int pageSize)
     {
         var query = db.StockMovements.Include(m => m.Item).AsQueryable();

Distribution/Features/Stock/StockService.cs

@@ -1,79 +1,19 @@
 using Distribution.Features.Category;
 using Distribution.Features.Item;
-using Distribution.Features.Vehicle;
-using Distribution.Features.Warehouse;
 using Distribution.Infra.UoW;
 using Distribution.Models;
 
 namespace Distribution.Features.Stock;
 
-public class StockService(
-    IStockRepository repo,
-    IItemRepository itemRepo,
-    ICategoryRepository categoryRepo,
-    IWarehouseRepository warehouseRepo,
-    IVehicleRepository vehicleRepo,
-    IUnitOfWork uow)
+public class StockService(IStockRepository repo, IItemRepository itemRepo, ICategoryRepository categoryRepo, IUnitOfWork uow)
 {
-    private static StockBalanceResponse MapBalance(StockBalance b, string locationName) =>
-        new(b.FK_ItemId, b.Item.Name, b.LocationId, b.LocationType, b.Quantity, b.UpdatedAt, locationName);
+    private static StockBalanceResponse MapBalance(StockBalance b) =>
+        new(b.FK_ItemId, b.Item.Name, b.LocationId, b.LocationType, b.Quantity, b.UpdatedAt);
 
-    // Sentinel id used for the "External" side of a movement (customer, supplier, write-off, adjustment
-    // source/sink) that has no real Warehouse/Vehicle record — every movement must always show both a
-    // From and a To, even when one side is outside the tracked system.
-    public static readonly Guid ExternalLocationId = Guid.Empty;
-
-    private static string ExternalLocationLabel(MovementType type, bool isFrom) => type switch
-    {
-        MovementType.Sale => "Customer",
-        MovementType.CustomerReturn => "Customer",
-        MovementType.PurchaseReceipt => "Supplier",
-        MovementType.PurchaseReturn => "Supplier",
-        MovementType.Damage => "Written Off",
-        MovementType.Adjustment => "Stock Adjustment",
-        _ => isFrom ? "External Source" : "External Destination",
-    };
-
-    private static StockMovementResponse MapMovement(StockMovement m, string? fromLocationName, string? toLocationName) =>
+    private static StockMovementResponse MapMovement(StockMovement m) =>
         new(m.Id, m.FK_ItemId, m.Item.Name, m.FromLocationId, m.FromLocationType,
             m.ToLocationId, m.ToLocationType, m.Quantity, m.Type, m.ReasonCode,
-            m.ReferenceId, m.CreatedAt, m.CreatedBy, fromLocationName, toLocationName);
-
-    private async Task<StockMovementResponse> MapMovementAsync(StockMovement m)
-    {
-        var locations = new List<(Guid, LocationType)>();
-        if (m.FromLocationId is Guid fromId && m.FromLocationType is LocationType fromType && fromType != LocationType.External) locations.Add((fromId, fromType));
-        if (m.ToLocationId is Guid toId && m.ToLocationType is LocationType toType && toType != LocationType.External) locations.Add((toId, toType));
-        var names = await ResolveLocationNamesAsync(locations);
-        return MapMovement(m, ResolveMovementSideName(m, names, isFrom: true), ResolveMovementSideName(m, names, isFrom: false));
-    }
-
-    private static string? ResolveMovementSideName(StockMovement m, Dictionary<Guid, string> names, bool isFrom)
-    {
-        var id = isFrom ? m.FromLocationId : m.ToLocationId;
-        var type = isFrom ? m.FromLocationType : m.ToLocationType;
-        if (id is not Guid locId || type is not LocationType locType) return null;
-        return locType == LocationType.External ? ExternalLocationLabel(m.Type, isFrom) : names.GetValueOrDefault(locId, "—");
-    }
-
-    private async Task<Dictionary<Guid, string>> ResolveLocationNamesAsync(IEnumerable<(Guid Id, LocationType Type)> locations)
-    {
-        var warehouseIds = locations.Where(l => l.Type == LocationType.Warehouse).Select(l => l.Id).Distinct().ToList();
-        var vehicleIds = locations.Where(l => l.Type == LocationType.Vehicle).Select(l => l.Id).Distinct().ToList();
-
-        var names = new Dictionary<Guid, string>();
-        foreach (var id in warehouseIds)
-        {
-            var warehouse = await warehouseRepo.GetByIdAsync(id);
-            names[id] = warehouse?.Name ?? "Unknown Warehouse";
-        }
-        foreach (var id in vehicleIds)
-        {
-            var vehicle = await vehicleRepo.GetByIdAsync(id);
-            names[id] = vehicle?.RegNumber ?? "Unknown Vehicle";
-        }
-        return names;
-    }
+            m.ReferenceId, m.CreatedAt, m.CreatedBy);
 
     // ── Queries ────────────────────────────────────────────────────────────
 
@@ -82,9 +22,7 @@ public class StockService(
     {
         var items = await repo.GetBalancesAsync(locationId, locationType, itemId, page, pageSize);
         var total = await repo.GetBalancesCountAsync(locationId, locationType, itemId);
-        var names = await ResolveLocationNamesAsync(items.Select(b => (b.LocationId, b.LocationType)));
-        return new PagedResponse<StockBalanceResponse>(page, pageSize, total,
-            items.Select(b => MapBalance(b, names.GetValueOrDefault(b.LocationId, "—"))).ToList());
+        return new PagedResponse<StockBalanceResponse>(page, pageSize, total, items.Select(MapBalance).ToList());
     }
 
     public async Task<StockTotalResponse?> GetItemTotalAsync(Guid itemId)
@@ -94,9 +32,7 @@ public class StockService(
 
         var balances = await repo.GetBalancesByItemAsync(itemId);
         var total = balances.Sum(b => b.Quantity);
-        var names = await ResolveLocationNamesAsync(balances.Select(b => (b.LocationId, b.LocationType)));
-        return new StockTotalResponse(itemId, item.Name, total,
-            balances.Select(b => MapBalance(b, names.GetValueOrDefault(b.LocationId, "—"))).ToList());
+        return new StockTotalResponse(itemId, item.Name, total, balances.Select(MapBalance).ToList());
     }
 
     public async Task<PagedResponse<StockMovementResponse>> GetMovementsAsync(
@@ -104,20 +40,7 @@ public class StockService(
     {
         var items = await repo.GetMovementsAsync(locationId, itemId, type, from, to, page, pageSize);
         var total = await repo.GetMovementsCountAsync(locationId, itemId, type, from, to);
-
-        var locations = new List<(Guid, LocationType)>();
-        foreach (var m in items)
-        {
-            if (m.FromLocationId is Guid fromId && m.FromLocationType is LocationType fromType && fromType != LocationType.External) locations.Add((fromId, fromType));
-            if (m.ToLocationId is Guid toId && m.ToLocationType is LocationType toType && toType != LocationType.External) locations.Add((toId, toType));
-        }
-        var names = await ResolveLocationNamesAsync(locations);
-
-        return new PagedResponse<StockMovementResponse>(page, pageSize, total,
-            items.Select(m => MapMovement(
-                m,
-                ResolveMovementSideName(m, names, isFrom: true),
-                ResolveMovementSideName(m, names, isFrom: false))).ToList());
+        return new PagedResponse<StockMovementResponse>(page, pageSize, total, items.Select(MapMovement).ToList());
     }
 
     // ── Writes ─────────────────────────────────────────────────────────────
@@ -148,7 +71,7 @@ public class StockService(
         }
         catch { await uow.RollbackAsync(ct); throw; }
 
-        return await MapMovementAsync(movement);
+        return MapMovement(movement);
     }
 
     public async Task<StockMovementResponse> RecordDamageAsync(DamageRequest request, Guid userId, CancellationToken ct = default)
@@ -160,8 +83,6 @@ public class StockService(
             FK_ItemId = request.ItemId,
             FromLocationId = request.LocationId,
             FromLocationType = request.LocationType,
-            ToLocationId = ExternalLocationId,
-            ToLocationType = LocationType.External,
             Quantity = request.Quantity,
             Type = MovementType.Damage,
             ReasonCode = request.ReasonCode,
@@ -177,7 +98,7 @@ public class StockService(
         }
         catch { await uow.RollbackAsync(ct); throw; }
 
-        return await MapMovementAsync(movement);
+        return MapMovement(movement);
     }
 
     public async Task<StockMovementResponse> RecordCustomerReturnAsync(CustomerReturnRequest request, Guid userId, CancellationToken ct = default)
@@ -194,8 +115,6 @@ public class StockService(
         var movement = new StockMovement
         {
             FK_ItemId = request.ItemId,
-            FromLocationId = ExternalLocationId,
-            FromLocationType = LocationType.External,
             ToLocationId = request.VehicleId,
             ToLocationType = LocationType.Vehicle,
             Quantity = request.Quantity,
@@ -213,7 +132,7 @@ public class StockService(
         }
         catch { await uow.RollbackAsync(ct); throw; }
 
-        return await MapMovementAsync(movement);
+        return MapMovement(movement);
     }
 
     public async Task<StockMovementResponse> AdjustAsync(AdjustmentRequest request, Guid userId, CancellationToken ct = default)
@@ -225,10 +144,10 @@ public class StockService(
         var movement = new StockMovement
         {
             FK_ItemId = request.ItemId,
-            FromLocationId = request.Quantity < 0 ? request.LocationId : ExternalLocationId,
-            FromLocationType = request.Quantity < 0 ? request.LocationType : LocationType.External,
-            ToLocationId = request.Quantity > 0 ? request.LocationId : ExternalLocationId,
-            ToLocationType = request.Quantity > 0 ? request.LocationType : LocationType.External,
+            FromLocationId = request.Quantity < 0 ? request.LocationId : null,
+            FromLocationType = request.Quantity < 0 ? request.LocationType : null,
+            ToLocationId = request.Quantity > 0 ? request.LocationId : null,
+            ToLocationType = request.Quantity > 0 ? request.LocationType : null,
             Quantity = Math.Abs(request.Quantity),
             Type = MovementType.Adjustment,
             ReasonCode = request.ReasonCode,
@@ -259,20 +178,7 @@ public class StockService(
         }
         catch { await uow.RollbackAsync(ct); throw; }
 
-        return await MapMovementAsync(movement);
-    }
-
-    // Movements are an immutable ledger — only the reason/note can be edited, never quantity/locations/type.
-    public async Task<StockMovementResponse> UpdateMovementReasonAsync(Guid movementId, UpdateMovementReasonRequest request, CancellationToken ct = default)
-    {
-        var movement = await repo.GetMovementByIdAsync(movementId)
-            ?? throw new InvalidOperationException("Movement not found.");
-
-        movement.ReasonCode = request.ReasonCode;
-        repo.UpdateMovement(movement);
-        await uow.SaveChangesAsync(ct);
-
-        return await MapMovementAsync(movement);
+        return MapMovement(movement);
     }
 
     // ── Helpers ────────────────────────────────────────────────────────────

Distribution/Features/Store/IStoreRepository.cs

@@ -1,5 +1,3 @@
-using Distribution.Models;
-
 namespace Distribution.Features.Store;
 
 public interface IStoreRepository
@@ -7,8 +5,6 @@ public interface IStoreRepository
     Task<Models.Store?> GetByIdAsync(Guid id);
     Task<Models.Store?> GetByIdWithRegionAsync(Guid id);
     Task<List<Models.Store>> GetAllAsync();
-    Task<List<Models.Store>> GetAllAsync(Guid? routeId, KycStatus? kycStatus, string? search, int page, int pageSize);
-    Task<int> GetCountAsync(Guid? routeId, KycStatus? kycStatus, string? search);
     Task AddAsync(Models.Store entity);
     void Update(Models.Store entity);
     void Remove(Models.Store entity);

Distribution/Features/Store/StoreController.cs

@@ -1,5 +1,4 @@
-using Distribution.Models;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Distribution.Features.Store;
 
@@ -8,13 +7,8 @@ namespace Distribution.Features.Store;
 public class StoreController(StoreService service) : ControllerBase
 {
     [HttpGet]
-    public async Task<IActionResult> GetAll(
-        [FromQuery] Guid? routeId,
-        [FromQuery] KycStatus? kycStatus,
-        [FromQuery] string? search,
-        [FromQuery] int page = 1,
-        [FromQuery] int pageSize = 20) =>
-        Ok(await service.GetAllAsync(routeId, kycStatus, search, page, pageSize));
+    public async Task<IActionResult> GetAll() =>
+        Ok(await service.GetAllAsync());
 
     [HttpGet("{id:guid}")]
     public async Task<IActionResult> GetById(Guid id)
@@ -48,14 +42,14 @@ public class StoreController(StoreService service) : ControllerBase
     public async Task<IActionResult> UpdateCreditLimit(Guid id, UpdateCreditLimitRequest request, CancellationToken ct)
     {
         var result = await service.UpdateCreditLimitAsync(id, request, ct);
-        return result is null ? StatusCode(StatusCodes.Status403Forbidden) : Ok(result);
+        return result is null ? Forbid() : Ok(result);
     }
 
     [HttpPut("{id:guid}/outstanding-balance")]
     public async Task<IActionResult> UpdateOutstandingBalance(Guid id, UpdateOutstandingBalanceRequest request, CancellationToken ct)
     {
         var result = await service.UpdateOutstandingBalanceAsync(id, request, ct);
-        return result is null ? StatusCode(StatusCodes.Status403Forbidden) : Ok(result);
+        return result is null ? Forbid() : Ok(result);
     }
 
     [HttpGet("{id:guid}/outstanding-balance")]
@@ -106,11 +100,4 @@ public class StoreController(StoreService service) : ControllerBase
         var result = await service.VerifyKycAsync(id, new VerifyKycRequest(request.KycStatus, null), ct);
         return result is null ? NotFound() : Ok(result);
     }
-
-    [HttpPatch("{id:guid}/status")]
-    public async Task<IActionResult> PatchStatus(Guid id, PatchStoreStatusRequest request, CancellationToken ct)
-    {
-        var result = await service.SetActiveStatusAsync(id, request.IsActive, ct);
-        return result is null ? NotFound() : Ok(result);
-    }
 }

Distribution/Features/Store/StoreDTOs.cs

@@ -20,8 +20,7 @@ public record UpdateStoreRequest(
     decimal Latitude,
     decimal Longitude,
     decimal OneTimeAmount,
-    decimal CreditAmount,
-    bool IsActive = true);
+    decimal CreditAmount);
 
 public record StoreResponse(
     Guid Id,
@@ -56,6 +55,4 @@ public record SchemeEligibilityResponse(bool Eligible, string? Reason);
 
 public record PatchKycStatusRequest(KycStatus KycStatus);
 
-public record PatchStoreStatusRequest(bool IsActive);
-
 public record StoreDashboardResponse(Guid StoreId, string Period, int OrderCount, decimal TotalOrderValue, DateTime? LastOrderDate);

Distribution/Features/Store/StoreRepository.cs

@@ -1,5 +1,4 @@
 using Distribution.Data;
-using Distribution.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace Distribution.Features.Store;
@@ -17,25 +16,6 @@ public class StoreRepository(AppDBContext context) : IStoreRepository
     public async Task<List<Models.Store>> GetAllAsync() =>
         await context.Stores.ToListAsync();
 
-    private static IQueryable<Models.Store> ApplyFilters(
-        IQueryable<Models.Store> query, Guid? routeId, KycStatus? kycStatus, string? search) =>
-        query
-            .Where(s => routeId == null || s.FK_RouteId == routeId)
-            .Where(s => kycStatus == null || s.KycStatus == kycStatus)
-            .Where(s => string.IsNullOrWhiteSpace(search)
-                || s.StoreName.Contains(search)
-                || s.OwnerName.Contains(search));
-
-    public async Task<List<Models.Store>> GetAllAsync(Guid? routeId, KycStatus? kycStatus, string? search, int page, int pageSize) =>
-        await ApplyFilters(context.Stores, routeId, kycStatus, search)
-            .OrderBy(s => s.StoreName)
-            .Skip((page - 1) * pageSize)
-            .Take(pageSize)
-            .ToListAsync();
-
-    public async Task<int> GetCountAsync(Guid? routeId, KycStatus? kycStatus, string? search) =>
-        await ApplyFilters(context.Stores, routeId, kycStatus, search).CountAsync();
-
     public async Task AddAsync(Models.Store entity) =>
         await context.Stores.AddAsync(entity);
 

Distribution/Features/Store/StoreService.cs

@@ -1,12 +1,11 @@
 using Distribution.Features.Scheme;
-using Distribution.Features.Stock;
 using Distribution.Infra.Authorization;
 using Distribution.Infra.UoW;
 using Distribution.Models;
 
 namespace Distribution.Features.Store;
 
-public class StoreService(IStoreRepository repo, IUnitOfWork uow, ICurrentUserService currentUser, IScopeAccessService scopeAccess, SchemeService schemeService, Route.IRouteRepository routeRepo)
+public class StoreService(IStoreRepository repo, IUnitOfWork uow, ICurrentUserService currentUser, IScopeAccessService scopeAccess, SchemeService schemeService)
 {
     private const int GlobalScopeRoleLevel = 50;
     private const int CreditApproverRoleLevel = 20;
@@ -15,30 +14,30 @@ public class StoreService(IStoreRepository repo, IUnitOfWork uow, ICurrentUserSe
 
     private async Task<bool> HasStoreScopeAsync(Guid storeId)
     {
-        //if (HasGlobalScope || currentUser.UserId is null) return HasGlobalScope;
-        //return await scopeAccess.HasStoreScopeAsync(currentUser.UserId.Value, storeId);
-        return true;
+        if (HasGlobalScope || currentUser.UserId is null) return HasGlobalScope;
+        return await scopeAccess.HasStoreScopeAsync(currentUser.UserId.Value, storeId);
     }
 
     private static StoreResponse ToResponse(Models.Store s) =>
         new(s.Id, s.FK_RouteId, s.OwnerName, s.StoreName, s.StoreAddress, s.Latitude, s.Longitude, s.OneTimeAmount, s.CreditAmount,
             s.CreditLimit, s.OutstandingBalance, s.Segment, s.KycStatus, s.IsActive, s.CreatedAt);
 
-    public async Task<PagedResponse<StoreResponse>> GetAllAsync(
-        Guid? routeId, KycStatus? kycStatus, string? search, int page, int pageSize)
+    public async Task<List<StoreResponse>> GetAllAsync()
     {
-        // Deactivated stores stay visible in the list showing Inactive — deactivate never
-        // removes the row, only marks it (same rule as Orders, see testbug.md #42).
-        var total = await repo.GetCountAsync(routeId, kycStatus, search);
-        var stores = await repo.GetAllAsync(routeId, kycStatus, search, page, pageSize);
-        return new PagedResponse<StoreResponse>(page, pageSize, total, stores.Select(ToResponse).ToList());
+        var stores = (await repo.GetAllAsync()).Where(s => s.IsActive).ToList();
+        if (!HasGlobalScope && currentUser.UserId is not null)
+        {
+            var accessibleStoreIds = (await scopeAccess.GetAccessibleStoreIdsAsync(currentUser.UserId.Value)).ToHashSet();
+            stores = stores.Where(s => accessibleStoreIds.Contains(s.Id)).ToList();
+        }
+        return stores.Select(ToResponse).ToList();
     }
 
     public async Task<StoreResponse?> GetByIdAsync(Guid id)
     {
         var store = await repo.GetByIdAsync(id);
-        if (store is null) return null;
-        //if (!await HasStoreScopeAsync(id)) return null;
+        if (store is null || !store.IsActive) return null;
+        if (!await HasStoreScopeAsync(id)) return null;
         return ToResponse(store);
     }
 
@@ -72,7 +71,7 @@ public class StoreService(IStoreRepository repo, IUnitOfWork uow, ICurrentUserSe
     public async Task<StoreResponse?> UpdateAsync(Guid id, UpdateStoreRequest request, CancellationToken ct = default)
     {
         var store = await repo.GetByIdAsync(id);
-        if (store is null) return null;
+        if (store is null || !store.IsActive) return null;
         if (!await HasStoreScopeAsync(id)) return null;
         store.FK_RouteId = request.RouteId;
         store.OwnerName = request.OwnerName;
@@ -82,7 +81,6 @@ public class StoreService(IStoreRepository repo, IUnitOfWork uow, ICurrentUserSe
         store.Longitude = request.Longitude;
         store.OneTimeAmount = request.OneTimeAmount;
         store.CreditAmount = request.CreditAmount;
-        store.IsActive = request.IsActive;
         await uow.BeginAsync(ct);
         try
         {
@@ -206,39 +204,13 @@ public class StoreService(IStoreRepository repo, IUnitOfWork uow, ICurrentUserSe
         return ToResponse(store);
     }
 
-    public async Task<StoreResponse?> SetActiveStatusAsync(Guid id, bool isActive, CancellationToken ct = default)
-    {
-        var store = await repo.GetByIdAsync(id);
-        if (store is null) return null;
-        if (!await HasStoreScopeAsync(id)) return null;
-
-        store.IsActive = isActive;
-
-        await uow.BeginAsync(ct);
-        try
-        {
-            repo.Update(store);
-            await uow.CommitAsync(ct);
-        }
-        catch
-        {
-            await uow.RollbackAsync(ct);
-            throw;
-        }
-        return ToResponse(store);
-    }
-
     public async Task<List<StoreVisitHistoryItem>?> GetVisitHistoryAsync(Guid id)
     {
         var store = await repo.GetByIdAsync(id);
-        if (store is null) return null;
+        if (store is null || !store.IsActive) return null;
         if (!await HasStoreScopeAsync(id)) return null;
-
-        var visits = await routeRepo.GetVisitsByStoreIdAsync(id);
-        return visits
-            .OrderByDescending(v => v.CheckInAt)
-            .Select(v => new StoreVisitHistoryItem(v.Id, v.CheckInAt, v.FK_UserId, v.CheckOutAt is null ? "In Progress" : "Completed"))
-            .ToList();
+        // Wired to Step 11 (Route & Sales Management) once ride/visit tracking exists.
+        return [];
     }
 
     public async Task<SchemeEligibilityResponse?> CheckSchemeEligibilityAsync(Guid id, Guid schemeId)

Distribution/Features/Supplier/SupplierDTOs.cs

@@ -2,7 +2,7 @@ namespace Distribution.Features.Supplier;
 
 public record CreateSupplierRequest(string Name, string? ContactInfo);
 
-public record UpdateSupplierRequest(string Name, string? ContactInfo, bool IsActive);
+public record UpdateSupplierRequest(string Name, string? ContactInfo);
 
 public record SupplierResponse(
     Guid Id,

Distribution/Features/Supplier/SupplierRepository.cs

@@ -9,7 +9,7 @@ public class SupplierRepository(AppDBContext context) : ISupplierRepository
         await context.Suppliers.FindAsync(id);
 
     public async Task<List<Models.Supplier>> GetAllAsync() =>
-        await context.Suppliers.ToListAsync();
+        await context.Suppliers.Where(s => s.IsActive).ToListAsync();
 
     public async Task AddAsync(Models.Supplier entity) =>
         await context.Suppliers.AddAsync(entity);

Distribution/Features/Supplier/SupplierService.cs

@@ -19,7 +19,8 @@ public class SupplierService(
     public async Task<SupplierResponse?> GetByIdAsync(Guid id)
     {
         var supplier = await repo.GetByIdAsync(id);
-        return supplier is null ? null : Map(supplier);
+        if (supplier is null || !supplier.IsActive) return null;
+        return Map(supplier);
     }
 
     public async Task<SupplierResponse> CreateAsync(CreateSupplierRequest request, CancellationToken ct = default)
@@ -40,11 +41,10 @@ public class SupplierService(
     public async Task<SupplierResponse?> UpdateAsync(Guid id, UpdateSupplierRequest request, CancellationToken ct = default)
     {
         var supplier = await repo.GetByIdAsync(id);
-        if (supplier is null) return null;
+        if (supplier is null || !supplier.IsActive) return null;
 
         supplier.Name = request.Name;
         supplier.ContactInfo = request.ContactInfo;
-        supplier.IsActive = request.IsActive;
 
         await uow.BeginAsync(ct);
         try { repo.Update(supplier); await uow.CommitAsync(ct); }