feat: Update unit test target file names to include "Tests" suffix and refactor service resolution logic

Author: dandrejvv

Modules/Intent.Modules.AI.UnitTests/Tasks/GenerateCqrsHandlerUnitTestsWithAITask.cs

@@ -91,7 +91,7 @@ public string Execute(params string[] args)
         {
             ["inputFilesJson"] = jsonInput,
             ["userProvidedContext"] = userProvidedContext,
-            ["targetFileName"] = queryModel.Name + "Handler",
+            ["targetFileName"] = queryModel.Name + "HandlerTests",
             ["mockFramework"] = UnitTestHelpers.GetMockFramework(_applicationConfigurationProvider),
             ["slnRelativePath"] = "/" + string.Join('/', queryModel.GetParentPath().Select(x => x.Name)),
             ["fileChangesSchema"] = FileChangesSchema.GetPromptInstructions()

Modules/Intent.Modules.AI.UnitTests/Tasks/GenerateDomainEventHandlerUnitTestWithAITask.cs

@@ -88,7 +88,7 @@ public string Execute(params string[] args)
             {
                 ["inputFilesJson"] = jsonInput,
                 ["userProvidedContext"] = userProvidedContext,
-                ["targetFileName"] = eventHandlerElement.Name,
+                ["targetFileName"] = eventHandlerElement.Name + "Tests",
                 ["mockFramework"] = UnitTestHelpers.GetMockFramework(_applicationConfigurationProvider),
                 ["slnRelativePath"] = "/" + string.Join('/', eventHandlerElement.GetParentPath().Select(x => x.Name)),
                 ["fileChangesSchema"] = FileChangesSchema.GetPromptInstructions()

Modules/Intent.Modules.AI.UnitTests/Tasks/GenerateDomainServiceUnitTestsWithAITask.cs

@@ -68,51 +68,10 @@ public string Execute(params string[] args)
             var kernel = _intentSemanticKernelFactory.BuildSemanticKernel(modelId, provider, null);
 
             var domainDesigner = _metadataManager.GetDesigner(applicationId, "Domain");
-            
-            // Try to find the domain service operation
-            var domainServiceOperation = domainDesigner.GetElementsOfType(SpecializationTypeIds.DomainServiceOperation)
+            var domainService = domainDesigner.GetElementsOfType(SpecializationTypeIds.DomainService)
                 .FirstOrDefault(x => x.Id == elementId);
-            
-            // If not found as operation, try finding it as a domain service
-            if (domainServiceOperation == null)
-            {
-                var domainService = domainDesigner.GetElementsOfType(SpecializationTypeIds.DomainService)
-                    .FirstOrDefault(x => x.Id == elementId);
-                
-                if (domainService != null)
-                {
-                    // Element ID is the service itself, find its operations
-                    domainServiceOperation = domainService.ChildElements
-                        .FirstOrDefault(o => o.SpecializationTypeId == SpecializationTypeIds.DomainServiceOperation);
-                }
-            }
-            
-            if (domainServiceOperation == null)
-            {
-                // Diagnostic logging
-                Logging.Log.Warning($"Looking for element ID: {elementId}");
-                var domainServices = domainDesigner.GetElementsOfType(SpecializationTypeIds.DomainService).ToList();
-                Logging.Log.Warning($"DomainService elements found: {domainServices.Count}");
-                foreach (var ds in domainServices)
-                {
-                    Logging.Log.Warning($"  - {ds.Name} (ID: {ds.Id}, Type: {ds.SpecializationTypeId})");
-                    foreach (var child in ds.ChildElements)
-                    {
-                        Logging.Log.Warning($"    - Child: {child.Name} (ID: {child.Id}, Type: {child.SpecializationTypeId})");
-                    }
-                }
-                
-                var operations = domainDesigner.GetElementsOfType(SpecializationTypeIds.DomainServiceOperation).ToList();
-                Logging.Log.Warning($"DomainServiceOperation elements found: {operations.Count}");
-                foreach (var op in operations)
-                {
-                    Logging.Log.Warning($"  - {op.Name} (ID: {op.Id})");
-                }
-                
-                throw new Exception($"An element was selected to be executed upon but could not be found. Please ensure you have saved your designer and try again.");
-            }
 
-            var inputFiles = GetInputFiles(applicationId, domainServiceOperation);
+            var inputFiles = GetInputFiles(applicationId, domainService);
             Logging.Log.Info($"Context files included: {inputFiles.Count} files");
             Logging.Log.Debug($"Files: {string.Join(", ", inputFiles.Select(f => Path.GetFileName(f.FilePath)))}");
 
@@ -123,9 +82,9 @@ public string Execute(params string[] args)
             {
                 ["inputFilesJson"] = jsonInput,
                 ["userProvidedContext"] = userProvidedContext,
-                ["targetFileName"] = domainServiceOperation.Name,
+                ["targetFileName"] = domainService.Name + "Tests",
                 ["mockFramework"] = UnitTestHelpers.GetMockFramework(_applicationConfigurationProvider),
-                ["slnRelativePath"] = "/" + string.Join('/', domainServiceOperation.GetParentPath().Select(x => x.Name)),
+                ["slnRelativePath"] = "/" + string.Join('/', domainService.GetParentPath().Select(x => x.Name)),
                 ["fileChangesSchema"] = FileChangesSchema.GetPromptInstructions()
             });
 
@@ -297,13 +256,13 @@ public class {DomainServiceName}Tests
                 {
                     private readonly Mock<IRepository1> _repository1Mock;
                     private readonly Mock<IRepository2> _repository2Mock; // If service uses multiple repositories
-                    private readonly {DomainServiceName} _sut;
+                    private readonly {DomainServiceName} _service;
 
                     public {DomainServiceName}Tests()
                     {
                         _repository1Mock = new Mock<IRepository1>();
                         _repository2Mock = new Mock<IRepository2>(); // Only if needed
-                        _sut = new {DomainServiceName}(_repository1Mock.Object, _repository2Mock.Object);
+                        _service = new {DomainServiceName}(_repository1Mock.Object, _repository2Mock.Object);
                     }
 
                     // Test methods follow...
@@ -576,17 +535,32 @@ public async Task CalculateCommissionAsync_AppliesCap_ForHighValueTransaction()
             return promptTemplate;
         }
 
-        private List<ICodebaseFile> GetInputFiles(string applicationId, IElement domainServiceOperation)
+        private List<ICodebaseFile> GetInputFiles(string applicationId, IElement domainService)
         {
             var filesProvider = _applicationConfigurationProvider.GeneratedFilesProvider();
 
             // PRIMARY: Domain service implementation and interface
-            var domainService = domainServiceOperation.ParentElement;
             var inputFiles = filesProvider.GetFilesForMetadata(domainService).ToList();
-            inputFiles.AddRange(filesProvider.GetFilesForMetadata(domainServiceOperation));
+            inputFiles.AddRange(filesProvider.GetFilesForMetadata(domainService));
+
+            // Include each domain service operation and its parameter types (DTO + Class)
+            foreach (var operation in domainService.ChildElements.Where(x => x.SpecializationTypeId == SpecializationTypeIds.DomainServiceOperation))
+            {
+                inputFiles.AddRange(filesProvider.GetFilesForMetadata(operation));
+                // DTO parameters
+                foreach (var paramDto in operation.ChildElements.Where(p => p.TypeReference?.Element?.SpecializationTypeId == SpecializationTypeIds.Dto).Select(p => p.TypeReference.Element))
+                {
+                    inputFiles.AddRange(filesProvider.GetFilesForMetadata(paramDto));
+                }
+                // Class (domain entity/value object) parameters
+                foreach (var paramClass in operation.ChildElements.Where(p => p.TypeReference?.Element?.SpecializationTypeId == SpecializationTypeIds.Class).Select(p => p.TypeReference.Element))
+                {
+                    inputFiles.AddRange(filesProvider.GetFilesForMetadata(paramClass));
+                }
+            }
 
             // DOMAIN: Include related entities, value objects, and their repositories
-            var relatedElements = UnitTestHelpers.GetRelatedElements(domainServiceOperation);
+            var relatedElements = UnitTestHelpers.GetRelatedElements(domainService);
             foreach (var relatedElement in relatedElements)
             {
                 inputFiles.AddRange(filesProvider.GetFilesForMetadata(relatedElement));

Modules/Intent.Modules.AI.UnitTests/Tasks/GenerateIntegrationEventHandlerUnitTestsWithAITask.cs

@@ -88,7 +88,7 @@ public string Execute(params string[] args)
         {
             ["inputFilesJson"] = jsonInput,
             ["userProvidedContext"] = userProvidedContext,
-            ["targetFileName"] = eventHandlerElement.Name,
+            ["targetFileName"] = eventHandlerElement.Name + "Tests",
             ["mockFramework"] = UnitTestHelpers.GetMockFramework(_applicationConfigurationProvider),
             ["slnRelativePath"] = "/" + string.Join('/', eventHandlerElement.GetParentPath().Select(x => x.Name)),
             ["fileChangesSchema"] = FileChangesSchema.GetPromptInstructions()

Modules/Intent.Modules.AI.UnitTests/Tasks/GenerateServiceUnitTestsWithAITask.cs

@@ -72,14 +72,28 @@ public string Execute(params string[] args)
         var kernel = _intentSemanticKernelFactory.BuildSemanticKernel(modelId, provider, null);
 
         var servicesDesigner = _metadataManager.GetDesigner(applicationId, "Services");
-        var queryModel = servicesDesigner.GetElementsOfType(SpecializationTypeIds.Service)
-            .SelectMany(s => s.ChildElements.Where(o => o.SpecializationTypeId == SpecializationTypeIds.Operation))
-            .FirstOrDefault(x => x.Id == elementId);
-        if (queryModel == null)
+        // Attempt to resolve the element ID as a Service first.
+        var serviceModel = servicesDesigner.GetElementsOfType(SpecializationTypeIds.Service)
+            .FirstOrDefault(s => s.Id == elementId);
+        IElement? selectedOperation = null;
+        if (serviceModel == null)
         {
-            throw new Exception($"An element was selected to be executed upon but could not be found. Please ensure you have saved your designer and try again.");
+            // If not a Service, attempt to resolve as an Operation belonging to any Service.
+            selectedOperation = servicesDesigner.GetElementsOfType(SpecializationTypeIds.Service)
+                .SelectMany(s => s.ChildElements.Where(o => o.SpecializationTypeId == SpecializationTypeIds.Operation))
+                .FirstOrDefault(o => o.Id == elementId);
+            if (selectedOperation != null)
+            {
+                serviceModel = selectedOperation.ParentElement;
+            }
+        }
+        if (serviceModel == null)
+        {
+            throw new Exception("An element was selected to be executed upon but could not be found. Please ensure you have saved your designer and try again.");
         }
-        var inputFiles = GetInputFiles(queryModel);
+
+        var inputFiles = GetInputFiles(serviceModel);
+        Logging.Log.Info($"Resolved service: {serviceModel.Name} (Selected operation: {selectedOperation?.Name ?? "All"})");
         Logging.Log.Info($"Context files included: {inputFiles.Count} files");
         Logging.Log.Debug($"Files: {string.Join(", ", inputFiles.Select(f => Path.GetFileName(f.FilePath)))}");
 
@@ -90,9 +104,9 @@ public string Execute(params string[] args)
         {
             ["inputFilesJson"] = jsonInput,
             ["userProvidedContext"] = userProvidedContext,
-            ["targetFileName"] = queryModel.Name,
+            ["targetFileName"] = serviceModel.Name + "Tests",
             ["mockFramework"] = UnitTestHelpers.GetMockFramework(_applicationConfigurationProvider),
-            ["slnRelativePath"] = "/" + string.Join('/', queryModel.GetParentPath().Select(x => x.Name)),
+            ["slnRelativePath"] = "/" + string.Join('/', serviceModel.GetParentPath().Select(x => x.Name)),
             ["fileChangesSchema"] = FileChangesSchema.GetPromptInstructions()
         });
 
@@ -258,13 +272,13 @@ public class {ServiceName}Tests
             {
                 private readonly Mock<IRepository> _repositoryMock;
                 private readonly Mock<IMapper> _mapperMock; // Only if service uses IMapper
-                private readonly {ServiceName} _sut;
+                private readonly {ServiceName} _service;
 
                 public {ServiceName}Tests()
                 {
                     _repositoryMock = new Mock<IRepository>();
                     _mapperMock = new Mock<IMapper>(); // Only if needed
-                    _sut = new {ServiceName}(_repositoryMock.Object, _mapperMock.Object);
+                    _service = new {ServiceName}(_repositoryMock.Object, _mapperMock.Object);
                 }
 
                 // Test methods follow...
@@ -296,7 +310,7 @@ public async Task CreateProduct_AddsProductAndReturnsId()
                     .ReturnsAsync(1);
 
                 // Act
-                var result = await _sut.CreateProduct(dto);
+                var result = await _service.CreateProduct(dto);
 
                 // Assert
                 Assert.Equal(expectedId, result);
@@ -324,7 +338,7 @@ public async Task UpdateProduct_UpdatesProduct_WhenFound()
                     .ReturnsAsync(existingProduct);
 
                 // Act
-                await _sut.UpdateProduct(productId, dto);
+                await _service.UpdateProduct(productId, dto);
 
                 // Assert
                 Assert.Equal("NewName", existingProduct.Name);
@@ -342,7 +356,7 @@ public async Task UpdateProduct_ThrowsNotFoundException_WhenProductNotFound()
                     .ReturnsAsync((Product)null);
 
                 // Act & Assert
-                await Assert.ThrowsAsync<NotFoundException>(() => _sut.UpdateProduct(dto.Id, dto));
+                await Assert.ThrowsAsync<NotFoundException>(() => _service.UpdateProduct(dto.Id, dto));
             }
             ```
 
@@ -360,7 +374,7 @@ public async Task DeleteProduct_RemovesProduct_WhenFound()
                     .ReturnsAsync(product);
 
                 // Act
-                await _sut.DeleteProduct(productId);
+                await _service.DeleteProduct(productId);
 
                 // Assert
                 _productRepositoryMock.Verify(x => x.FindByIdAsync(productId, It.IsAny<CancellationToken>()), Times.Once);
@@ -377,7 +391,7 @@ public async Task DeleteProduct_ThrowsNotFoundException_WhenNotFound()
                     .ReturnsAsync((Product)null);
 
                 // Act & Assert
-                await Assert.ThrowsAsync<NotFoundException>(() => _sut.DeleteProduct(productId));
+                await Assert.ThrowsAsync<NotFoundException>(() => _service.DeleteProduct(productId));
             }
             ```
 
@@ -402,7 +416,7 @@ public async Task FindProductById_ReturnsDto_WhenFound()
                     .Returns(expectedDto);
 
                 // Act
-                var result = await _sut.FindProductById(productId);
+                var result = await _service.FindProductById(productId);
 
                 // Assert
                 Assert.NotNull(result);
@@ -423,7 +437,7 @@ public async Task FindProductById_ThrowsNotFoundException_WhenNotFound()
                     .ReturnsAsync((Product)null);
 
                 // Act & Assert
-                await Assert.ThrowsAsync<NotFoundException>(() => _sut.FindProductById(productId));
+                await Assert.ThrowsAsync<NotFoundException>(() => _service.FindProductById(productId));
             }
             ```
 
@@ -451,7 +465,7 @@ public async Task FindProducts_ReturnsAllProducts()
                     .Returns((Product p) => ProductDto.Create("", "", 0, "", p.Id));
 
                 // Act
-                var result = await _sut.FindProducts();
+                var result = await _service.FindProducts();
 
                 // Assert
                 Assert.NotNull(result);
@@ -497,7 +511,7 @@ public async Task FindProductsByCategory_ReturnsOnlyMatchingProducts()
                     .Returns((Product p) => ProductDto.Create("", "", 0, "", Guid.NewGuid()));
 
                 // Act
-                var result = await _sut.FindProductsByCategory(categoryId);
+                var result = await _service.FindProductsByCategory(categoryId);
 
                 // Assert - This single test verifies: predicate logic, repository call, mapper call, result correctness
                 Assert.NotNull(result);
@@ -528,7 +542,7 @@ public async Task FindProductsByCategory_ReturnsEmpty_WhenNoProductsMatchFilter(
                     });
 
                 // Act
-                var result = await _sut.FindProductsByCategory(categoryId);
+                var result = await _service.FindProductsByCategory(categoryId);
 
                 // Assert
                 Assert.Empty(result);
@@ -564,7 +578,7 @@ public async Task FindActiveProducts_ReturnsProducts_WhenProductsMatchCriteria()
                     .Returns((Product p) => ProductDto.Create("", "", 0, "", p.Id));
 
                 // Act
-                var result = await _sut.FindActiveProducts(categoryId);
+                var result = await _service.FindActiveProducts(categoryId);
 
                 // Assert
                 Assert.NotNull(result);
@@ -588,7 +602,7 @@ public async Task FindActiveProducts_ReturnsEmpty_WhenNoProductsMatchCriteria()
                     .ReturnsAsync(new List<Product>());
 
                 // Act
-                var result = await _sut.FindActiveProducts(categoryId);
+                var result = await _service.FindActiveProducts(categoryId);
 
                 // Assert
                 Assert.NotNull(result);
@@ -652,7 +666,7 @@ public async Task GetCompletedTransactions_ReturnsTransactions_WhenTransactionsM
                     });
 
                 // Act
-                var result = await _sut.GetCompletedTransactions(fromDate, toDate);
+                var result = await _service.GetCompletedTransactions(fromDate, toDate);
 
                 // Assert
                 Assert.NotNull(result);
@@ -689,7 +703,7 @@ public async Task GetCompletedTransactions_ReturnsEmpty_WhenNoTransactionsMatchC
                     });
 
                 // Act
-                var result = await _sut.GetCompletedTransactions(fromDate, toDate);
+                var result = await _service.GetCompletedTransactions(fromDate, toDate);
 
                 // Assert
                 Assert.NotNull(result);
@@ -716,10 +730,16 @@ private List<ICodebaseFile> GetInputFiles(IElement service)
             {
                 inputFiles.AddRange(filesProvider.GetFilesForMetadata(operation.TypeReference.Element));
             }
+            // Include DTO parameter types
             foreach (var paramType in operation.ChildElements.Where(x => x.TypeReference?.Element?.SpecializationTypeId == SpecializationTypeIds.Dto).Select(x => x.TypeReference.Element))
             {
                 inputFiles.AddRange(filesProvider.GetFilesForMetadata(paramType));
             }
+            // Include Class (domain entity / value object) parameter types
+            foreach (var paramClass in operation.ChildElements.Where(x => x.TypeReference?.Element?.SpecializationTypeId == SpecializationTypeIds.Class).Select(x => x.TypeReference.Element))
+            {
+                inputFiles.AddRange(filesProvider.GetFilesForMetadata(paramClass));
+            }
 
             inputFiles.AddRange(UnitTestHelpers.GetRelatedElements(operation).SelectMany(x => filesProvider.GetFilesForMetadata(x)));
         }