fix: multi-site proper feed loader. added support for querystring

Geta · May 31, 2022 · fe2d482 · fe2d482
1 parent f2ab739
commit fe2d482
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 20 deletions.
diff --git a/src/Geta.Optimizely.ProductFeed.Csv/Geta.Optimizely.ProductFeed.Csv.csproj b/src/Geta.Optimizely.ProductFeed.Csv/Geta.Optimizely.ProductFeed.Csv.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.2.0</Version>
-    <PackageVersion>2.2.0</PackageVersion>
+    <Version>2.2.1</Version>
+    <PackageVersion>2.2.1</PackageVersion>
     <PackageId>Geta.Optimizely.ProductFeed.Csv</PackageId>
     <Title>Geta Optimizely Csv Product Feed ProductFeed</Title>
     <IsPackable>true</IsPackable>

diff --git a/src/Geta.Optimizely.ProductFeed.Google/Geta.Optimizely.ProductFeed.Google.csproj b/src/Geta.Optimizely.ProductFeed.Google/Geta.Optimizely.ProductFeed.Google.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.2.0</Version>
-    <PackageVersion>2.2.0</PackageVersion>
+    <Version>2.2.1</Version>
+    <PackageVersion>2.2.1</PackageVersion>
     <PackageId>Geta.Optimizely.ProductFeed.Google</PackageId>
     <Title>Geta Optimizely Google Product Feed ProductFeed</Title>
     <IsPackable>true</IsPackable>

diff --git a/src/Geta.Optimizely.ProductFeed/Geta.Optimizely.ProductFeed.csproj b/src/Geta.Optimizely.ProductFeed/Geta.Optimizely.ProductFeed.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>2.2.0</Version>
-    <PackageVersion>2.2.0</PackageVersion>
+    <Version>2.2.1</Version>
+    <PackageVersion>2.2.1</PackageVersion>
     <PackageId>Geta.Optimizely.ProductFeed</PackageId>
     <Title>Geta Optimizely Product Feed ProductFeed</Title>
     <IsPackable>true</IsPackable>

diff --git a/src/Geta.Optimizely.ProductFeed/ProductFeedController.cs b/src/Geta.Optimizely.ProductFeed/ProductFeedController.cs
@@ -29,7 +29,7 @@ public IActionResult Get()
                 return NotFound("Feed not found");
             }
 
-            var descriptor = _feedRepository.FindDescriptorByUrl(siteHost.PathAndQuery.TrimStart('/'));
+            var descriptor = _feedRepository.FindDescriptorByUri(siteHost);
 
             return Content(Encoding.UTF8.GetString(feedInfo.FeedBytes), descriptor.MimeType);
         }

diff --git a/src/Geta.Optimizely.ProductFeed/Repositories/FeedRepository.cs b/src/Geta.Optimizely.ProductFeed/Repositories/FeedRepository.cs
@@ -21,20 +21,20 @@ public FeedRepository(FeedApplicationDbContext applicationDbContext, IEnumerable
             _descriptors = descriptors;
         }
 
-        public FeedEntity GetLatestFeed(Uri siteHost)
+        public FeedEntity GetLatestFeed(Uri siteUri)
         {
-            if (siteHost == null)
+            if (siteUri == null)
             {
-                throw new ArgumentNullException(nameof(siteHost));
+                throw new ArgumentNullException(nameof(siteUri));
             }
 
+            // we need to do client-side eval because string.Equals with comparison is not supported
             var feedContent = _applicationDbContext
                 .FeedData
-                .Where(f => f.Link.Contains(siteHost.AbsolutePath))
-                .OrderByDescending(f => f.CreatedUtc)
-                .FirstOrDefault();
+                .ToList();
 
-            return feedContent;
+            return feedContent.FirstOrDefault(f => f.Link.Equals(GetAbsoluteUrlWithoutQuery(siteUri).AbsoluteUri.TrimEnd('/'),
+                                                                 StringComparison.InvariantCultureIgnoreCase));
         }
 
         public void Save(ICollection<FeedEntity> feedData)
@@ -44,9 +44,11 @@ public void Save(ICollection<FeedEntity> feedData)
                 return;
             }
 
+            var feeds = _applicationDbContext.FeedData.ToList();
+
             foreach (var data in feedData)
             {
-                var found = _applicationDbContext.FeedData.FirstOrDefault(f => f.Link.Contains(data.Link));
+                var found = feeds.FirstOrDefault(f => f.Link.Equals(data.Link, StringComparison.InvariantCultureIgnoreCase));
 
                 if (found != null)
                 {
@@ -63,11 +65,14 @@ public void Save(ICollection<FeedEntity> feedData)
             }
         }
 
-        public FeedDescriptor FindDescriptorByUrl(string pathAndQuery)
+        public FeedDescriptor FindDescriptorByUri(Uri siteUri)
         {
-            var path = pathAndQuery.TrimStart('/');
+            var path = GetAbsoluteUrlWithoutQuery(siteUri).AbsolutePath.Trim('/');
 
-            return _descriptors.FirstOrDefault(d => d.FileName.TrimStart('/').Equals(path, StringComparison.InvariantCultureIgnoreCase));
+            return _descriptors.FirstOrDefault(d => d.FileName.Trim('/').Equals(path, StringComparison.InvariantCultureIgnoreCase));
         }
+
+        private Uri GetAbsoluteUrlWithoutQuery(Uri siteUri)
+            => new UriBuilder(siteUri) { Query = string.Empty }.Uri;
     }
 }
diff --git a/src/Geta.Optimizely.ProductFeed/Repositories/IFeedRepository.cs b/src/Geta.Optimizely.ProductFeed/Repositories/IFeedRepository.cs
@@ -10,10 +10,10 @@ namespace Geta.Optimizely.ProductFeed.Repositories
 {
     public interface IFeedRepository
     {
-        FeedEntity GetLatestFeed(Uri siteHost);
+        FeedEntity GetLatestFeed(Uri siteUri);
 
         void Save(ICollection<FeedEntity> feedData);
 
-        FeedDescriptor FindDescriptorByUrl(string pathAndQuery);
+        FeedDescriptor FindDescriptorByUri(Uri siteUri);
     }
 }