Admin UI: tier quota definition is not deleted from the database after removing it from a tier

Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/ITiersRepository.cs

@@ -7,5 +7,6 @@ public interface ITiersRepository
     Task<Tier?> Find(string id, CancellationToken cancellationToken, bool track = false);
     Task<TierQuotaDefinition> FindTierQuotaDefinition(string id, CancellationToken cancellationToken, bool track = false);
     Task RemoveById(TierId tierId);
+    Task RemoveTierQuotaDefinitionIfOrphaned(TierQuotaDefinitionId tierQuotaDefinitionId);
     Task Update(Tier tier, CancellationToken cancellationToken);
 }

Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TiersRepository.cs

@@ -53,8 +53,22 @@ public async Task RemoveById(TierId tierId)
         await _tiers.Where(t => t.Id == tierId).ExecuteDeleteAsync();
     }
 
+    public async Task RemoveTierQuotaDefinitionIfOrphaned(TierQuotaDefinitionId tierQuotaDefinitionId)
+    {
+        var tierQuotaDefinition = await _tierQuotaDefinitions.FirstWithId(tierQuotaDefinitionId, CancellationToken.None);
+
+        if (_dbContext.Entry(tierQuotaDefinition).Property("TierId").CurrentValue == null)
+            await _tierQuotaDefinitions.Where(t => t.Id == tierQuotaDefinitionId).ExecuteDeleteAsync();
+    }
+
     public async Task Update(Tier tier, CancellationToken cancellationToken)
     {
+        _dbContext.RemoveRange(_dbContext.ChangeTracker
+            .Entries<TierQuotaDefinition>()
+            .Where(e => e.State == EntityState.Modified)
+            .Select(e => e.Entity)
+            .ToList());
+
         _tiers.Update(tier);
         await _dbContext.SaveChangesAsync(cancellationToken);
     }

Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/AddMockTiersRepository.cs

@@ -30,6 +30,11 @@ public Task RemoveById(TierId tierId)
         throw new NotImplementedException();
     }
 
+    public Task RemoveTierQuotaDefinitionIfOrphaned(TierQuotaDefinitionId tierQuotaDefinitionId)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task Update(Tier tier, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();

Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/FindTierQuotaDefinitionsStubRepository.cs

@@ -32,6 +32,11 @@ public Task RemoveById(TierId tierId)
         throw new NotImplementedException();
     }
 
+    public Task RemoveTierQuotaDefinitionIfOrphaned(TierQuotaDefinitionId tierQuotaDefinitionId)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task Update(Tier tier, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();

Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/FindTiersStubRepository.cs

@@ -32,6 +32,11 @@ public Task RemoveById(TierId tierId)
         throw new NotImplementedException();
     }
 
+    public Task RemoveTierQuotaDefinitionIfOrphaned(TierQuotaDefinitionId tierQuotaDefinitionId)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task Update(Tier tier, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();