refactor: 移除门店跨租户访问入口

src/Infrastructure/TakeoutSaaS.Infrastructure/App/Repositories/EfStoreRepository.cs

@@ -19,19 +19,9 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public Task<Store?> FindByIdAsync(long storeId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.Stores.AsNoTracking();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        return query
-            .Where(x => x.Id == storeId)
+        return context.Stores
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.Id == storeId)
             .FirstOrDefaultAsync(cancellationToken);
     }
 
@@ -54,19 +44,11 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
         StoreBusinessStatus? businessStatus,
         StoreOwnershipType? ownershipType,
         string? keyword,
-        bool ignoreTenantFilter = false,
         CancellationToken cancellationToken = default)
     {
-        var query = context.Stores.AsNoTracking();
-        if (ignoreTenantFilter)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
+        var query = context.Stores
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId);
 
         if (merchantId.HasValue)
         {
@@ -144,22 +126,16 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     }
 
     /// <inheritdoc />
-    public async Task<Dictionary<long, int>> GetStoreCountsAsync(long? tenantId, IReadOnlyCollection<long> merchantIds, CancellationToken cancellationToken = default)
+    public async Task<Dictionary<long, int>> GetStoreCountsAsync(long tenantId, IReadOnlyCollection<long> merchantIds, CancellationToken cancellationToken = default)
     {
         if (merchantIds.Count == 0)
         {
             return new Dictionary<long, int>();
         }
 
-        var query = context.Stores.AsNoTracking();
-        if (!tenantId.HasValue || tenantId.Value <= 0)
-        {
-            query = query.IgnoreQueryFilters();
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId.Value);
-        }
+        var query = context.Stores
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId);
 
         return await query
             .Where(x => merchantIds.Contains(x.MerchantId))
@@ -171,19 +147,9 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public async Task<IReadOnlyList<StoreBusinessHour>> GetBusinessHoursAsync(long storeId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreBusinessHours.AsNoTracking();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        var hours = await query
-            .Where(x => x.StoreId == storeId)
+        var hours = await context.StoreBusinessHours
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.StoreId == storeId)
             .OrderBy(x => x.DayOfWeek)
             .ThenBy(x => x.StartTime)
             .ToListAsync(cancellationToken);
@@ -194,19 +160,9 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public Task<StoreFee?> GetStoreFeeAsync(long storeId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreFees.AsNoTracking();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        return query
-            .Where(x => x.StoreId == storeId)
+        return context.StoreFees
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.StoreId == storeId)
             .FirstOrDefaultAsync(cancellationToken);
     }
 
@@ -226,19 +182,9 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public async Task<IReadOnlyList<StoreQualification>> GetQualificationsAsync(long storeId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreQualifications.AsNoTracking();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        var qualifications = await query
-            .Where(x => x.StoreId == storeId)
+        var qualifications = await context.StoreQualifications
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.StoreId == storeId)
             .OrderBy(x => x.SortOrder)
             .ThenBy(x => x.QualificationType)
             .ToListAsync(cancellationToken);
@@ -307,19 +253,9 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public async Task<IReadOnlyList<StoreDeliveryZone>> GetDeliveryZonesAsync(long storeId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreDeliveryZones.AsNoTracking();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        var zones = await query
-            .Where(x => x.StoreId == storeId)
+        var zones = await context.StoreDeliveryZones
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.StoreId == storeId)
             .OrderBy(x => x.SortOrder)
             .ToListAsync(cancellationToken);
 
@@ -329,38 +265,17 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public Task<StoreDeliveryZone?> FindDeliveryZoneByIdAsync(long deliveryZoneId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreDeliveryZones.AsQueryable();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        return query
-            .Where(x => x.Id == deliveryZoneId)
+        return context.StoreDeliveryZones
+            .Where(x => x.TenantId == tenantId && x.Id == deliveryZoneId)
             .FirstOrDefaultAsync(cancellationToken);
     }
 
     /// <inheritdoc />
     public async Task<IReadOnlyList<StoreHoliday>> GetHolidaysAsync(long storeId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreHolidays.AsNoTracking();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        var holidays = await query
-            .Where(x => x.StoreId == storeId)
+        var holidays = await context.StoreHolidays
+            .AsNoTracking()
+            .Where(x => x.TenantId == tenantId && x.StoreId == storeId)
             .OrderBy(x => x.Date)
             .ToListAsync(cancellationToken);
 
@@ -370,19 +285,8 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public Task<StoreHoliday?> FindHolidayByIdAsync(long holidayId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreHolidays.AsQueryable();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        return query
-            .Where(x => x.Id == holidayId)
+        return context.StoreHolidays
+            .Where(x => x.TenantId == tenantId && x.Id == holidayId)
             .FirstOrDefaultAsync(cancellationToken);
     }
 
@@ -626,19 +530,8 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public async Task DeleteDeliveryZoneAsync(long deliveryZoneId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreDeliveryZones.AsQueryable();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        var existing = await query
-            .Where(x => x.Id == deliveryZoneId)
+        var existing = await context.StoreDeliveryZones
+            .Where(x => x.TenantId == tenantId && x.Id == deliveryZoneId)
             .FirstOrDefaultAsync(cancellationToken);
 
         if (existing != null)
@@ -650,19 +543,8 @@ public sealed class EfStoreRepository(TakeoutAppDbContext context) : IStoreRepos
     /// <inheritdoc />
     public async Task DeleteHolidayAsync(long holidayId, long tenantId, CancellationToken cancellationToken = default)
     {
-        var query = context.StoreHolidays.AsQueryable();
-        if (tenantId <= 0)
-        {
-            query = query.IgnoreQueryFilters()
-                .Where(x => x.DeletedAt == null);
-        }
-        else
-        {
-            query = query.Where(x => x.TenantId == tenantId);
-        }
-
-        var existing = await query
-            .Where(x => x.Id == holidayId)
+        var existing = await context.StoreHolidays
+            .Where(x => x.TenantId == tenantId && x.Id == holidayId)
             .FirstOrDefaultAsync(cancellationToken);
 
         if (existing != null)