Add SqsCommand class and enhance IntegrationManager to handle SQS commands

Author: dandrejvv

Modules/Intent.Modules.Integration.IaC.Shared.AwsSqs/IntegrationManager.cs

@@ -31,6 +31,8 @@ public static IntegrationManager Instance
 
     private readonly List<MessageInfo> _publishedMessages;
     private readonly List<MessageInfo> _subscribedMessages;
+    private readonly List<CommandInfo> _sentCommands;
+    private readonly List<CommandInfo> _receivedCommands;
 
     private IntegrationManager(IApplication application)
     {
@@ -65,6 +67,31 @@ private IntegrationManager(IApplication application)
                 .Select(sub => new MessageInfo(app.Id, app.Name, sub.Message, sub.Handler)))
             .Distinct()
             .ToList();
+        
+        // Collect sent commands
+        _sentCommands = applications
+            .Where(app => app.Modules.Any(x => x.ModuleId == awsSqsModule))
+            .SelectMany(app => application.MetadataManager
+                .GetExplicitlySentIntegrationCommandModels(app.Id)
+                .Select(command => new CommandInfo(app.Id, app.Name, command, null)))
+            .Distinct()
+            .ToList();
+        
+        // Collect received commands
+        _receivedCommands = applications
+            .Where(app => app.Modules.Any(x => x.ModuleId == awsSqsModule))
+            .SelectMany(app => application.MetadataManager
+                .Services(app.Id)
+                .GetIntegrationEventHandlerModels()
+                .SelectMany(handler => handler.IntegrationCommandSubscriptions()
+                    .Select(sub => new
+                    {
+                        Command = sub.Element.AsIntegrationCommandModel(),
+                        Handler = handler
+                    }))
+                .Select(sub => new CommandInfo(app.Id, app.Name, sub.Command, sub.Handler)))
+            .Distinct()
+            .ToList();
     }
 
     public IReadOnlyList<SqsMessage> GetPublishedSqsMessages(string applicationId)
@@ -92,18 +119,51 @@ public IReadOnlyList<SqsMessage> GetSubscribedSqsMessages(string applicationId)
             .ToList();
     }
 
+    public IReadOnlyList<SqsCommand> GetPublishedSqsCommands(string applicationId)
+    {
+        return _sentCommands
+            .Where(p => p.ApplicationId == applicationId)
+            .Select(s => new SqsCommand(
+                s.ApplicationId, 
+                s.ApplicationName, 
+                s.Command, 
+                SqsMethodType.Publish))
+            .ToList();
+    }
+
+    public IReadOnlyList<SqsCommand> GetSubscribedSqsCommands(string applicationId)
+    {
+        return _receivedCommands
+            .Where(p => p.ApplicationId == applicationId)
+            .DistinctBy(s => s.Command.Id)
+            .Select(s => new SqsCommand(
+                s.ApplicationId, 
+                s.ApplicationName, 
+                s.Command, 
+                SqsMethodType.Subscribe))
+            .ToList();
+    }
+
     public IReadOnlyList<SqsItemBase> GetAggregatedPublishedSqsItems(string applicationId)
     {
-        return GetPublishedSqsMessages(applicationId)
+        var messages = GetPublishedSqsMessages(applicationId)
             .Cast<SqsItemBase>()
             .ToList();
+        var commands = GetPublishedSqsCommands(applicationId)
+            .Cast<SqsItemBase>()
+            .ToList();
+        return messages.Concat(commands).ToList();
     }
 
     public IReadOnlyList<SqsItemBase> GetAggregatedSubscribedSqsItems(string applicationId)
     {
-        return GetSubscribedSqsMessages(applicationId)
+        var messages = GetSubscribedSqsMessages(applicationId)
             .Cast<SqsItemBase>()
             .ToList();
+        var commands = GetSubscribedSqsCommands(applicationId)
+            .Cast<SqsItemBase>()
+            .ToList();
+        return messages.Concat(commands).ToList();
     }
 
     public IReadOnlyList<SqsItemBase> GetAggregatedSqsItems(string applicationId)
