Merge pull request #95 from Lombiq/issue/NEST-486

NEST-486: Renaming EmailQuotaIndex columns and dropping index
Lombiq · Oct 20, 2023 · aed6627 · aed6627
2 parents 17f5dc2 + de8f5b5
commit aed6627
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 43 deletions.
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Indexes/EmailQuotaIndex.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Indexes/EmailQuotaIndex.cs
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Migrations/EmailQuotaMigrations.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Migrations/EmailQuotaMigrations.cs
@@ -1,28 +1,28 @@
-using Lombiq.Hosting.Tenants.EmailQuotaManagement.Indexes;
 using OrchardCore.Data.Migration;
-using System;
-using YesSql.Sql;
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Migrations;
 
 public class EmailQuotaMigrations : DataMigration
 {
-    public int Create()
+    // This is actually needed like this, otherwise it won't work.
+#pragma warning disable S3400
+    public int Create() => 3;
+#pragma warning restore S3400
+
+    public int UpdateFrom1()
     {
-        SchemaBuilder.CreateMapIndexTable<EmailQuotaIndex>(
-            table => table.Column<int>(nameof(EmailQuotaIndex.CurrentEmailUsageCount))
-                .Column<DateTime>(nameof(EmailQuotaIndex.LastReminderUtc))
-                .Column<int>(nameof(EmailQuotaIndex.LastReminderPercentage)));
+        SchemaBuilder.AlterTable("EmailQuotaIndex", table => table
+            .AddColumn<int>("LastReminderPercentage")
+        );
 
         return 2;
     }
 
-    public int UpdateFrom1()
+    public int UpdateFrom2()
     {
-        SchemaBuilder.AlterTable(nameof(EmailQuotaIndex), table => table
-            .AddColumn<int>(nameof(EmailQuotaIndex.LastReminderPercentage))
-        );
+        // Deleting index because it is not needed.
+        SchemaBuilder.DropTable("EmailQuotaIndex");
 
-        return 2;
+        return 3;
     }
 }
diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/EmailQuotaService.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/EmailQuotaService.cs
@@ -1,5 +1,4 @@
-using Lombiq.Hosting.Tenants.EmailQuotaManagement.Indexes;
-using Lombiq.Hosting.Tenants.EmailQuotaManagement.Models;
+using Lombiq.Hosting.Tenants.EmailQuotaManagement.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
@@ -83,7 +82,7 @@ public async Task<QuotaResult> IsQuotaOverTheLimitAsync()
 
     public async Task<EmailQuota> GetOrCreateCurrentQuotaAsync()
     {
-        var currentQuota = await _session.Query<EmailQuota, EmailQuotaIndex>().FirstOrDefaultAsync();
+        var currentQuota = await _session.Query<EmailQuota>().FirstOrDefaultAsync();
 
         if (currentQuota != null) return currentQuota;
 

diff --git a/Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs b/Lombiq.Hosting.Tenants.EmailQuotaManagement/Startup.cs
@@ -1,6 +1,5 @@
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Constants;
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Filters;
-using Lombiq.Hosting.Tenants.EmailQuotaManagement.Indexes;
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Migrations;
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Models;
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Services;
@@ -12,7 +11,6 @@
 using OrchardCore.Email;
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Modules;
-using YesSql.Indexes;
 using static Lombiq.Hosting.Tenants.EmailQuotaManagement.Constants.EmailQuotaOptionsConstants;
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement;
@@ -28,7 +26,6 @@ public Startup(IShellConfiguration shellConfiguration) =>
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddDataMigration<EmailQuotaMigrations>();
-        services.AddSingleton<IIndexProvider, EmailQuotaIndexProvider>();
         services.AddSingleton<IBackgroundTask, EmailQuotaResetBackgroundTask>();
 
         services.Configure<EmailQuotaOptions>(options =>