Reorganize

source/ProcessManager.Core/Application/Orchestration/ICancelScheduledOrchestrationInstanceCommand.cs

@@ -0,0 +1,25 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
+
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
+
+public interface ICancelScheduledOrchestrationInstanceCommand
+{
+    /// <summary>
+    /// Cancel a scheduled orchestration instance.
+    /// </summary>
+    Task CancelScheduledOrchestrationInstanceAsync(OrchestrationInstanceId id);
+}

source/ProcessManager.Core/Application/IOrchestrationInstanceExecutor.cs → source/ProcessManager.Core/Application/Orchestration/IOrchestrationInstanceExecutor.cs

@@ -15,12 +15,12 @@
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
 /// <summary>
 /// Abstracts the execution of orchestration instances from technology specific implementations.
 /// </summary>
-public interface IOrchestrationInstanceExecutor
+internal interface IOrchestrationInstanceExecutor
 {
     /// <summary>
     /// Start a new orchestration instance.

source/ProcessManager.Core/Application/IOrchestrationInstanceProgressRepository.cs → source/ProcessManager.Core/Application/Orchestration/IOrchestrationInstanceProgressRepository.cs

@@ -14,7 +14,7 @@
 
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
 /// <summary>
 /// Use this from Durable Functions activities to get the orchestration instance and then

source/ProcessManager.Core/Application/Orchestration/IOrchestrationInstanceQueries.cs

@@ -0,0 +1,38 @@
+// Copyright 2020 Energinet DataHub A/S
+//
+// Licensed under the Apache License, Version 2.0 (the "License2");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
+using NodaTime;
+
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
+
+public interface IOrchestrationInstanceQueries
+{
+    /// <summary>
+    /// Get existing orchestration instance.
+    /// </summary>
+    Task<OrchestrationInstance> GetAsync(OrchestrationInstanceId id);
+
+    /// <summary>
+    /// Get all orchestration instances filtered by their related orchestration definition name and version,
+    /// and their lifecycle / termination states.
+    /// </summary>
+    Task<IReadOnlyCollection<OrchestrationInstance>> SearchAsync(
+        string name,
+        int? version,
+        OrchestrationInstanceLifecycleStates? lifecycleState,
+        OrchestrationInstanceTerminationStates? terminationState,
+        Instant? startedAtOrLater,
+        Instant? terminatedAtOrEarlier);
+}

source/ProcessManager.Core/Application/IOrchestrationInstanceRepository.cs → source/ProcessManager.Core/Application/Orchestration/IOrchestrationInstanceRepository.cs

@@ -15,9 +15,9 @@
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using NodaTime;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
-public interface IOrchestrationInstanceRepository
+internal interface IOrchestrationInstanceRepository
 {
     /// <summary>
     /// Use <see cref="IUnitOfWork.CommitAsync"/> to save changes.

source/ProcessManager.Core/Application/IOrchestrationRegisterQueries.cs → source/ProcessManager.Core/Application/Orchestration/IOrchestrationRegisterQueries.cs

@@ -14,12 +14,12 @@
 
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
 /// <summary>
 /// Readonly access to the orchestration register.
 /// </summary>
-public interface IOrchestrationRegisterQueries
+internal interface IOrchestrationRegisterQueries
 {
     Task<OrchestrationDescription> GetAsync(OrchestrationDescriptionId id);
 

source/ProcessManager.Core/Application/IOrchestrationInstanceManager.cs → source/ProcessManager.Core/Application/Orchestration/IStartOrchestrationInstanceCommands.cs

@@ -15,9 +15,9 @@
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using NodaTime;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
-public interface IOrchestrationInstanceManager
+public interface IStartOrchestrationInstanceCommands
 {
     /// <summary>
     /// Start a new instance of an orchestration.
@@ -39,9 +39,4 @@ Task<OrchestrationInstanceId> ScheduleNewOrchestrationInstanceAsync<TParameter>(
         Instant runAt,
         IReadOnlyCollection<int> skipStepsBySequence)
             where TParameter : class;
-
-    /// <summary>
-    /// Cancel a scheduled orchestration instance.
-    /// </summary>
-    Task CancelScheduledOrchestrationInstanceAsync(OrchestrationInstanceId id);
 }

source/ProcessManager.Core/Application/IUnitOfWork.cs → source/ProcessManager.Core/Application/Orchestration/IUnitOfWork.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
 public interface IUnitOfWork
 {

source/ProcessManager.Core/Application/OrchestrationInstanceManager.cs → source/ProcessManager.Core/Application/Orchestration/OrchestrationInstanceManager.cs

@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using Energinet.DataHub.ProcessManagement.Core.Application.Scheduling;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using NodaTime;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 
 /// <summary>
 /// An manager that allows us to provide a framework for managing orchestration instances
@@ -27,8 +28,9 @@ internal class OrchestrationInstanceManager(
     IOrchestrationInstanceExecutor executor,
     IOrchestrationRegisterQueries orchestrationRegister,
     IOrchestrationInstanceRepository repository) :
-        IOrchestrationInstanceManager,
-        IOrchestrationInstanceScheduleManager
+        IStartOrchestrationInstanceCommands,
+        IStartScheduledOrchestrationInstanceCommand,
+        ICancelScheduledOrchestrationInstanceCommand
 {
     private readonly IClock _clock = clock;
     private readonly IOrchestrationInstanceExecutor _executor = executor;

source/ProcessManager.Core/Application/IOrchestrationRegister.cs → source/ProcessManager.Core/Application/Registration/IOrchestrationRegister.cs

@@ -14,12 +14,12 @@
 
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Registration;
 
 /// <summary>
 /// Read/write access to the orchestration register.
 /// </summary>
-public interface IOrchestrationRegister
+internal interface IOrchestrationRegister
 {
     Task<IReadOnlyCollection<OrchestrationDescription>> GetAllByHostNameAsync(string hostName);
 

source/ProcessManager.Core/Application/OrchestrationRegisterExtensions.cs → source/ProcessManager.Core/Application/Registration/OrchestrationRegisterExtensions.cs

@@ -14,9 +14,9 @@
 
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Registration;
 
-public static class OrchestrationRegisterExtensions
+internal static class OrchestrationRegisterExtensions
 {
     /// <summary>
     /// Synchronize the orchestration register with the Durable Functions orchestrations for an application host.
@@ -58,9 +58,7 @@ public static async Task SynchronizeAsync(
                     && x.Version == hostDescription.Version);
 
             if (registerDescription == null || registerDescription.IsEnabled == false)
-            {
                 await register.RegisterAsync(hostDescription, hostName).ConfigureAwait(false);
-            }
         }
     }
 }

source/ProcessManager.Core/Application/IQueryScheduledOrchestrationInstancesByInstant.cs → source/ProcessManager.Core/Application/Scheduling/IScheduledOrchestrationInstancesByInstantQuery.cs

@@ -15,9 +15,9 @@
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using NodaTime;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Scheduling;
 
-public interface IQueryScheduledOrchestrationInstancesByInstant
+public interface IScheduledOrchestrationInstancesByInstantQuery
 {
     /// <summary>
     /// Find scheduled orchestration instances that should be started when comparing to given <paramref name="scheduledToRunBefore"/>.

source/ProcessManager.Core/Application/IOrchestrationInstanceScheduleManager.cs → source/ProcessManager.Core/Application/Scheduling/IStartScheduledOrchestrationInstanceCommand.cs

@@ -14,9 +14,9 @@
 
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Application;
+namespace Energinet.DataHub.ProcessManagement.Core.Application.Scheduling;
 
-public interface IOrchestrationInstanceScheduleManager
+public interface IStartScheduledOrchestrationInstanceCommand
 {
     /// <summary>
     /// Start a scheduled orchestration instance.

source/ProcessManager.Core/Infrastructure/Database/ProcessManagerContext.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using Microsoft.EntityFrameworkCore;

source/ProcessManager.Core/Infrastructure/Extensions/DependencyInjection/ProcessManagerExtensions.cs

@@ -12,11 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
+using Energinet.DataHub.ProcessManagement.Core.Application.Registration;
+using Energinet.DataHub.ProcessManagement.Core.Application.Scheduling;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Energinet.DataHub.ProcessManagement.Core.Infrastructure.Database;
 using Energinet.DataHub.ProcessManagement.Core.Infrastructure.Extensions.Options;
 using Energinet.DataHub.ProcessManagement.Core.Infrastructure.Orchestration;
+using Energinet.DataHub.ProcessManagement.Core.Infrastructure.Registration;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask.ContextImplementations;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask.Options;
@@ -66,14 +69,18 @@ public static IServiceCollection AddProcessManagerCore(this IServiceCollection s
             });
 
         // ProcessManager components using interfaces to restrict access to functionality
-        // => Scheduler
-        services.TryAddScoped<IQueryScheduledOrchestrationInstancesByInstant, OrchestrationInstanceRepository>();
-        services.TryAddScoped<IOrchestrationInstanceScheduleManager, OrchestrationInstanceManager>();
-        // => Manager
+        // => Scheduling
+        services.TryAddScoped<IScheduledOrchestrationInstancesByInstantQuery, OrchestrationInstanceRepository>();
+        services.TryAddScoped<IStartScheduledOrchestrationInstanceCommand, OrchestrationInstanceManager>();
+        // => Cancellation (manager)
+        services.TryAddScoped<ICancelScheduledOrchestrationInstanceCommand, OrchestrationInstanceManager>();
+        // => Start instance (manager)
         services.TryAddScoped<IOrchestrationInstanceExecutor, DurableOrchestrationInstanceExecutor>();
         services.TryAddScoped<IOrchestrationRegisterQueries, OrchestrationRegister>();
         services.TryAddScoped<IOrchestrationInstanceRepository, OrchestrationInstanceRepository>();
-        services.TryAddScoped<IOrchestrationInstanceManager, OrchestrationInstanceManager>();
+        services.TryAddScoped<IStartOrchestrationInstanceCommands, OrchestrationInstanceManager>();
+        // => Public queries
+        services.TryAddScoped<IOrchestrationInstanceQueries, OrchestrationInstanceRepository>();
 
         return services;
     }
@@ -123,13 +130,13 @@ public static IServiceCollection AddProcessManagerForOrchestrations(
         // => Orchestration Descriptions registration during startup
         services.TryAddTransient<IReadOnlyCollection<OrchestrationDescription>>(sp => enabledDescriptionsFactory());
         services.TryAddTransient<IOrchestrationRegister, OrchestrationRegister>();
-        // => Orchestration instances progress
-        services.TryAddScoped<IOrchestrationInstanceProgressRepository, OrchestrationInstanceRepository>();
-        // => Manager
+        // => Start instance (manager)
         services.TryAddScoped<IOrchestrationInstanceExecutor, DurableOrchestrationInstanceExecutor>();
         services.TryAddScoped<IOrchestrationRegisterQueries, OrchestrationRegister>();
         services.TryAddScoped<IOrchestrationInstanceRepository, OrchestrationInstanceRepository>();
-        services.TryAddScoped<IOrchestrationInstanceManager, OrchestrationInstanceManager>();
+        services.TryAddScoped<IStartOrchestrationInstanceCommands, OrchestrationInstanceManager>();
+        // => Public progress repository
+        services.TryAddScoped<IOrchestrationInstanceProgressRepository, OrchestrationInstanceRepository>();
 
         return services;
     }

source/ProcessManager.Core/Infrastructure/Extensions/Startup/HostExtensions.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Registration;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -29,7 +29,7 @@ public static class HostExtensions
     /// <summary>
     /// Register and deregister orchestrations during application startup.
     /// </summary>
-    public static async Task SynchronizeWithOrchestrationRegisterAsync(this IHost host)
+    public static async Task SynchronizeWithOrchestrationRegisterAsync(this IHost host, string hostName)
     {
         var loggerFactory = host.Services.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger(nameof(SynchronizeWithOrchestrationRegisterAsync));
@@ -40,7 +40,7 @@ public static async Task SynchronizeWithOrchestrationRegisterAsync(this IHost ho
             var register = host.Services.GetRequiredService<IOrchestrationRegister>();
             await register
                 .SynchronizeAsync(
-                    hostName: "ProcessManager.Orchestrations",
+                    hostName: hostName,
                     enabledDescriptions)
                 .ConfigureAwait(false);
         }

source/ProcessManager.Core/Infrastructure/Orchestration/DurableOrchestrationInstanceExecutor.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask;

source/ProcessManager.Core/Infrastructure/Orchestration/OrchestrationInstanceRepository.cs

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
+using Energinet.DataHub.ProcessManagement.Core.Application.Scheduling;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using Energinet.DataHub.ProcessManagement.Core.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
@@ -27,7 +28,8 @@ internal class OrchestrationInstanceRepository(
     ProcessManagerContext context) :
         IOrchestrationInstanceRepository,
         IOrchestrationInstanceProgressRepository,
-        IQueryScheduledOrchestrationInstancesByInstant
+        IOrchestrationInstanceQueries,
+        IScheduledOrchestrationInstancesByInstantQuery
 {
     private readonly ProcessManagerContext _context = context;
 
@@ -50,7 +52,7 @@ public async Task AddAsync(OrchestrationInstance orchestrationInstance)
         await _context.OrchestrationInstances.AddAsync(orchestrationInstance).ConfigureAwait(false);
     }
 
-    /// <inheritdoc cref="IQueryScheduledOrchestrationInstancesByInstant.FindAsync(Instant)"/>
+    /// <inheritdoc cref="IScheduledOrchestrationInstancesByInstantQuery.FindAsync(Instant)"/>
     public async Task<IReadOnlyCollection<OrchestrationInstance>> FindAsync(Instant scheduledToRunBefore)
     {
         var query = _context.OrchestrationInstances

source/ProcessManager.Core/Infrastructure/Orchestration/OrchestrationRegister.cs → source/ProcessManager.Core/Infrastructure/Registration/OrchestrationRegister.cs

@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
+using Energinet.DataHub.ProcessManagement.Core.Application.Registration;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationDescription;
 using Energinet.DataHub.ProcessManagement.Core.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Energinet.DataHub.ProcessManagement.Core.Infrastructure.Orchestration;
+namespace Energinet.DataHub.ProcessManagement.Core.Infrastructure.Registration;
 
 /// <summary>
 /// Keep a register of known Durable Functions orchestrations.

source/ProcessManager.Orchestrations/Processes/BRS_023_027/V1/Activities/Brs023CalculationStepStartActivityV1.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using Microsoft.Azure.Functions.Worker;
 using NodaTime;

source/ProcessManager.Orchestrations/Processes/BRS_023_027/V1/Activities/Brs023CalculationStepTerminateActivityV1.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.ProcessManagement.Core.Application;
+using Energinet.DataHub.ProcessManagement.Core.Application.Orchestration;
 using Energinet.DataHub.ProcessManagement.Core.Domain.OrchestrationInstance;
 using Microsoft.Azure.Functions.Worker;
 using NodaTime;