refactor: migrate marketplace client (#76)

andrei2699 · web-flow · commit 4d4f3cd90fc2 · 2025-03-30T17:44:40.000+03:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,6 +6,7 @@
         <PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0"/>
         <PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0"/>
         <PackageVersion Include="Docker.DotNet" Version="3.125.15"/>
+        <PackageVersion Include="DxWorks.Hub.Sdk" Version="1.0.3"/>
         <PackageVersion Include="FluentValidation" Version="11.11.0"/>
         <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0"/>
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.1"/>
diff --git a/ScriptBee.Marketplace.Client/Data/PluginVersion.cs b/ScriptBee.Marketplace.Client/Data/PluginVersion.cs
diff --git a/ScriptBee.Marketplace.Client/ScriptBee.Marketplace.Client.csproj b/ScriptBee.Marketplace.Client/ScriptBee.Marketplace.Client.csproj
diff --git a/ScriptBee.sln b/ScriptBee.sln
@@ -71,6 +71,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service.Plugin.Tests", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service.Plugin", "src\Application\Domain\Service.Plugin\Service.Plugin.csproj", "{23230FA8-50CC-4883-ABC3-8BA66BC92023}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marketplace.Client", "src\Adapters\Driven\Marketplace.Client\Marketplace.Client.csproj", "{D8626754-E493-456D-A809-9AA76677E8F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marketplace.Client.Tests", "test\Adapters\Driven\Marketplace.Client.Tests\Marketplace.Client.Tests.csproj", "{6B16EF85-94DA-427B-ADAA-55565AC89287}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -217,5 +221,13 @@ Global
 		{23230FA8-50CC-4883-ABC3-8BA66BC92023}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23230FA8-50CC-4883-ABC3-8BA66BC92023}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23230FA8-50CC-4883-ABC3-8BA66BC92023}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8626754-E493-456D-A809-9AA76677E8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8626754-E493-456D-A809-9AA76677E8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8626754-E493-456D-A809-9AA76677E8F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8626754-E493-456D-A809-9AA76677E8F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B16EF85-94DA-427B-ADAA-55565AC89287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B16EF85-94DA-427B-ADAA-55565AC89287}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B16EF85-94DA-427B-ADAA-55565AC89287}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B16EF85-94DA-427B-ADAA-55565AC89287}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/src/Adapters/Driven/Marketplace.Client/Data/MarketPlaceProject.cs b/src/Adapters/Driven/Marketplace.Client/Data/MarketPlaceProject.cs
