Use ActivatorUtilities to create instance with Dependency Injection support (#44)

Author: Invvard

src/Controllers/TestSetupController.cs

@@ -23,13 +23,14 @@ public TestSetupController(ITestSetup testSetup, ILogger<TestSetupController> lo
     /// </summary>
     /// <returns>A list of test data for IFTTT to use.</returns>
     [HttpPost]
-    [Consumes("application/x-www-form-urlencoded", "application/json")]
-    [Produces("application/json")]
-    public async Task<IActionResult> SetupTest()
+    [ProducesResponseType(StatusCodes.Status200OK),
+     ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [Consumes("application/x-www-form-urlencoded")]
+    public async Task<IActionResult> SetupTest(CancellationToken cancellationToken)
     {
         try
         {
-            var processors = await testSetup.PrepareSetupListing();
+            var processors = await testSetup.PrepareSetupListing(cancellationToken);
 
             var samples = new SamplesPayload(processors);
             samples.SkimEmptyProcessors();
@@ -44,7 +45,7 @@ public async Task<IActionResult> SetupTest()
 
             var errorMessages = TopLevelErrorModel.Serialize(new[] { new ErrorMessage($"Error while setting up test: {ex.Message}") });
 
-            return Problem(errorMessages);
+            return BadRequest(errorMessages);
         }
     }
 }

src/Controllers/TriggerController.cs

@@ -15,10 +15,9 @@ public class TriggerController([FromKeyedServices(ProcessorKind.Trigger)] IProce
     /// <param name="triggerSlug">The trigger slug that is executed.</param>
     /// <param name="triggerRequest">The request parameters.</param>
     [HttpPost("{triggerSlug}")]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Consumes("application/json")]
-    [Produces("application/json")]
+    [ProducesResponseType(StatusCodes.Status200OK),
+     ProducesResponseType(StatusCodes.Status404NotFound)]
+    [Consumes("application/json"), Produces("application/json")]
     public async Task<IActionResult> ExecuteTrigger(string triggerSlug, TriggerRequest triggerRequest)
     {
         if (await triggerService.GetProcessorInstance<ITrigger>(triggerSlug) is not { } trigger)
@@ -28,6 +27,6 @@ public async Task<IActionResult> ExecuteTrigger(string triggerSlug, TriggerReque
 
         var result = await trigger.ExecuteAsync(triggerRequest);
 
-        return Ok(result.Serialize());
+        return Ok(result);
     }
 }

src/InvvardDev.Ifttt.csproj

@@ -26,7 +26,7 @@
         <PackageId>$(AssemblyName)</PackageId>
 
         <AssemblyName>InvvardDev.Ifttt</AssemblyName>
-        <VersionPrefix>0.1.13</VersionPrefix>
+        <VersionPrefix>0.1.14</VersionPrefix>
         <PackageVersion>$(Version)</PackageVersion>
 
         <Title>IFTTT.NET package</Title>

src/Services/ProcessorService.cs

@@ -4,7 +4,7 @@
 
 namespace InvvardDev.Ifttt.Services;
 
-internal abstract class ProcessorService(IProcessorRepository processorRepository) : IProcessorService
+internal abstract class ProcessorService(IProcessorRepository processorRepository, IServiceProvider serviceProvider) : IProcessorService
 {
     protected abstract ProcessorKind Kind { get; }
 
@@ -16,7 +16,7 @@ public async Task AddOrUpdateProcessor(ProcessorTree processorTree)
                    { } existingProcessorTree when existingProcessorTree.ProcessorType == processorTree.ProcessorType
                        => processorRepository.UpdateProcessor(processorTree),
                    { } pt when pt.ProcessorType != processorTree.ProcessorType
-                       => throw new InvalidOperationException($"Conflict: '{pt.Kind}' processor with slug '{pt.ProcessorSlug}' already exists (Type is '{pt.ProcessorType}')."),
+                       => throw new InvalidOperationException($"Conflict: '{pt.Kind}' processor with slug '{pt.ProcessorSlug}' already exists with '{pt.ProcessorType}' type."),
                    _ => throw new ArgumentOutOfRangeException(nameof(processorTree))
                });
     }
@@ -60,11 +60,11 @@ public Task<bool> Exists(string processorSlug)
     public async Task<TInterface?> GetProcessorInstance<TInterface>(string processorSlug)
     {
         if (await GetProcessor(processorSlug) is { } processorTree
-            && Activator.CreateInstance(processorTree.ProcessorType) is TInterface processor)
+            && ActivatorUtilities.CreateInstance(serviceProvider, processorTree.ProcessorType) is TInterface processor)
         {
             return processor;
         }
 
         return default;
     }
-}
+}

src/Services/TriggerService.cs

@@ -3,7 +3,7 @@
 
 namespace InvvardDev.Ifttt.Services;
 
-internal class TriggerService(IProcessorRepository processorRepository) : ProcessorService(processorRepository)
+internal class TriggerService(IProcessorRepository processorRepository, IServiceProvider serviceProvider) : ProcessorService(processorRepository, serviceProvider)
 {
     protected override ProcessorKind Kind => ProcessorKind.Trigger;
-}
+}

src/Toolkit/Contracts/ITestSetup.cs

@@ -8,6 +8,7 @@ public interface ITestSetup
     /// <summary>
     /// Prepares the setup listing for IFTTT to use for testing.
     /// </summary>
+    /// <param name="cancellationToken"></param>
     /// <returns>The list of processors to be tested.</returns>
-    Task<ProcessorPayload> PrepareSetupListing();
+    Task<ProcessorPayload> PrepareSetupListing(CancellationToken cancellationToken);
 }

tests/InvvardDev.Ifttt.TestFactories/Triggers/ProcessorTreeFactory.cs

