OSOE-693: Display and send warnings also when 80 and 90% of the e-mail quota is reached

Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs

@@ -13,7 +13,7 @@ public static class TestCaseUITestContextExtensions
 {
     private const string SuccessfulSubject = "Successful test message";
     private const string UnSuccessfulSubject = "Unsuccessful test message";
-    private const string WarningSubject = "[Warning] Your DotNest site has used";
+    private const string WarningSubject = "[Warning] Your site has used";
     private const string DashboardExceededMessage =
         "//p[contains(@class,'alert-danger')][contains(.,'It seems that your site sent out more e-mails')]";
 
@@ -36,21 +36,22 @@ public static async Task TestEmailQuotaManagementBehaviorAsync(
             await SendTestEmailAsync(context, SuccessfulSubject);
             context.SuccessMessageExists();
             CheckEmailsSentWarningMessage(context, exists: moduleShouldInterfere, maximumEmailQuota, i + 1);
-            var warningLevel = Convert.ToInt32((double)(i + 1) / maximumEmailQuota * 100) / 10 * 10;
+            var warningLevel = Convert.ToInt32(Math.Round((double)(i + 1) / maximumEmailQuota * 100, 0));
+
             if (!moduleShouldInterfere) continue;
 
             if (warningLevel >= 100)
             {
                 await context.GoToDashboardAsync();
-                context.CheckExistence(By.XPath(DashboardExceededMessage), exists: moduleShouldInterfere);
+                context.CheckExistence(By.XPath(DashboardExceededMessage), exists: true);
             }
             else if (warningLevel >= 80)
             {
                 await context.GoToDashboardAsync();
                 context.CheckExistence(
                     By.XPath($"//p[contains(@class,'alert-warning')]" +
                         $"[contains(.,'It seems that your site sent out {warningLevel.ToTechnicalString()}% of e-mail')]"),
-                    exists: moduleShouldInterfere);
+                    exists: true);
                 if (!warningEmails.Contains(warningLevel))
                 {
                     warningEmails.Add(warningLevel);
@@ -62,12 +63,12 @@ public static async Task TestEmailQuotaManagementBehaviorAsync(
         await context.GoToSmtpWebUIAsync();
         context.CheckExistence(ByHelper.SmtpInboxRow(SuccessfulSubject), exists: true);
         context.CheckExistence(
-            ByHelper.SmtpInboxRow("[Action Required] Your DotNest site has run over its e-mail quota"),
+            ByHelper.SmtpInboxRow("[Action Required] Your site has run over its e-mail quota"),
             exists: moduleShouldInterfere);
         var warningMessageExists = context.CheckExistence(
             ByHelper.SmtpInboxRow(WarningSubject),
             exists: moduleShouldInterfere);
-        if (warningMessageExists)
+        if (moduleShouldInterfere && warningMessageExists)
         {
             (context.GetAll(
                 ByHelper.SmtpInboxRow(WarningSubject)).Count == warningEmails.Count)

Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailQuotaErrorFilter.cs → Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/DashboardQuotaFilter.cs

@@ -9,20 +9,20 @@
 
 namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Filters;
 
-public class EmailQuotaErrorFilter : IAsyncResultFilter
+public class DashboardQuotaFilter : IAsyncResultFilter
 {
     private readonly IShapeFactory _shapeFactory;
     private readonly ILayoutAccessor _layoutAccessor;
-    private readonly IQuotaService _quotaService;
+    private readonly IEmailQuotaService _emailQuotaService;
 
-    public EmailQuotaErrorFilter(
+    public DashboardQuotaFilter(
         IShapeFactory shapeFactory,
         ILayoutAccessor layoutAccessor,
-        IQuotaService quotaService)
+        IEmailQuotaService emailQuotaService)
     {
         _shapeFactory = shapeFactory;
         _layoutAccessor = layoutAccessor;
-        _quotaService = quotaService;
+        _emailQuotaService = emailQuotaService;
     }
 
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
@@ -41,21 +41,22 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
             actionRouteArea == $"{nameof(OrchardCore)}.{nameof(OrchardCore.Admin)}" &&
             actionRouteValue is nameof(AdminController.Index) &&
             context.Result is ViewResult &&
-            _quotaService.ShouldLimitEmails())
+            _emailQuotaService.ShouldLimitEmails())
         {
             var layout = await _layoutAccessor.GetLayoutAsync();
             var contentZone = layout.Zones["Content"];
-            var currentEmailQuota = await _quotaService.IsQuotaOverTheLimitAsync();
+            var currentEmailQuota = await _emailQuotaService.IsQuotaOverTheLimitAsync();
 
-            var roundedCurrentPercentage = _quotaService.CurrentUsagePercentage(currentEmailQuota.EmailQuota) / 10 * 10;
+            var currentUsagePercentage = currentEmailQuota.EmailQuota
+                .CurrentUsagePercentage(_emailQuotaService.GetEmailQuotaPerMonth());
 
-            if (roundedCurrentPercentage >= 80)
+            if (currentUsagePercentage >= 80)
             {
                 await contentZone.AddAsync(
-                    await _shapeFactory.CreateAsync("EmailQuotaError", new
+                    await _shapeFactory.CreateAsync("DashboardQuotaMessage", new
                     {
                         currentEmailQuota.IsOverQuota,
-                        UsagePercentage = roundedCurrentPercentage,
+                        UsagePercentage = currentUsagePercentage,
                     }),
                     "0");
             }

Lombiq.Hosting.Tenants.EmailQuotaManagement/Filters/EmailSettingsQuotaFilter.cs

@@ -1,8 +1,6 @@
-using Lombiq.Hosting.Tenants.EmailQuotaManagement.Models;
 using Lombiq.Hosting.Tenants.EmailQuotaManagement.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Options;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Mvc.Core.Utilities;
@@ -15,19 +13,16 @@ public class EmailSettingsQuotaFilter : IAsyncResultFilter
 {
     private readonly IShapeFactory _shapeFactory;
     private readonly ILayoutAccessor _layoutAccessor;
-    private readonly IQuotaService _quotaService;
-    private readonly EmailQuotaOptions _emailQuotaOptions;
+    private readonly IEmailQuotaService _emailQuotaService;
 
     public EmailSettingsQuotaFilter(
         IShapeFactory shapeFactory,
         ILayoutAccessor layoutAccessor,
-        IQuotaService quotaService,
-        IOptions<EmailQuotaOptions> emailQuotaOptions)
+        IEmailQuotaService emailQuotaService)
     {
         _shapeFactory = shapeFactory;
         _layoutAccessor = layoutAccessor;
-        _quotaService = quotaService;
-        _emailQuotaOptions = emailQuotaOptions.Value;
+        _emailQuotaService = emailQuotaService;
     }
 
     public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
@@ -48,17 +43,17 @@ actionRouteValue is nameof(AdminController.Index) &&
             context.Result is ViewResult &&
             context.RouteData.Values.TryGetValue("GroupId", out var groupId) &&
             (string)groupId == "email" &&
-            _quotaService.ShouldLimitEmails())
+            _emailQuotaService.ShouldLimitEmails())
         {
             var layout = await _layoutAccessor.GetLayoutAsync();
             var contentZone = layout.Zones["Content"];
 
-            var quota = await _quotaService.GetCurrentQuotaAsync();
+            var quota = await _emailQuotaService.GetOrCreateCurrentQuotaAsync();
             await contentZone.AddAsync(
-                await _shapeFactory.CreateAsync("EmailSettingsQuota", new
+                await _shapeFactory.CreateAsync("EmailSettingsQuotaMessage", new
                 {
-                    CurrentEmailCount = quota.CurrentEmailQuotaCount,
-                    EmailQuota = _emailQuotaOptions.EmailQuotaPerMonth,
+                    quota.CurrentEmailUsageCount,
+                    EmailQuotaPerMonth = _emailQuotaService.GetEmailQuotaPerMonth(),
                 }),
                 "0");
         }

Lombiq.Hosting.Tenants.EmailQuotaManagement/Indexes/EmailQuotaIndex.cs

@@ -6,8 +6,8 @@ namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Indexes;
 
 public class EmailQuotaIndex : MapIndex
 {
-    public int CurrentEmailQuotaCount { get; set; }
-    public DateTime LastReminder { get; set; }
+    public int CurrentEmailUsageCount { get; set; }
+    public DateTime LastReminderUtc { get; set; }
     public int LastReminderPercentage { get; set; }
 }
 
@@ -17,8 +17,8 @@ public override void Describe(DescribeContext<EmailQuota> context) =>
         context.For<EmailQuotaIndex>()
             .Map(emailQuota => new EmailQuotaIndex
             {
-                CurrentEmailQuotaCount = emailQuota.CurrentEmailQuotaCount,
-                LastReminder = emailQuota.LastReminder,
+                CurrentEmailUsageCount = emailQuota.CurrentEmailUsageCount,
+                LastReminderUtc = emailQuota.LastReminderUtc,
                 LastReminderPercentage = emailQuota.LastReminderPercentage,
             });
 }

Lombiq.Hosting.Tenants.EmailQuotaManagement/Migrations/EmailQuotaMigrations.cs

@@ -10,8 +10,8 @@ public class EmailQuotaMigrations : DataMigration
     public int Create()
     {
         SchemaBuilder.CreateMapIndexTable<EmailQuotaIndex>(
-            table => table.Column<int>(nameof(EmailQuotaIndex.CurrentEmailQuotaCount))
-                .Column<DateTime>(nameof(EmailQuotaIndex.LastReminder))
+            table => table.Column<int>(nameof(EmailQuotaIndex.CurrentEmailUsageCount))
+                .Column<DateTime>(nameof(EmailQuotaIndex.LastReminderUtc))
                 .Column<int>(nameof(EmailQuotaIndex.LastReminderPercentage)));
 
         return 2;

Lombiq.Hosting.Tenants.EmailQuotaManagement/Models/EmailQuota.cs

@@ -4,7 +4,10 @@ namespace Lombiq.Hosting.Tenants.EmailQuotaManagement.Models;
 
 public class EmailQuota
 {
-    public int CurrentEmailQuotaCount { get; set; }
-    public DateTime LastReminder { get; set; }
+    public int CurrentEmailUsageCount { get; set; }
+    public DateTime LastReminderUtc { get; set; }
     public int LastReminderPercentage { get; set; }
+
+    public int CurrentUsagePercentage(int emailQuotaPerMonth) =>
+        Convert.ToInt32(Math.Round((double)CurrentEmailUsageCount / emailQuotaPerMonth * 100, 0));
 }

Lombiq.Hosting.Tenants.EmailQuotaManagement/Services/EmailQuotaResetTask.cs

@@ -13,8 +13,8 @@ public class EmailQuotaResetBackgroundTask : IBackgroundTask
 {
     public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
     {
-        var quotaService = serviceProvider.GetRequiredService<IQuotaService>();
-        var currentQuota = await quotaService.GetCurrentQuotaAsync();
-        quotaService.ResetQuota(currentQuota);
+        var emailQuotaService = serviceProvider.GetRequiredService<IEmailQuotaService>();
+        var currentQuota = await emailQuotaService.GetOrCreateCurrentQuotaAsync();
+        emailQuotaService.ResetQuota(currentQuota);
     }
 }