From 2a07f76c9799b0ec6993c446412d3ce155238c62 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Thu, 16 Jul 2026 00:53:03 +0530 Subject: [PATCH] fix: added branch set via the stack config --- .../Taxonomy/TaxonomyLocalisationTest.cs | 1 - Contentstack.Core/Models/Taxonomy.cs | 11 ++++-- Contentstack.Core/Models/Term.cs | 35 +++++++++++++++---- Contentstack.Core/Models/TermQuery.cs | 14 +++++--- 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/Contentstack.Core.Tests/Integration/Taxonomy/TaxonomyLocalisationTest.cs b/Contentstack.Core.Tests/Integration/Taxonomy/TaxonomyLocalisationTest.cs index 1b768ef..2f749d6 100644 --- a/Contentstack.Core.Tests/Integration/Taxonomy/TaxonomyLocalisationTest.cs +++ b/Contentstack.Core.Tests/Integration/Taxonomy/TaxonomyLocalisationTest.cs @@ -141,7 +141,6 @@ public async Task Find_Terms_WithLocaleAndFallback_ReturnsTerms() LogAssert("Verifying response"); Assert.NotNull(result); Assert.NotNull(result.Items); - // Fallback means we should get at least as many terms as without fallback Assert.True(result.Items.Any()); } diff --git a/Contentstack.Core/Models/Taxonomy.cs b/Contentstack.Core/Models/Taxonomy.cs index 6ac5d3b..f4b81f8 100644 --- a/Contentstack.Core/Models/Taxonomy.cs +++ b/Contentstack.Core/Models/Taxonomy.cs @@ -126,10 +126,9 @@ public async System.Threading.Tasks.Task Fetch(string locale = null) mainJson["locale"] = locale; var handler = new HttpRequestHandler(Stack); - var branch = Stack.Config?.Branch ?? "main"; var result = await handler.ProcessRequest( _Url, headerAll, mainJson, - Branch: branch, + Branch: Stack.Config.Branch, timeout: Stack.Config.Timeout, proxy: Stack.Config.Proxy ); @@ -142,7 +141,13 @@ public async System.Threading.Tasks.Task Fetch(string locale = null) } catch (Exception ex) { - throw TaxonomyException.CreateForProcessingError(ex); + var contentstackError = GetContentstackError(ex); + throw new TaxonomyException(contentstackError.Message, ex) + { + ErrorCode = contentstackError.ErrorCode, + StatusCode = contentstackError.StatusCode, + Errors = contentstackError.Errors + }; } } diff --git a/Contentstack.Core/Models/Term.cs b/Contentstack.Core/Models/Term.cs index d45864f..39c302d 100644 --- a/Contentstack.Core/Models/Term.cs +++ b/Contentstack.Core/Models/Term.cs @@ -60,7 +60,13 @@ public async Task Fetch(string locale = null) } catch (Exception ex) { - throw TaxonomyException.CreateForProcessingError(ex); + var contentstackError = Taxonomy.GetContentstackError(ex); + throw new TaxonomyException(contentstackError.Message, ex) + { + ErrorCode = contentstackError.ErrorCode, + StatusCode = contentstackError.StatusCode, + Errors = contentstackError.Errors + }; } } @@ -91,7 +97,13 @@ public async Task Locales() } catch (Exception ex) { - throw TaxonomyException.CreateForProcessingError(ex); + var contentstackError = Taxonomy.GetContentstackError(ex); + throw new TaxonomyException(contentstackError.Message, ex) + { + ErrorCode = contentstackError.ErrorCode, + StatusCode = contentstackError.StatusCode, + Errors = contentstackError.Errors + }; } } @@ -122,7 +134,13 @@ public async Task Ancestors() } catch (Exception ex) { - throw TaxonomyException.CreateForProcessingError(ex); + var contentstackError = Taxonomy.GetContentstackError(ex); + throw new TaxonomyException(contentstackError.Message, ex) + { + ErrorCode = contentstackError.ErrorCode, + StatusCode = contentstackError.StatusCode, + Errors = contentstackError.Errors + }; } } @@ -153,7 +171,13 @@ public async Task Descendants() } catch (Exception ex) { - throw TaxonomyException.CreateForProcessingError(ex); + var contentstackError = Taxonomy.GetContentstackError(ex); + throw new TaxonomyException(contentstackError.Message, ex) + { + ErrorCode = contentstackError.ErrorCode, + StatusCode = contentstackError.StatusCode, + Errors = contentstackError.Errors + }; } } @@ -172,10 +196,9 @@ private async Task ExecuteRequest(string url, Dictionary mainJson[param.Key] = param.Value; var handler = new HttpRequestHandler(_stack); - var branch = _stack.Config?.Branch ?? "main"; return await handler.ProcessRequest( url, headerAll, mainJson, - Branch: branch, + Branch: _stack.Config.Branch, timeout: _stack.Config.Timeout, proxy: _stack.Config.Proxy ); diff --git a/Contentstack.Core/Models/TermQuery.cs b/Contentstack.Core/Models/TermQuery.cs index d1d0876..eb64ee6 100644 --- a/Contentstack.Core/Models/TermQuery.cs +++ b/Contentstack.Core/Models/TermQuery.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Contentstack.Core.Internals; using Newtonsoft.Json.Linq; @@ -87,10 +88,9 @@ public async Task> Find() mainJson[param.Key] = param.Value; var handler = new HttpRequestHandler(_stack); - var branch = _stack.Config?.Branch ?? "main"; var result = await handler.ProcessRequest( Url, headerAll, mainJson, - Branch: branch, + Branch: _stack.Config.Branch, timeout: _stack.Config.Timeout, proxy: _stack.Config.Proxy ); @@ -98,7 +98,7 @@ public async Task> Find() var jObject = JObject.Parse(result); var terms = jObject.SelectToken("$.terms")?.ToObject>(_stack.Serializer); var collection = jObject.ToObject>(_stack.Serializer); - collection.Items = terms ?? new List(); + collection.Items = terms ?? Enumerable.Empty(); return collection; } catch (TaxonomyException) @@ -107,7 +107,13 @@ public async Task> Find() } catch (Exception ex) { - throw TaxonomyException.CreateForProcessingError(ex); + var contentstackError = Taxonomy.GetContentstackError(ex); + throw new TaxonomyException(contentstackError.Message, ex) + { + ErrorCode = contentstackError.ErrorCode, + StatusCode = contentstackError.StatusCode, + Errors = contentstackError.Errors + }; } } }