@@ -3,7 +3,7 @@
 public enum MarketPlaceProjectType
 {
     Plugin,
-    Bundle
+    Bundle,
 }
 
 public record MarketPlaceProject(
diff --git a/src/Adapters/Driven/Marketplace.Client/Data/PluginVersion.cs b/src/Adapters/Driven/Marketplace.Client/Data/PluginVersion.cs
@@ -0,0 +1,3 @@
+namespace ScriptBee.Marketplace.Client.Data;
+
+public record PluginVersion(string Url, Version Version, string ManifestUrl);
diff --git a/src/Adapters/Driven/Marketplace.Client/Marketplace.Client.csproj b/src/Adapters/Driven/Marketplace.Client/Marketplace.Client.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <RootNamespace>ScriptBee.Marketplace.Client</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="DxWorks.Hub.Sdk" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
+        <PackageReference Include="Microsoft.Extensions.Http"/>
+    </ItemGroup>
+</Project>
diff --git a/src/Adapters/Driven/Marketplace.Client/ScriptBeeMarketplaceClientExtensions.cs b/src/Adapters/Driven/Marketplace.Client/ScriptBeeMarketplaceClientExtensions.cs
@@ -6,8 +6,10 @@ namespace ScriptBee.Marketplace.Client;
 
 public static class ScriptBeeMarketplaceClientExtensions
 {
-    public static IServiceCollection AddScriptBeeMarketplaceClient(this IServiceCollection services,
-        Action<DxWorksHubSdkOptions>? configureOptionsAction = null)
+    public static IServiceCollection AddScriptBeeMarketplaceClient(
+        this IServiceCollection services,
+        Action<DxWorksHubSdkOptions>? configureOptionsAction = null
+    )
     {
         services.AddDxWorksHubSdk(configureOptionsAction);
         services.AddSingleton<IMarketPluginFetcher, MarketPluginFetcher>();
diff --git a/src/Adapters/Driven/Marketplace.Client/Services/IMarketPluginFetcher.cs b/src/Adapters/Driven/Marketplace.Client/Services/IMarketPluginFetcher.cs
diff --git a/src/Adapters/Driven/Marketplace.Client/Services/MarketPluginFetcher.cs b/src/Adapters/Driven/Marketplace.Client/Services/MarketPluginFetcher.cs
@@ -4,35 +4,26 @@
 
 namespace ScriptBee.Marketplace.Client.Services;
 
-public sealed class MarketPluginFetcher : IMarketPluginFetcher
+public sealed class MarketPluginFetcher(IScriptBeeClient hubClient) : IMarketPluginFetcher
 {
-    private readonly IScriptBeeClient _hubClient;
-
-
-    public MarketPluginFetcher(IScriptBeeClient hubClient)
-    {
-        _hubClient = hubClient;
-    }
-
     public async Task UpdateRepositoryAsync(CancellationToken cancellationToken = default)
     {
-        await _hubClient.UpdateRepositoryAsync(cancellationToken);
+        await hubClient.UpdateRepositoryAsync(cancellationToken);
     }
 
     public IEnumerable<MarketPlaceProject> GetProjectsAsync()
     {
-        return _hubClient.GetScriptBeeProjects()
-            .Select(ConvertToPlugin);
+        return hubClient.GetScriptBeeProjects().Select(ConvertToPlugin);
     }
 
     private static MarketPlaceProject ConvertToPlugin(ScriptBeeProject project)
     {
-        var projectType = project.Type == ScriptBeeProjectTypes.Bundle
-            ? MarketPlaceProjectType.Bundle
-            : MarketPlaceProjectType.Plugin;
+        var projectType =
+            project.Type == ScriptBeeProjectTypes.Bundle
+                ? MarketPlaceProjectType.Bundle
+                : MarketPlaceProjectType.Plugin;
 
-        return new MarketPlaceProject
-        (
+        return new MarketPlaceProject(
             project.Id,
             project.Name,
             projectType,
@@ -44,11 +35,6 @@ private static MarketPlaceProject ConvertToPlugin(ScriptBeeProject project)
 
     private static PluginVersion ConvertToPluginVersion(ScriptBeeProjectVersion version)
     {
-        return new PluginVersion
-        (
-            version.DownloadUrl,
-            version.Version,
-            version.Manifest
-        );
+        return new PluginVersion(version.DownloadUrl, version.Version, version.Manifest);
     }
 }
diff --git a/test/Adapters/Driven/Marketplace.Client.Tests/Marketplace.Client.Tests.csproj b/test/Adapters/Driven/Marketplace.Client.Tests/Marketplace.Client.Tests.csproj
@@ -0,0 +1,11 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <RootNamespace>ScriptBee.Marketplace.Client.Tests</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\..\src\Adapters\Driven\Marketplace.Client\Marketplace.Client.csproj" />
+        <ProjectReference Include="..\..\..\Common\Tests.Common\Tests.Common.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/test/Adapters/Driven/Marketplace.Client.Tests/Services/MarketPluginFetcherTest.cs b/test/Adapters/Driven/Marketplace.Client.Tests/Services/MarketPluginFetcherTest.cs
@@ -0,0 +1,112 @@
+using DxWorks.Hub.Sdk.Clients;
+using DxWorks.Hub.Sdk.Project;
+using NSubstitute;
+using ScriptBee.Marketplace.Client.Data;
+using ScriptBee.Marketplace.Client.Services;
+
+namespace ScriptBee.Marketplace.Client.Tests.Services;
+
+public class MarketPluginFetcherTest
+{
+    private readonly IScriptBeeClient _hubClient = Substitute.For<IScriptBeeClient>();
+    private readonly MarketPluginFetcher _pluginFetcher;
+
+    public MarketPluginFetcherTest()
+    {
+        _pluginFetcher = new MarketPluginFetcher(_hubClient);
+    }
+
+    [Fact]
+    public async Task UpdateRepositoryAsync_CallsHubClientUpdateRepositoryAsync()
+    {
+        var cancellationToken = new CancellationTokenSource().Token;
+
+        await _pluginFetcher.UpdateRepositoryAsync(cancellationToken);
+
+        await _hubClient.Received(1).UpdateRepositoryAsync(cancellationToken);
+    }
+
+    [Fact]
+    public void GetProjectsAsync_CallsHubClientGetScriptBeeProjects()
+    {
+        _pluginFetcher.GetProjectsAsync();
+
+        _hubClient.Received(1).GetScriptBeeProjects();
+    }
+
+    [Fact]
+    public void GetProjectsAsync_ReturnsEmptyList_WhenHubClientReturnsEmptyList()
+    {
+        _hubClient.GetScriptBeeProjects().Returns([]);
+
+        var result = _pluginFetcher.GetProjectsAsync();
+
+        result.ShouldBeEmpty();
+    }
+
+    [Fact]
+    public void GetProjectsAsync_MapsScriptBeeProjectsToMarketPlaceProjects()
+    {
+        var scriptBeeProjects = new List<ScriptBeeProject>
+        {
+            new()
+            {
+                Id = "project1",
+                Name = "Test Plugin",
+                Type = ScriptBeeProjectTypes.Plugin,
+                Description = "A test plugin description.",
+                Authors = [new Author { Name = "John Doe" }],
+                Versions =
+                [
+                    new ScriptBeeProjectVersion
+                    {
+                        DownloadUrl = "url1",
+                        Version = new Version("1.0.0"),
+                        Manifest = "manifest1",
+                    },
+                ],
+            },
+            new()
+            {
+                Id = "bundle1",
+                Name = "Test Bundle",
+                Type = ScriptBeeProjectTypes.Bundle,
+                Description = "A test bundle description.",
+                Authors = [new Author { Name = "Jane Doe" }],
+                Versions =
+                [
+                    new ScriptBeeProjectVersion
+                    {
+                        DownloadUrl = "url2",
+                        Version = new Version("2.0.0"),
+                        Manifest = "manifest2",
+                    },
+                ],
+            },
+        };
+        _hubClient.GetScriptBeeProjects().Returns(scriptBeeProjects);
+
+        var result = _pluginFetcher.GetProjectsAsync().ToList();
+
+        result.Count.ShouldBe(2);
+        var pluginProject = result.First(p => p.Id == "project1");
+        pluginProject.Name.ShouldBe("Test Plugin");
+        pluginProject.Type.ShouldBe(MarketPlaceProjectType.Plugin);
+        pluginProject.Description.ShouldBe("A test plugin description.");
+        pluginProject.Authors.ShouldContain("John Doe");
+        var pluginVersion = pluginProject.Versions.Single();
+        pluginVersion.Url.ShouldBe("url1");
+        pluginVersion.Version.ShouldBe(new Version("1.0.0"));
+        pluginVersion.ManifestUrl.ShouldBe("manifest1");
+
+        var bundleProject = result.First(p => p.Id == "bundle1");
+        bundleProject.Name.ShouldBe("Test Bundle");
+        bundleProject.Type.ShouldBe(MarketPlaceProjectType.Bundle);
+        bundleProject.Description.ShouldBe("A test bundle description.");
+        bundleProject.Authors.ShouldContain("Jane Doe");
+        var version = bundleProject.Versions.Single();
+        version.Url.ShouldBe("url2");
+        version.Version.ShouldBe(new Version("2.0.0"));
+        version.ManifestUrl.ShouldBe("manifest2");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`public enum MarketPlaceProjectType`
`4`	`4`	`{`
`5`	`5`	`Plugin,`
`6`		`- Bundle`
	`6`	`+ Bundle,`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`public record MarketPlaceProject(`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+namespace ScriptBee.Marketplace.Client.Data;`
	`2`	`+`
	`3`	`+public record PluginVersion(string Url, Version Version, string ManifestUrl);`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,10 @@ namespace ScriptBee.Marketplace.Client;`
`6`	`6`
`7`	`7`	`public static class ScriptBeeMarketplaceClientExtensions`
`8`	`8`	`{`
`9`		`- public static IServiceCollection AddScriptBeeMarketplaceClient(this IServiceCollection services,`
`10`		`- Action<DxWorksHubSdkOptions>? configureOptionsAction = null)`
	`9`	`+ public static IServiceCollection AddScriptBeeMarketplaceClient(`
	`10`	`+ this IServiceCollection services,`
	`11`	`+ Action<DxWorksHubSdkOptions>? configureOptionsAction = null`
	`12`	`+ )`
`11`	`13`	`{`
`12`	`14`	`services.AddDxWorksHubSdk(configureOptionsAction);`
`13`	`15`	`services.AddSingleton<IMarketPluginFetcher, MarketPluginFetcher>();`