From f8792a9ad5a07fe237df9d3c3ec7b86357e71179 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 30 Jun 2025 19:46:23 +0530 Subject: [PATCH 1/3] Fix: Changed the Type of Version when using single entry publish --- CHANGELOG.md | 3 +++ .../Core/Services/Models/PublishUnpublishServiceTest.cs | 4 ++-- .../Utils/ContentstackUtilitiesTest.cs | 4 +--- Contentstack.Management.Core/ContentstackClient.cs | 2 +- .../Models/PublishUnpublishDetails.cs | 2 +- .../Services/Models/PublishUnpublishService.cs | 4 ++-- Directory.Build.props | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e367ddd..c8c5ce6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Changelog +## [v0.1.13](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.13) + - Fix + - Fixed the Single Publish issue with specific entry version (Changing the type from String to Int) ## [v0.1.12](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.12) - Fix diff --git a/Contentstack.Management.Core.Unit.Tests/Core/Services/Models/PublishUnpublishServiceTest.cs b/Contentstack.Management.Core.Unit.Tests/Core/Services/Models/PublishUnpublishServiceTest.cs index 4ef39b5..8e4018a 100644 --- a/Contentstack.Management.Core.Unit.Tests/Core/Services/Models/PublishUnpublishServiceTest.cs +++ b/Contentstack.Management.Core.Unit.Tests/Core/Services/Models/PublishUnpublishServiceTest.cs @@ -101,7 +101,7 @@ public void Should_Create_Content_Body() Assert.IsNotNull(service); Assert.AreEqual("POST", service.HttpMethod); Assert.AreEqual(resourcePath, service.ResourcePath); - Assert.AreEqual($"{{\"{fieldName}\":{{\"locales\":[{string.Join(",", locales)}],\"environments\":[{string.Join(",", environments)}]}},\"version\":\"{details.Version}\",\"scheduled_at\":\"{details.ScheduledAt}\"}}", Encoding.Default.GetString(service.ByteContent)); + Assert.AreEqual($"{{\"{fieldName}\":{{\"locales\":[{string.Join(",", locales)}],\"environments\":[{string.Join(",", environments)}]}},\"version\":{details.Version},\"scheduled_at\":\"{details.ScheduledAt}\"}}", Encoding.Default.GetString(service.ByteContent)); } [TestMethod] @@ -132,7 +132,7 @@ public void Should_Create_Content_Body_with_Locale() Assert.IsNotNull(service); Assert.AreEqual("POST", service.HttpMethod); Assert.AreEqual(resourcePath, service.ResourcePath); - Assert.AreEqual($"{{\"{fieldName}\":{{\"locales\":[{string.Join(",", locales)}],\"environments\":[{string.Join(",", environments)}]}},\"version\":\"{details.Version}\",\"locale\":\"{locale}\",\"scheduled_at\":\"{details.ScheduledAt}\"}}", Encoding.Default.GetString(service.ByteContent)); + Assert.AreEqual($"{{\"{fieldName}\":{{\"locales\":[{string.Join(",", locales)}],\"environments\":[{string.Join(",", environments)}]}},\"version\":{details.Version},\"locale\":\"{locale}\",\"scheduled_at\":\"{details.ScheduledAt}\"}}", Encoding.Default.GetString(service.ByteContent)); } public void Should_Create_Blank_Content_Body() diff --git a/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs b/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs index 743fbcf..ac90fcb 100644 --- a/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs +++ b/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs @@ -92,10 +92,8 @@ public void Return_Query_Parameters_On_ParameterCollection() JObject q_obj = JObject.Parse("{ \"price_in_usd\": { \"$lt\": 600 } }"); param.AddQuery(q_obj); - var result = ContentstackUtilities.GetQueryParameter(param); - - Assert.AreEqual("include=type&limit=10&query=%7B%0D%0A%20%20%22price_in_usd%22%3A%20%7B%0D%0A%20%20%20%20%22%24lt%22%3A%20600%0D%0A%20%20%7D%0D%0A%7D", result); + Assert.AreEqual("include=type&limit=10&query=%7B%0A%20%20%22price_in_usd%22%3A%20%7B%0A%20%20%20%20%22%24lt%22%3A%20600%0A%20%20%7D%0A%7D", result); } [TestMethod] diff --git a/Contentstack.Management.Core/ContentstackClient.cs b/Contentstack.Management.Core/ContentstackClient.cs index aac5aae..e82eb3a 100644 --- a/Contentstack.Management.Core/ContentstackClient.cs +++ b/Contentstack.Management.Core/ContentstackClient.cs @@ -35,7 +35,7 @@ public class ContentstackClient : IContentstackClient private HttpClient _httpClient; private bool _disposed = false; - private string Version => "0.1.12"; + private string Version => "0.1.13"; private string xUserAgent => $"contentstack-management-dotnet/{Version}"; #endregion diff --git a/Contentstack.Management.Core/Models/PublishUnpublishDetails.cs b/Contentstack.Management.Core/Models/PublishUnpublishDetails.cs index 1584960..19003ea 100644 --- a/Contentstack.Management.Core/Models/PublishUnpublishDetails.cs +++ b/Contentstack.Management.Core/Models/PublishUnpublishDetails.cs @@ -10,7 +10,7 @@ public class PublishUnpublishDetails public List Environments { get; set; } - public string Version { get; set; } + public int? Version { get; set; } public string ScheduledAt { get; set; } diff --git a/Contentstack.Management.Core/Services/Models/PublishUnpublishService.cs b/Contentstack.Management.Core/Services/Models/PublishUnpublishService.cs index d223ed6..c768ea4 100644 --- a/Contentstack.Management.Core/Services/Models/PublishUnpublishService.cs +++ b/Contentstack.Management.Core/Services/Models/PublishUnpublishService.cs @@ -70,7 +70,7 @@ public override void ContentBody() } writer.WriteEndObject(); - if (!string.IsNullOrEmpty(details.Version)) + if (details.Version!=null) { writer.WritePropertyName("version"); writer.WriteValue(details.Version); @@ -83,7 +83,7 @@ public override void ContentBody() writer.WriteValue(locale); } - if (!string.IsNullOrEmpty(details.Version)) + if (!string.IsNullOrEmpty(details.ScheduledAt)) { writer.WritePropertyName("scheduled_at"); writer.WriteValue(details.ScheduledAt); diff --git a/Directory.Build.props b/Directory.Build.props index e346ee5..c25154d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,5 @@ - 0.1.12 + 0.1.13 From 3ffb35d7933908727f0861c86855f3b3840bc807 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 30 Jun 2025 20:00:14 +0530 Subject: [PATCH 2/3] Revert the Test cases changes --- .../Utils/ContentstackUtilitiesTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs b/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs index ac90fcb..9279087 100644 --- a/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs +++ b/Contentstack.Management.Core.Unit.Tests/Utils/ContentstackUtilitiesTest.cs @@ -93,7 +93,7 @@ public void Return_Query_Parameters_On_ParameterCollection() JObject q_obj = JObject.Parse("{ \"price_in_usd\": { \"$lt\": 600 } }"); param.AddQuery(q_obj); var result = ContentstackUtilities.GetQueryParameter(param); - Assert.AreEqual("include=type&limit=10&query=%7B%0A%20%20%22price_in_usd%22%3A%20%7B%0A%20%20%20%20%22%24lt%22%3A%20600%0A%20%20%7D%0A%7D", result); + Assert.AreEqual("include=type&limit=10&query=%7B%0D%0A%20%20%22price_in_usd%22%3A%20%7B%0D%0A%20%20%20%20%22%24lt%22%3A%20600%0D%0A%20%20%7D%0D%0A%7D", result); } [TestMethod] From 93c1ce86f5c52e1522e05d757a43c84a0ab6dbe8 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 30 Jun 2025 21:03:40 +0530 Subject: [PATCH 3/3] Version bump --- CHANGELOG.md | 2 +- Contentstack.Management.Core/ContentstackClient.cs | 2 +- Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8c5ce6..40509e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## [v0.1.13](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.13) +## [v0.2.0](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.2.0) - Fix - Fixed the Single Publish issue with specific entry version (Changing the type from String to Int) diff --git a/Contentstack.Management.Core/ContentstackClient.cs b/Contentstack.Management.Core/ContentstackClient.cs index e82eb3a..6425b22 100644 --- a/Contentstack.Management.Core/ContentstackClient.cs +++ b/Contentstack.Management.Core/ContentstackClient.cs @@ -35,7 +35,7 @@ public class ContentstackClient : IContentstackClient private HttpClient _httpClient; private bool _disposed = false; - private string Version => "0.1.13"; + private string Version => "0.2.0"; private string xUserAgent => $"contentstack-management-dotnet/{Version}"; #endregion diff --git a/Directory.Build.props b/Directory.Build.props index c25154d..15aebe4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,5 @@ - 0.1.13 + 0.2.0