Merge pull request #124 from erincdustin/test_multiple_filters

Maintenance updates
ordercloud-api · Apr 5, 2024 · 2cfffa8 · 2cfffa8
2 parents a106a57 + 0dc9931
commit 2cfffa8
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 26 deletions.
diff --git a/OrderCloud.Catalyst.Tests/ApiIntegrationTests/ListArgTests.cs b/OrderCloud.Catalyst.Tests/ApiIntegrationTests/ListArgTests.cs
@@ -206,5 +206,15 @@ public async Task filters_should_deserialize(string query, List<ListFilter> expe
 				}
 			}
 		}
-	}
+
+        [TestCase("property=value", 1)]
+        [TestCase("xp.author=test*&xp.author=!*user", 2)]
+        public async Task multiple_filters_on_same_property_name_should_succeed(string query, int expectedFilterCount)
+        {
+            var response = await QueryListArgsRoute(query);
+            Assert.AreEqual(200, response.StatusCode);
+            var args = await response.GetJsonAsync<ListArgs<ExampleModel>>();
+            Assert.AreEqual(expectedFilterCount, args.Filters.Count);
+        }
+    }
 }
diff --git a/OrderCloud.Catalyst/OrderCloud.Catalyst.csproj b/OrderCloud.Catalyst/OrderCloud.Catalyst.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Version>2.3.4</Version>
     <PackageId>ordercloud-dotnet-catalyst</PackageId>
     <Title>OrderCloud SDK Extensions for Azure App Services</Title>
-    <Authors>Oliver Heywood</Authors>
+	<Authors>OrderCloud Team</Authors>
     <Description>Extensions and helpers for building .NET APIs and Serverless Functions, typically hosted in Azure App Services, that integrate with the OrderCloud.io e-commerce platform.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2024 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>
@@ -25,16 +25,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LazyCache" Version="2.1.3" />
+    <PackageReference Include="LazyCache" Version="2.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="4.4.0" />
-    <PackageReference Include="OrderCloud.SDK" Version="0.12.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.1.0" />
+    <PackageReference Include="OrderCloud.SDK" Version="0.13.5" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...Cloud.Integrations.Messaging.MailChimp/OrderCloud.Integrations.Messaging.MailChimp.csproj b/...Cloud.Integrations.Messaging.MailChimp/OrderCloud.Integrations.Messaging.MailChimp.csproj
@@ -5,7 +5,7 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Messaging.MailChimp</PackageId>
     <Title>OrderCloud Email Integration with MailChimp</Title>
-    <Authors>Oliver Heywood</Authors>
+	<Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with MailChimp for Email.</Description>
     <Copyright>Copyright 2022, Sitecore.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>

diff --git a/OrderCloud.Integrations.Messaging.SendGrid/OrderCloud.Integrations.Messaging.SendGrid.csproj b/OrderCloud.Integrations.Messaging.SendGrid/OrderCloud.Integrations.Messaging.SendGrid.csproj
@@ -5,7 +5,7 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Messaging.SendGrid</PackageId>
     <Title>OrderCloud Email Integration with SendGrid</Title>
-    <Authors>Oliver Heywood</Authors>
+	<Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with Sendgrid for Email.</Description>
     <Copyright>Copyright 2022, Sitecore.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>

diff --git a/...oud.Integrations.Messaging.Sendinblue/OrderCloud.Integrations.Messaging.SendInBlue.csproj b/...oud.Integrations.Messaging.Sendinblue/OrderCloud.Integrations.Messaging.SendInBlue.csproj
@@ -5,7 +5,7 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Messaging.SendInBlue</PackageId>
     <Title>OrderCloud Email Integration with Sendinblue</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with Sendinblue for Email.</Description>
     <Copyright>Copyright 2022, Sitecore.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>

diff --git a/OrderCloud.Integrations.Payment.BlueSnap/OrderCloud.Integrations.Payment.BlueSnap.csproj b/OrderCloud.Integrations.Payment.BlueSnap/OrderCloud.Integrations.Payment.BlueSnap.csproj
@@ -5,7 +5,7 @@
 		<Version>2.3.0</Version>
 		<PackageId>OrderCloud.Integrations.Payment.BlueSnap</PackageId>
 		<Title>OrderCloud Payment Integration with BlueSnap</Title>
-		<Authors>Oliver Heywood</Authors>
+		<Authors>OrderCloud Team</Authors>
 		<Description>Integrate the OrderCloud ecommerce platform with BlueSnap for payments.</Description>
 		<Copyright>Copyright 2022, Sitecore.</Copyright>
 		<PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>

