DI Refactor: Azure.Mcp.Tools.Marketplace (#2064)

* Initial plan

* DI refactor: inject IMarketplaceService via constructor in ProductGetCommand and ProductListCommand

Co-authored-by: conniey <10136526+conniey@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: conniey <10136526+conniey@users.noreply.github.com>

Author: Copilot

tools/Azure.Mcp.Tools.Marketplace/src/Commands/Product/ProductGetCommand.cs

@@ -14,10 +14,11 @@
 
 namespace Azure.Mcp.Tools.Marketplace.Commands.Product;
 
-public sealed class ProductGetCommand(ILogger<ProductGetCommand> logger) : SubscriptionCommand<ProductGetOptions>
+public sealed class ProductGetCommand(ILogger<ProductGetCommand> logger, IMarketplaceService marketplaceService) : SubscriptionCommand<ProductGetOptions>
 {
     private const string CommandTitle = "Get Marketplace Product";
     private readonly ILogger<ProductGetCommand> _logger = logger;
+    private readonly IMarketplaceService _marketplaceService = marketplaceService;
 
     public override string Id => "729a12ee-9c63-4a31-b1b8-4a81ad093564";
 
@@ -81,12 +82,8 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         try
         {
-
-            // Get the marketplace service from DI
-            var marketplaceService = context.GetService<IMarketplaceService>();
-
             // Call service operation with required parameters
-            var result = await marketplaceService.GetProduct(
+            var result = await _marketplaceService.GetProduct(
                 options.ProductId!,
                 options.Subscription!,
                 options.IncludeStopSoldPlans,

tools/Azure.Mcp.Tools.Marketplace/src/Commands/Product/ProductListCommand.cs

@@ -14,10 +14,11 @@
 
 namespace Azure.Mcp.Tools.Marketplace.Commands.Product;
 
-public sealed class ProductListCommand(ILogger<ProductListCommand> logger) : SubscriptionCommand<ProductListOptions>
+public sealed class ProductListCommand(ILogger<ProductListCommand> logger, IMarketplaceService marketplaceService) : SubscriptionCommand<ProductListOptions>
 {
     private const string CommandTitle = "List Marketplace Products";
     private readonly ILogger<ProductListCommand> _logger = logger;
+    private readonly IMarketplaceService _marketplaceService = marketplaceService;
 
     public override string Id => "0485e8f9-61bf-4baf-b914-7fa5530a6f78";
 
@@ -81,11 +82,8 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
             }
 
 
-            // Get the marketplace service from DI
-            var marketplaceService = context.GetService<IMarketplaceService>();
-
             // Call service operation with required parameters
-            var results = await marketplaceService.ListProducts(
+            var results = await _marketplaceService.ListProducts(
                 options.Subscription!,
                 options.Language,
                 options.Search,

tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductGetCommandTests.cs

@@ -30,10 +30,10 @@ public ProductGetCommandTests()
         _marketplaceService = Substitute.For<IMarketplaceService>();
         _logger = Substitute.For<ILogger<ProductGetCommand>>();
 
-        var collection = new ServiceCollection().AddSingleton(_marketplaceService);
+        var collection = new ServiceCollection();
         _serviceProvider = collection.BuildServiceProvider();
 
-        _command = new(_logger);
+        _command = new(_logger, _marketplaceService);
         _context = new(_serviceProvider);
         _commandDefinition = _command.GetCommand();
     }

tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductListCommandTests.cs

@@ -28,10 +28,10 @@ public ProductListCommandTests()
         _marketplaceService = Substitute.For<IMarketplaceService>();
         _logger = Substitute.For<ILogger<ProductListCommand>>();
 
-        var collection = new ServiceCollection().AddSingleton(_marketplaceService);
+        var collection = new ServiceCollection();
         _serviceProvider = collection.BuildServiceProvider();
 
-        _command = new(_logger);
+        _command = new(_logger, _marketplaceService);
         _context = new(_serviceProvider);
     }