@@ -117,7 +177,7 @@ public IReadOnlyList<SqsItemBase> GetAggregatedSqsItems(string applicationId)
 
     public IReadOnlyList<Subscription<SqsItemBase>> GetAggregatedSqsSubscriptions(string applicationId)
     {
-        return _subscribedMessages
+        var messageSubscriptions = _subscribedMessages
             .Where(message => message.ApplicationId == applicationId)
             .Select(message => new Subscription<SqsItemBase>(
                 message.EventHandlerModel!,
@@ -127,6 +187,19 @@ public IReadOnlyList<Subscription<SqsItemBase>> GetAggregatedSqsSubscriptions(st
                     message.Message, 
                     SqsMethodType.Subscribe)))
             .ToList();
+
+        var commandSubscriptions = _receivedCommands
+            .Where(command => command.ApplicationId == applicationId)
+            .Select(command => new Subscription<SqsItemBase>(
+                command.EventHandlerModel!,
+                new SqsCommand(
+                    applicationId, 
+                    command.ApplicationName, 
+                    command.Command, 
+                    SqsMethodType.Subscribe)))
+            .ToList();
+
+        return messageSubscriptions.Concat(commandSubscriptions).ToList();
     }
 
     public record Subscription<TSubscriptionItem>(
@@ -138,4 +211,10 @@ private record MessageInfo(
         string ApplicationName, 
         MessageModel Message, 
         IntegrationEventHandlerModel? EventHandlerModel);
+    
+    private record CommandInfo(
+        string ApplicationId, 
+        string ApplicationName, 
+        IntegrationCommandModel Command, 
+        IntegrationEventHandlerModel? EventHandlerModel);
 }

Modules/Intent.Modules.Integration.IaC.Shared.AwsSqs/Intent.Modules.Integration.IaC.Shared.AwsSqs.projitems

@@ -12,6 +12,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)IntegrationManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SqsItemBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SqsMessage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SqsCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SqsMethodType.cs" />
   </ItemGroup>
 </Project>

Modules/Intent.Modules.Integration.IaC.Shared.AwsSqs/SqsCommand.cs

@@ -0,0 +1,77 @@
+using System;
+using Intent.Aws.Sqs.Api;
+using Intent.Modelers.Eventing.Api;
+using Intent.Modules.Common.Templates;
+
+namespace Intent.Modules.Integration.IaC.Shared.AwsSqs;
+
+internal record SqsCommand : SqsItemBase
+{
+    public SqsCommand(
+        string applicationId, 
+        string applicationName, 
+        IntegrationCommandModel commandModel, 
+        SqsMethodType methodType)
+    {
+        ApplicationId = applicationId;
+        ApplicationName = applicationName;
+        CommandModel = commandModel;
+        MethodType = methodType;
+        QueueName = GetQueueName(commandModel);
+        QueueConfigurationName = GetQueueConfigurationName(commandModel);
+    }
+
+    public IntegrationCommandModel CommandModel { get; init; }
+
+    private static string GetQueueName(IntegrationCommandModel command)
+    {
+        // Check if AWS SQS stereotype is applied
+        if (command.HasAwsSqs())
+        {
+            var stereotypeName = command.GetAwsSqs().QueueName();
+            // Only use stereotype value if it's not empty
+            if (!string.IsNullOrWhiteSpace(stereotypeName))
+            {
+                return stereotypeName;
+            }
+        }
+        
+        // Default naming convention: kebab-case, remove common suffixes
+        var resolvedName = command.Name;
+        resolvedName = resolvedName.RemoveSuffix("IntegrationCommand", "Command");
+        resolvedName = resolvedName.ToKebabCase();
+        return resolvedName;
+    }
+
+    private static string GetQueueConfigurationName(IntegrationCommandModel command)
+    {
+        const string prefix = "AwsSqs:";
+        
+        if (command.HasAwsSqs())
+        {
+            var name = command.GetAwsSqs().QueueName();
+            // Only use stereotype value if it's not empty
+            if (!string.IsNullOrWhiteSpace(name))
+            {
+                return prefix + name.ToPascalCase() + ":QueueUrl";
+            }
+        }
+
+        // Default: PascalCase name
+        var resolvedName = command.Name;
+        resolvedName = resolvedName.RemoveSuffix("IntegrationCommand", "Command");
+        resolvedName = resolvedName.ToPascalCase();
+        resolvedName = resolvedName + ":QueueUrl";
+        return prefix + resolvedName;
+    }
+
+    public override string GetModelTypeName(IntentTemplateBase template)
+    {
+        return template.GetTypeName("Intent.Eventing.Contracts.IntegrationCommand", CommandModel);
+    }
+
+    public override string GetSubscriberTypeName<T>(IntentTemplateBase<T> template)
+    {
+        return $"{template.GetTypeName("Intent.Eventing.Contracts.IntegrationEventHandlerInterface")}<{GetModelTypeName(template)}>";
+    }
+}