Merge branch 'release/3.801.0'

.github/workflows/module-ci.yml

@@ -1,4 +1,5 @@
-# v3.200.35
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Module CI
 
 on:
@@ -56,13 +57,13 @@ jobs:
 
     steps:
 
-      - name: Set up Node 18
-        uses: actions/setup-node@v3
+      - name: Set up Node 20
+        uses: actions/setup-node@v4
         with:
-            node-version: '18'
+            node-version: '20'
 
       - name: Set up Java 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -72,7 +73,7 @@ jobs:
         run: |
           echo "RELEASE_STATUS=true" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -127,7 +128,7 @@ jobs:
         run: vc-build Compress -skip Clean+Restore+Compile+Test
 
       - name: Publish Nuget
-        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
+        if: ${{ github.ref == 'refs/heads/master' }}
         uses: VirtoCommerce/vc-github-actions/publish-nuget@master
 
       - name: Publish to Blob
@@ -191,29 +192,17 @@ jobs:
           fi
 
       - name: Setup Git Credentials
-        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
+        if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }}
         uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master
         with: 
           githubToken: ${{ secrets.REPO_TOKEN }}
 
       - name: Publish Manifest
-        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
+        if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }}
         uses: VirtoCommerce/vc-github-actions/publish-manifest@master
         with:
           packageUrl: ${{ steps.artifactUrl.outputs.download_url }}
 
-      - name: Update virtocommerce.com
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: VirtoCommerce/vc-github-actions/update-virtocommercecom@master
-        with:
-          githubToken: ${{ secrets.REPO_TOKEN }}
-          login: ${{ secrets.VIRTOCOMMERCE_APP_ID }}
-          password: ${{ secrets.VIRTOCOMMERCE_SECRET }}
-          moduleId: ${{ steps.artifact_ver.outputs.moduleId }}
-          moduleDescription: ${{ steps.artifact_ver.outputs.moduleDescription }}
-          projectUrl: ${{ steps.artifact_ver.outputs.projectUrl }}
-          iconUrl: ${{ steps.artifact_ver.outputs.iconUrl }}
-
       - name: Parse Jira Keys from All Commits
         uses: VirtoCommerce/vc-github-actions/get-jira-keys@master
         if: always()
@@ -252,7 +241,7 @@ jobs:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
         (github.event_name == 'workflow_dispatch')}}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.4
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
       katalonRepoBranch: 'dev'
@@ -272,7 +261,7 @@ jobs:
         (github.ref == 'refs/heads/dev')) && 
         github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.4
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

.github/workflows/module-release-hotfix.yml

@@ -1,4 +1,5 @@
-# v3.200.35
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Release hotfix
 
 on:
@@ -12,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -34,7 +35,7 @@ jobs:
       changelog: ${{ steps.changelog.outputs.changelog }}
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -45,7 +46,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
@@ -62,7 +63,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install VirtoCommerce.GlobalTool
       uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master

.github/workflows/publish-nugets.yml

@@ -1,4 +1,5 @@
-# v3.200.35
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Publish nuget
 
 on:
@@ -12,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -28,7 +29,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

.github/workflows/release.yml

@@ -1,11 +1,12 @@
-# v3.200.35
+# v3.800.4
+# https://virtocommerce.atlassian.net/browse/VCST-488
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.4
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.800.0</VersionPrefix>
+    <VersionPrefix>3.801.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

src/VirtoCommerce.EventBusModule.Core/VirtoCommerce.EventBusModule.Core.csproj

@@ -12,6 +12,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.814.0" />
   </ItemGroup>
 </Project>

src/VirtoCommerce.EventBusModule.Data/Services/DefaultEventBusSubscriptionsManager.cs

