Fix Notify registrations for Worker (#1009)

DFE-Digital · Dec 18, 2023 · 94fa550 · 94fa550
1 parent e2087f7
commit 94fa550
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 36 deletions.
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs
@@ -21,7 +21,6 @@
 using TeachingRecordSystem.Core.Infrastructure;
 using TeachingRecordSystem.Core.Services.Certificates;
 using TeachingRecordSystem.Core.Services.GetAnIdentityApi;
-using TeachingRecordSystem.Core.Services.Notify;
 using TeachingRecordSystem.Core.Services.TrnGenerationApi;
 using TeachingRecordSystem.ServiceDefaults;
 
@@ -188,7 +187,6 @@ public static void Main(string[] args)
         services.AddIdentityApi(configuration, env);
         services.AddAccessYourTeachingQualificationsOptions(configuration, env);
         services.AddCertificateGeneration();
-        services.AddEmail(env, configuration);
         services.AddCrmQueries();
 
         if (!env.IsUnitTests())

diff --git a/...dSystem/src/TeachingRecordSystem.Core/Services/Notify/HostApplicationBuilderExtensions.cs b/...dSystem/src/TeachingRecordSystem.Core/Services/Notify/HostApplicationBuilderExtensions.cs
@@ -0,0 +1,27 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace TeachingRecordSystem.Core.Services.Notify;
+
+public static class HostApplicationBuilderExtensions
+{
+    public static IHostApplicationBuilder AddEmail(this IHostApplicationBuilder builder)
+    {
+        if (builder.Environment.IsProduction())
+        {
+            builder.Services.AddOptions<NotifyOptions>()
+                .Bind(builder.Configuration.GetSection("Notify"))
+                .ValidateDataAnnotations()
+                .ValidateOnStart();
+
+            builder.Services.AddSingleton<INotificationSender, NotificationSender>();
+        }
+        else
+        {
+            builder.Services.AddSingleton<INotificationSender, NoopNotificationSender>();
+        }
+
+        return builder;
+    }
+}
diff --git a/...RecordSystem/src/TeachingRecordSystem.Core/Services/Notify/ServiceCollectionExtensions.cs b/...RecordSystem/src/TeachingRecordSystem.Core/Services/Notify/ServiceCollectionExtensions.cs
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs
@@ -9,6 +9,7 @@
 using TeachingRecordSystem.Core.Infrastructure.Configuration;
 using TeachingRecordSystem.Core.Jobs;
 using TeachingRecordSystem.Core.Services.DqtReporting;
+using TeachingRecordSystem.Core.Services.Notify;
 using TeachingRecordSystem.Core.Services.TrnGenerationApi;
 using TeachingRecordSystem.Core.Services.TrsDataSync;
 using TeachingRecordSystem.Hosting;
@@ -33,7 +34,8 @@
     .AddTrsSyncService()
     .AddHangfire()
     .AddBackgroundJobs()
-    .AddBackgroundWorkScheduler();
+    .AddBackgroundWorkScheduler()
+    .AddEmail();
 
 var crmServiceClient = new ServiceClient(builder.Configuration.GetRequiredValue("ConnectionStrings:Crm"))
 {