diff --git a/...Cloud.Integrations.Payment.CardConnect/OrderCloud.Integrations.Payment.CardConnect.csproj b/...Cloud.Integrations.Payment.CardConnect/OrderCloud.Integrations.Payment.CardConnect.csproj
@@ -6,7 +6,7 @@
 		<Version>2.3.0</Version>
 		<PackageId>OrderCloud.Integrations.Payment.CardConnect</PackageId>
 		<Title>OrderCloud Tax Integration with CardConnect</Title>
-		<Authors>DJ Steinmetz</Authors>
+		<Authors>OrderCloud Team</Authors>
 		<Description>Integrate the OrderCloud ecommerce platform with CardConnect for payments.</Description>
 		<Copyright>Copyright 2022, Sitecore.</Copyright>
 		<PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>

diff --git a/OrderCloud.Integrations.Payment.Stripe/OrderCloud.Integrations.Payment.Stripe.csproj b/OrderCloud.Integrations.Payment.Stripe/OrderCloud.Integrations.Payment.Stripe.csproj
@@ -6,7 +6,7 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Payment.Stripe</PackageId>
     <Title>OrderCloud Tax Integration with Stripe</Title>
-    <Authors>Alexa Snyder</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with Stripe for payments.</Description>
     <Copyright>Copyright 2022, Sitecore.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>

diff --git a/OrderCloud.Integrations.Shipping.EasyPost/OrderCloud.Integrations.Shipping.EasyPost.csproj b/OrderCloud.Integrations.Shipping.EasyPost/OrderCloud.Integrations.Shipping.EasyPost.csproj
@@ -6,9 +6,9 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Shipping.EasyPost</PackageId>
     <Title>OrderCloud Shipping Integration with EasyPost</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with EasyPost for Shipping.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2021 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>

diff --git a/OrderCloud.Integrations.Shipping.Fedex/OrderCloud.Integrations.Shipping.Fedex.csproj b/OrderCloud.Integrations.Shipping.Fedex/OrderCloud.Integrations.Shipping.Fedex.csproj
@@ -6,9 +6,9 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Shipping.Fedex</PackageId>
     <Title>OrderCloud Shipping Integration with Fedex</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with Fedex for Shipping.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2021 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>

diff --git a/OrderCloud.Integrations.Shipping.UPS/OrderCloud.Integrations.Shipping.UPS.csproj b/OrderCloud.Integrations.Shipping.UPS/OrderCloud.Integrations.Shipping.UPS.csproj
@@ -6,9 +6,9 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Shipping.UPS</PackageId>
     <Title>OrderCloud Shipping Integration with UPS</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with UPS for Shipping.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2021 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>

diff --git a/OrderCloud.Integrations.Tax.Avalara/OrderCloud.Integrations.Tax.Avalara.csproj b/OrderCloud.Integrations.Tax.Avalara/OrderCloud.Integrations.Tax.Avalara.csproj
@@ -6,9 +6,9 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Tax.Avalara</PackageId>
     <Title>OrderCloud Tax Integration with Avalara</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with Avalara for tax calculation.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2021 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>

diff --git a/OrderCloud.Integrations.Tax.TaxJar/OrderCloud.Integrations.Tax.TaxJar.csproj b/OrderCloud.Integrations.Tax.TaxJar/OrderCloud.Integrations.Tax.TaxJar.csproj
@@ -6,9 +6,9 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Tax.TaxJar</PackageId>
     <Title>OrderCloud Tax Integration with TaxJar</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with TaxJar for tax calculation.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2021 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>

diff --git a/OrderCloud.Integrations.Tax.Vertex/OrderCloud.Integrations.Tax.Vertex.csproj b/OrderCloud.Integrations.Tax.Vertex/OrderCloud.Integrations.Tax.Vertex.csproj
@@ -6,9 +6,9 @@
     <Version>2.3.0</Version>
     <PackageId>OrderCloud.Integrations.Tax.Vertex</PackageId>
     <Title>OrderCloud Tax Integration with Vertex</Title>
-    <Authors>Oliver Heywood</Authors>
+    <Authors>OrderCloud Team</Authors>
     <Description>Integrate the OrderCloud ecommerce platform with Vertex for tax calculation.</Description>
-    <Copyright>Copyright 2021 Four51, Inc.</Copyright>
+    <Copyright>Copyright 2021 Sitecore, Inc.</Copyright>
     <PackageProjectUrl>https://github.com/ordercloud-api/ordercloud-dotnet-catalyst</PackageProjectUrl>
     <PackageIconUrl></PackageIconUrl>
     <PackageIcon>sitecore_logo.jpg</PackageIcon>