Merge pull request #191 from contentstack/fix/branch

fix: added branch set via the stack config

Author: OMpawar-21

Contentstack.Core.Tests/Integration/Taxonomy/TaxonomyLocalisationTest.cs

@@ -146,7 +146,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());
         }
 

Contentstack.Core/Models/Taxonomy.cs

@@ -126,10 +126,9 @@ public async System.Threading.Tasks.Task<T> Fetch<T>(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<T> Fetch<T>(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
+                };
             }
         }
 

Contentstack.Core/Models/Term.cs

@@ -64,7 +64,13 @@ public async Task<T> Fetch<T>(string locale = null, bool includeFallback = false
             }
             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
+                };
             }
         }
 
@@ -95,7 +101,13 @@ public async Task<T> Locales<T>()
             }
             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
+                };
             }
         }
 
@@ -126,7 +138,13 @@ public async Task<T> Ancestors<T>()
             }
             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
+                };
             }
         }
 
@@ -157,7 +175,13 @@ public async Task<T> Descendants<T>()
             }
             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
+                };
             }
         }
 
@@ -176,10 +200,9 @@ private async Task<string> ExecuteRequest(string url, Dictionary<string, object>
                     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
             );

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,18 +88,17 @@ public async Task<ContentstackCollection<T>> Find<T>()
                     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
                 );
 
                 var jObject = JObject.Parse(result);
                 var terms = jObject.SelectToken("$.terms")?.ToObject<IEnumerable<T>>(_stack.Serializer);
                 var collection = jObject.ToObject<ContentstackCollection<T>>(_stack.Serializer);
-                collection.Items = terms ?? new List<T>();
+                collection.Items = terms ?? Enumerable.Empty<T>();
                 return collection;
             }
             catch (TaxonomyException)
@@ -107,7 +107,13 @@ public async Task<ContentstackCollection<T>> Find<T>()
             }
             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
+                };
             }
         }
     }