Add querystring to contentypes calls

Author: Roblinde

Diff for: Contentful.Core.Tests/ContentfulManagementClientTests.cs

@@ -3078,7 +3078,29 @@ public async Task SettingEnvironmentForContentTypesShouldYieldCorrectUrl()
             Assert.Equal(5, res.Count());
             Assert.Equal("someName", res.First().Name);
             Assert.Equal(8, (res.First().Fields.First().Validations.First() as SizeValidator).Max);
-            Assert.Equal("https://api.contentful.com/spaces/564/environments/special/content_types", path);
+            Assert.Equal("https://api.contentful.com/spaces/564/environments/special/content_types/", path);
+        }
+
+        [Fact]
+        public async Task SettingEnvironmentAndQueryContentTypesShouldYieldCorrectUrl()
+        {
+            //Arrange
+            _handler.Response = GetResponseFromFile(@"ContenttypesCollectionManagement.json");
+            var client = GetClientWithEnvironment();
+            var path = "";
+            _handler.VerifyRequest = (HttpRequestMessage request) =>
+            {
+                path = request.RequestUri.ToString();
+            };
+
+            //Act
+            var res = await client.GetContentTypes("?limit=1000", "564");
+
+            //Assert
+            Assert.Equal(5, res.Count());
+            Assert.Equal("someName", res.First().Name);
+            Assert.Equal(8, (res.First().Fields.First().Validations.First() as SizeValidator).Max);
+            Assert.Equal("https://api.contentful.com/spaces/564/environments/special/content_types/?limit=1000", path);
         }
 
         [Fact]

Diff for: Contentful.Core/ContentfulClient.cs

@@ -472,7 +472,18 @@ public async Task<ContentType> GetContentType(string contentTypeId, Cancellation
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
         public async Task<IEnumerable<ContentType>> GetContentTypes(CancellationToken cancellationToken = default)
         {
-            var res = await Get($"{_baseUrl}{_options.SpaceId}/{EnvironmentsBase}content_types/", cancellationToken).ConfigureAwait(false);
+            return await GetContentTypes(null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Get all content types of a space.
+        /// </summary>
+        /// <param name="queryString">The optional querystring to add additional filtering to the query.</param>
+        /// <param name="cancellationToken">The optional cancellation token to cancel the operation.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
+        public async Task<IEnumerable<ContentType>> GetContentTypes(string queryString, CancellationToken cancellationToken = default)
+        {
+            var res = await Get($"{_baseUrl}{_options.SpaceId}/{EnvironmentsBase}content_types/{queryString}", cancellationToken).ConfigureAwait(false);
 
             var jsonObject = JObject.Parse(await res.Content.ReadAsStringAsync().ConfigureAwait(false));
             var contentTypes = jsonObject.SelectTokens("$..items[*]").Select(t => t.ToObject<ContentType>(Serializer));

Diff for: Contentful.Core/ContentfulManagementClient.cs

@@ -167,7 +167,19 @@ public async Task DeleteSpace(string id, CancellationToken cancellationToken = d
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
         public async Task<IEnumerable<ContentType>> GetContentTypes(string spaceId = null, CancellationToken cancellationToken = default)
         {
-            var res = await GetAsync($"{_baseUrl}{spaceId ?? _options.SpaceId}/{EnvironmentsBase}content_types", cancellationToken).ConfigureAwait(false);
+            return await GetContentTypes(null, spaceId, cancellationToken);
+        }
+
+        /// <summary>
+        /// Get all content types of a space.
+        /// </summary>
+        /// <param name="queryString">The optional querystring to add additional filtering to the query.</param>
+        /// <param name="spaceId">The id of the space to get the content types of. Will default to the one set when creating the client.</param>
+        /// <param name="cancellationToken">The optional cancellation token to cancel the operation.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
+        public async Task<IEnumerable<ContentType>> GetContentTypes(string queryString, string spaceId = null, CancellationToken cancellationToken = default)
+        {
+            var res = await GetAsync($"{_baseUrl}{spaceId ?? _options.SpaceId}/{EnvironmentsBase}content_types/{queryString}", cancellationToken).ConfigureAwait(false);
 
             await EnsureSuccessfulResult(res).ConfigureAwait(false);
 

Diff for: Contentful.Core/IContentfulClient.cs

@@ -157,6 +157,13 @@ public interface IContentfulClient
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
         Task<IEnumerable<ContentType>> GetContentTypes(CancellationToken cancellationToken = default);
 
+        /// <summary>
+        /// Get all content types of a space.
+        /// </summary>
+        /// <param name="queryString">The optional querystring to add additional filtering to the query.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
+        Task<IEnumerable<ContentType>> GetContentTypes(string queryString, CancellationToken cancellationToken = default);
+
         /// <summary>
         /// Get all locales of an environment.
         /// </summary>

Diff for: Contentful.Core/IContentfulManagementClient.cs

@@ -410,6 +410,15 @@ public interface IContentfulManagementClient
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
         Task<IEnumerable<ContentType>> GetContentTypes(string spaceId = null, CancellationToken cancellationToken = default);
 
+        /// <summary>
+        /// Get all content types of a space.
+        /// </summary>
+        /// <param name="queryString">The optional querystring to add additional filtering to the query.</param>
+        /// <param name="spaceId">The id of the space to get the content types of. Will default to the one set when creating the client.</param>
+        /// <param name="cancellationToken">The optional cancellation token to cancel the operation.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ContentType"/>.</returns>
+        Task<IEnumerable<ContentType>> GetContentTypes(string queryString, string spaceId = null, CancellationToken cancellationToken = default);
+
         /// <summary>
         /// Gets a <see cref="Contentful.Core.Models.Management.EditorInterface"/> for a specific <seealso cref="ContentType"/>.
         /// </summary>