Update AzureQueueStorage to support IMessageBus and composite mode

Co-authored-by: dandrejvv <[email protected]>

Author: Copilot

Modules/Intent.Modules.Eventing.AzureQueueStorage/Intent.Modules.Eventing.AzureQueueStorage.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Intent.Modules.Common" Version="3.8.0" />
-    <PackageReference Include="Intent.Modules.Common.CSharp" Version="3.8.3" />
+    <PackageReference Include="Intent.Modules.Common.CSharp" Version="3.9.0" />
     <PackageReference Include="Intent.Modules.Common.UnitOfWork" Version="1.0.2" />
     <PackageReference Include="Intent.Modules.Eventing.Contracts" Version="5.2.0" />
     <PackageReference Include="Intent.Modules.Modelers.Eventing" Version="6.0.1" />
@@ -21,6 +21,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\Intent.Modules.Constants\Intent.Modules.Constants.csproj" PrivateAssets="All" />
+		<ProjectReference Include="..\Intent.Modules.Eventing.Contracts\Intent.Modules.Eventing.Contracts.csproj" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup>

Modules/Intent.Modules.Eventing.AzureQueueStorage/Templates/AzureQueueStorageConfiguration/AzureQueueStorageConfigurationTemplatePartial.cs

@@ -57,7 +57,25 @@ public AzureQueueStorageConfigurationTemplate(IOutputTarget outputTarget, object
                         mth.AddParameter(UseType("Microsoft.Extensions.DependencyInjection.IServiceCollection"), "services", @param => param.WithThisModifier())
                            .AddParameter(UseType("Microsoft.Extensions.Configuration.IConfiguration"), "configuration");
 
-                        mth.AddStatement($"services.AddScoped<{this.GetEventBusInterfaceName()}, {this.GetAzureQueueStorageEventBusName()}>();");
+                        var compositeTemplate = GetTemplate<ICSharpFileBuilderTemplate>(TemplateDependency.OnTemplate("Intent.Eventing.Contracts.CompositeMessageBusConfiguration"));
+                        var isCompositeMode = compositeTemplate != null;
+                        
+                        if (isCompositeMode)
+                        {
+                            mth.AddParameter(this.GetMessageBrokerRegistryName(), "registry");
+                        }
+
+                        if (isCompositeMode)
+                        {
+                            mth.AddStatement($"// Register as concrete type for composite message bus");
+                            mth.AddStatement($"services.AddScoped<{this.GetAzureQueueStorageEventBusName()}>();");
+                        }
+                        else
+                        {
+                            mth.AddStatement($"// Register as IMessageBus and IEventBus for standalone mode");
+                            mth.AddStatement($"services.AddScoped<{this.GetMessageBusInterfaceName()}, {this.GetAzureQueueStorageEventBusName()}>();");
+                            mth.AddStatement($"services.AddScoped<{this.GetEventBusInterfaceName()}, {this.GetAzureQueueStorageEventBusName()}>();");
+                        }
 
                         mth.AddInvocationStatement($"services.AddOptions<{this.GetAzureQueueStorageOptionsName()}>", invoc =>
                         {
@@ -105,6 +123,28 @@ public AzureQueueStorageConfigurationTemplate(IOutputTarget outputTarget, object
                             }
                         });
 
+                        if (isCompositeMode)
+                        {
+                            var publishedMessages = this.GetPublishedMessages();
+                            var sentCommands = this.GetSentIntegrationCommands();
+                            
+                            if (publishedMessages.Any() || sentCommands.Any())
+                            {
+                                mth.AddStatement("");
+                                mth.AddStatement("// Register message types with the composite message bus registry");
+                                
+                                foreach (var message in publishedMessages)
+                                {
+                                    mth.AddStatement($"registry.Register<{GetTypeName(IntegrationEventMessageTemplate.TemplateId, message)}, {this.GetAzureQueueStorageEventBusName()}>();");
+                                }
+                                
+                                foreach (var command in sentCommands)
+                                {
+                                    mth.AddStatement($"registry.Register<{GetTypeName(IntegrationCommandTemplate.TemplateId, command)}, {this.GetAzureQueueStorageEventBusName()}>();");
+                                }
+                            }
+                        }
+
                         if (this.GetSubscribedMessageCount() > 0 && ExecutionContext.FindTemplateInstance<IAppStartupTemplate>(IAppStartupTemplate.RoleName) != null)
                         {
                             mth.AddStatement($"services.AddHostedService<{this.GetAzureQueueStorageConsumerBackgroundServiceName()}>();");

Modules/Intent.Modules.Eventing.AzureQueueStorage/Templates/AzureQueueStorageEventBus/AzureQueueStorageEventBusTemplatePartial.cs

@@ -29,7 +29,7 @@ public AzureQueueStorageEventBusTemplate(IOutputTarget outputTarget, object mode
             CSharpFile = new CSharpFile(this.GetNamespace(), this.GetFolderPath())
                 .AddClass($"AzureQueueStorageEventBus", @class =>
                 {
-                    @class.ImplementsInterface(this.GetEventBusInterfaceName());
+                    @class.ImplementsInterface(this.GetMessageBusInterfaceName());
 
                     @class.AddField($"{UseType("System.Collections.Generic.List")}<{this.GetAzureQueueStorageEnvelopeName()}>", "_messageQueue", @field =>
                     {
@@ -163,19 +163,33 @@ public AzureQueueStorageEventBusTemplate(IOutputTarget outputTarget, object mode
                         });
                     });
 
+                    @class.AddMethod("void", "Publish", mth =>
+                    {
+                        mth.AddGenericParameter("T", out var genT).AddGenericTypeConstraint(genT, gen => gen.AddType("class"));
+                        mth.AddParameter(genT, "message");
+                        mth.AddParameter($"{UseType("System.Collections.Generic.IDictionary")}<string, object>", "additionalData");
+
+                        mth.AddStatement("// Note: Azure Queue Storage does not support additional data, ignoring parameter");
+                        mth.AddInvocationStatement("Publish", invoc => invoc.AddArgument("message"));
+                    });
+
                     @class.AddMethod("void", "Send", mth =>
                     {
                         mth.AddGenericParameter("T", out var T);
                         mth.AddGenericTypeConstraint(T, c => c.AddType("class"));
                         mth.AddParameter(T, "message");
 
-                        mth.AddStatement("ValidateMessage(message);");
+                        mth.AddStatement("Publish(message);");
+                    });
+                    
+                    @class.AddMethod("void", "Send", mth =>
+                    {
+                        mth.AddGenericParameter("T", out var T);
+                        mth.AddGenericTypeConstraint(T, c => c.AddType("class"));
+                        mth.AddParameter(T, "message");
+                        mth.AddParameter($"{UseType("System.Collections.Generic.IDictionary")}<string, object>", "additionalData");
 
-                        mth.AddInvocationStatement("_messageQueue.Add", invoc =>
-                        {
-                            invoc.AddArgument(new CSharpInvocationStatement($"new {this.GetAzureQueueStorageEnvelopeName()}")
-                                    .AddArgument("message").WithoutSemicolon());
-                        });
+                        mth.AddStatement("Publish(message, additionalData);");
                     });
 
                     @class.AddMethod("void", "ValidateMessage", mth =>