Merge branch 'hotfix/2.24.5' into develop

Terradue · Jun 17, 2024 · 606d1be · 606d1be
2 parents 67fab10 + 3db7ea0
commit 606d1be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>2.24.4</Version>
+    <Version>2.24.5</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj
@@ -4,7 +4,7 @@
         <ProjectName>Terradue.Stars.Data</ProjectName>
         <Title>Terradue.Stars.Data</Title>
         <Description>Collection of data Plugins for Terradue.Stars</Description>
-        <Version>2.24.4</Version>
+        <Version>2.24.5</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>

diff --git a/src/Stars.Services/Router/RouterService.cs b/src/Stars.Services/Router/RouterService.cs
@@ -62,12 +62,6 @@ public async Task<object> RouteAsync(IResource route, int recursivity, IRouter p
                     // Execute the function for the item and return;
                     return await onItemFunction.Invoke(itemNode, prevRouter, state, ct);
                 }
-                // If route is a Collection
-                if (route is ICollection collectionNode)
-                {
-                    // Execute the function for the collection and return;
-                    return await onCollectionFunction.Invoke(collectionNode, prevRouter, state, ct);
-                }
                 // Ask the router manager if there is another router available for this route
                 router = await routersManager.GetRouterAsync(route);
                 // Definitively impossible to Route
@@ -88,8 +82,8 @@ public async Task<object> RouteAsync(IResource route, int recursivity, IRouter p
                     // If route is a Collection
                     if (newRoute is ICollection)
                     {
-                        // Execute the function for the collection and return;
-                        return await onCollectionFunction.Invoke(newRoute as ICollection, prevRouter, state, ct);
+                        // Execute the function for the collection
+                        await onCollectionFunction.Invoke(newRoute as ICollection, prevRouter, state, ct);
                     }
 
                     catalogNode = newRoute as ICatalog;
@@ -103,6 +97,12 @@ public async Task<object> RouteAsync(IResource route, int recursivity, IRouter p
             }
             else
             {
+                // If route is a Collection
+                if (catalogNode is ICollection)
+                {
+                    // Execute the function for the collection
+                    await onCollectionFunction.Invoke(catalogNode as ICollection, router, state, ct);
+                }
                 // If the resource is a catalog, we keep the previous router
                 router = prevRouter;
             }

diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>Terradue.Stars</Title>
     <Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
-    <Version>2.24.4</Version>
+    <Version>2.24.5</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <AssemblyName>Terradue.Stars.Services</AssemblyName>