@@ -9,5 +9,7 @@ public class ProcessorTreeFactory : EntityFactoryBase<ProcessorTree>
 {
     protected override Faker<ProcessorTree> Configure()
         => new Faker<ProcessorTree>()
-            .CustomInstantiator(f => new ProcessorTree(f.Random.Words(2), default!, f.PickRandom<ProcessorKind>()));
+            .CustomInstantiator(f => new ProcessorTree(f.Random.Words(2),
+                                                       TriggerClassFactory.MatchingClass(),
+                                                       f.PickRandom<ProcessorKind>()));
 }

tests/InvvardDev.Ifttt.Tests/Controllers/TestSetupControllerTests.cs

@@ -30,7 +30,7 @@ public async Task SetupTest_WhenThereIsNoProcessor_ShouldReturn200OKWithEmptySam
         // Arrange
         var testSetup = Mock.Of<ITestSetup>();
         Mock.Get(testSetup)
-            .Setup(x => x.PrepareSetupListing())
+            .Setup(x => x.PrepareSetupListing(It.IsAny<CancellationToken>()))
             .ReturnsAsync(new ProcessorPayload());
 
         var logger = Mock.Of<ILogger<TestSetupController>>();
@@ -41,7 +41,7 @@ public async Task SetupTest_WhenThereIsNoProcessor_ShouldReturn200OKWithEmptySam
         expectedBody.Data.SkimEmptyProcessors();
 
         // Act
-        var result = await sut.SetupTest();
+        var result = await sut.SetupTest(CancellationToken.None);
 
         // Assert
         result.Should().NotBeNull()
@@ -55,7 +55,7 @@ public async Task SetupTest_WhenProcessorHasNoDataField_ShouldReturn200OKWithEmp
         // Arrange
         var testSetup = Mock.Of<ITestSetup>();
         Mock.Get(testSetup)
-            .Setup(x => x.PrepareSetupListing())
+            .Setup(x => x.PrepareSetupListing(It.IsAny<CancellationToken>()))
             .ReturnsAsync(new ProcessorPayload() { Triggers = new Processors().AddProcessor("test") });
 
         var logger = Mock.Of<ILogger<TestSetupController>>();
@@ -66,7 +66,7 @@ public async Task SetupTest_WhenProcessorHasNoDataField_ShouldReturn200OKWithEmp
         expectedBody.Data.SkimEmptyProcessors();
 
         // Act
-        var result = await sut.SetupTest();
+        var result = await sut.SetupTest(CancellationToken.None);
 
         // Assert
         result.Should().NotBeNull()
@@ -82,7 +82,7 @@ public async Task SetupTest_WhenThereIsAnException_ShouldReturn500InternalServer
         const string exceptionMessage = "exception message";
         var testSetup = Mock.Of<ITestSetup>();
         Mock.Get(testSetup)
-            .Setup(x => x.PrepareSetupListing())
+            .Setup(x => x.PrepareSetupListing(It.IsAny<CancellationToken>()))
             .ThrowsAsync(new Exception(exceptionMessage));
 
         var logger = Mock.Of<ILogger<TestSetupController>>();
@@ -93,7 +93,7 @@ public async Task SetupTest_WhenThereIsAnException_ShouldReturn500InternalServer
         var expectedErrorJson = JsonSerializer.Serialize(expectedError, JsonSerializerOptions);
 
         // Act
-        var result = await sut.SetupTest();
+        var result = await sut.SetupTest(CancellationToken.None);
 
         // Assert
         Mock.Get(logger).VerifyLog(l => l.LogError(It.IsAny<Exception>(), expectedErrorMessage), Times.Once());
@@ -117,7 +117,7 @@ public async Task SetupTest_WhenProcessorHasDataFields_ShouldReturn200OKWithSamp
         var triggerProcessor = new Processors().AddProcessor("test").AddDataField("test", "data_field_slug", "testData");
         var expectedProcessorPayload = new ProcessorPayload() { Triggers = triggerProcessor };
         Mock.Get(testSetup)
-            .Setup(x => x.PrepareSetupListing())
+            .Setup(x => x.PrepareSetupListing(It.IsAny<CancellationToken>()))
             .ReturnsAsync(expectedProcessorPayload);
 
         var logger = Mock.Of<ILogger<TestSetupController>>();
@@ -127,7 +127,7 @@ public async Task SetupTest_WhenProcessorHasDataFields_ShouldReturn200OKWithSamp
         var expectedBody = new TopLevelMessageModel<SamplesPayload>(new SamplesPayload(expectedProcessorPayload));
 
         // Act
-        var result = await sut.SetupTest();
+        var result = await sut.SetupTest(CancellationToken.None);
 
         // Assert
         result.Should().NotBeNull()

tests/InvvardDev.Ifttt.Tests/Services/ProcessorRepositoryTests.cs

@@ -23,11 +23,12 @@ public async Task AddProcessor_AddsProcessorSuccessfully()
     public async Task UpdateProcessor_WhenProcessorExists_UpdatesProcessorSuccessfully()
     {
         // Arrange
-        var sut = new ProcessorRepository();
         var processorTree = Given.A<ProcessorTree>();
+
+        var sut = new ProcessorRepository();
         await sut.AddProcessor(processorTree);
 
-        var updatedProcessorTree = Given.A<ProcessorTree>()with { ProcessorSlug = processorTree.ProcessorSlug, Kind = processorTree.Kind };
+        var updatedProcessorTree = Given.A<ProcessorTree>() with { ProcessorSlug = processorTree.ProcessorSlug, Kind = processorTree.Kind };
 
         // Act
         await sut.UpdateProcessor(updatedProcessorTree);