@@ -20,12 +20,13 @@ public class DefaultEventBusSubscriptionsManager : IEventBusSubscriptionsManager
     {
         private readonly ISubscriptionService _subscriptionService;
         private readonly IProviderConnectionLogService _providerConnectionLogService;
-        private readonly IHandlerRegistrar _eventHandlerRegistrar;
+        private readonly IEventHandlerRegistrar _eventHandlerRegistrar;
         private readonly RegisteredEventService _registeredEventService;
         private readonly IEventBusSubscriptionsService _subscriptionsService;
         private readonly IEventBusProviderConnectionsService _providerConnections;
 
-        public DefaultEventBusSubscriptionsManager(IHandlerRegistrar eventHandlerRegistrar,
+        public DefaultEventBusSubscriptionsManager(
+            IEventHandlerRegistrar eventHandlerRegistrar,
             RegisteredEventService registeredEventService,
             ISubscriptionService subscriptionService,
             IProviderConnectionLogService providerConnectionLogService,
@@ -73,12 +74,7 @@ private async Task<bool> CheckConnection(string connectionName)
 
         public virtual void RegisterEvents()
         {
-            var allEvents = _registeredEventService.GetAllEvents();
-
-            foreach (var @event in allEvents)
-            {
-                InvokeHandler(@event.Type, _eventHandlerRegistrar);
-            }
+            _eventHandlerRegistrar.RegisterEventHandler<DomainEvent>(HandleEvent);
         }
 
 
@@ -141,6 +137,7 @@ protected virtual async Task SendEvent(DomainEvent domainEvent, string eventId,
             }
         }
 
+        [Obsolete("Register event handler for DomainEvent", DiagnosticId = "VC0008", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions")]
         protected virtual void InvokeHandler(Type eventType, IHandlerRegistrar registrar)
         {
             var registerExecutorMethod = registrar

src/VirtoCommerce.EventBusModule.Data/VirtoCommerce.EventBusModule.Data.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Azure.Messaging.EventGrid" Version="4.21.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Scriban" Version="5.9.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.814.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.EventBusModule.Core\VirtoCommerce.EventBusModule.Core.csproj" />

src/VirtoCommerce.EventBusModule.Web/module.manifest

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.EventBus</id>
-  <version>3.800.0</version>
+  <version>3.801.0</version>
   <version-tag />
-  <platformVersion>3.800.0</platformVersion>
+
+  <platformVersion>3.814.0</platformVersion>
   <dependencies />
+
   <title>Event Bus module</title>
   <description>The module enables you to be notified of new messages or changes via a Message Queue of your choice</description>
   <authors>

tests/VirtoCommerce.EventBusModule.Tests/DefaultEventBusSubscriptionsManagerTests.cs

@@ -90,7 +90,7 @@ public async Task SaveSubscriptionAsync_TrySaveUnknownProvider_ThrowException()
             Assert.Equal("The provider connection Unknown_Provider is not registered", ex.Message);
         }
 
-        private static DefaultEventBusSubscriptionsManager GetEventBusSubscriptionsManager(IHandlerRegistrar handlerRegistrar, ISubscriptionService subscriptionService)
+        private static DefaultEventBusSubscriptionsManager GetEventBusSubscriptionsManager(IEventHandlerRegistrar eventHandlerRegistrar, ISubscriptionService subscriptionService)
         {
             var registeredEventServiceMock = new Mock<RegisteredEventService>(Mock.Of<IPlatformMemoryCache>());
             var eventTypes = new List<PlatformEventInfo>
@@ -103,7 +103,7 @@ private static DefaultEventBusSubscriptionsManager GetEventBusSubscriptionsManag
             eventBusProviderServiceMock.Setup(x => x.GetProviderConnectionAsync(It.Is<string>(x => x == "FakeProvider"))).ReturnsAsync(new ProviderConnection());
             eventBusProviderServiceMock.Setup(x => x.GetConnectedProviderAsync(It.IsAny<string>())).ReturnsAsync(new FakeProvider());
 
-            return new DefaultEventBusSubscriptionsManager(handlerRegistrar,
+            return new DefaultEventBusSubscriptionsManager(eventHandlerRegistrar,
                 registeredEventServiceMock.Object,
                 subscriptionService,
                 Mock.Of<IProviderConnectionLogService>(),

tests/VirtoCommerce.EventBusModule.Tests/VirtoCommerce.EventBusModule.Tests.csproj

@@ -4,7 +4,7 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>