Merge pull request #59 from contentstack/development

Fix: Variants test cases

Author: nadeem-cs

.github/workflows/check-branch.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |

CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version: 2.15.1
+#### Date: Oct-08-2024
+
+##### Fix: 
+- Removed exclusion of env when adding headers
+
 ### Version: 2.15.0
 #### Date: Jul-30-2024
 

Contentstack.Core.Tests/EntryTest.cs

@@ -98,6 +98,8 @@ await sourceEntry
                     else
                     {
                         Assert.True(result.Uid == sourceEntry.Uid);
+                        Assert.NotNull(result._variant);
+                        Assert.NotNull(result._variant["_uid"]);
                     }
                 });
         }
@@ -120,6 +122,8 @@ await sourceEntry
                     else
                     {
                         Assert.True(result.Uid == sourceEntry.Uid);
+                        Assert.NotNull(result._variant);
+                        Assert.NotNull(result._variant["_uid"]);
                     }
                 });
         }

Contentstack.Core/Models/Entry.cs

@@ -48,7 +48,7 @@ private string _Url
 
         internal Dictionary<string, object> _metadata = new Dictionary<string, object>();
         #endregion
-
+
         #region Public Properties
         /// <summary>
         /// Title of an entry
@@ -110,6 +110,22 @@ private string _Url
         /// </example>
         public Dictionary<string, object> Metadata { get; set; }
 
+        /// <summary>
+        /// Set key/value attributes of an current entry instance.
+        /// </summary>
+        /// <example>
+        /// <code>
+        ///     ContentstackClient stack = new ContentstackClinet(&quot;api_key&quot;, &quot;delivery_token&quot;, &quot;environment&quot;);
+        ///     Entry entry = stack.ContentType(&quot;contentType_id&quot;).Entry(&quot;entry_uid&quot;);
+        ///     entry.Fetch&lt;Product&gt;().ContinueWith((entryResult) =&gt; {
+        ///         //Your callback code.
+        ///         //var result = entryResult.Result.Object;
+        ///     });
+        /// </code>
+        /// </example>
+        public Dictionary<string, object> _variant { get; set; }
+
+
         /// <summary>
         /// Set key/value attributes of an current entry instance.
         /// </summary>
@@ -1380,12 +1396,8 @@ public async Task<T> Fetch<T>()
                 headerAll["authorization"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.ManagementToken;
                 isLivePreview = true;
             }
-            else 
-            {
-                mainJson.Add("environment", this.ContentTypeInstance.StackInstance.Config.Environment);
-            }
 
-
+            mainJson.Add("environment", this.ContentTypeInstance.StackInstance.Config.Environment);
             foreach (var kvp in UrlQueries)
             {
                 mainJson.Add(kvp.Key, kvp.Value);

Contentstack.Core/Models/Query.cs

@@ -1851,10 +1851,8 @@ private async Task<JObject> Exec()
                 headerAll["authorization"] = this.ContentTypeInstance.StackInstance.LivePreviewConfig.ManagementToken;
                 isLivePreview = true;
             }
-            else
-            {
-                mainJson.Add("environment", this.ContentTypeInstance.StackInstance.Config.Environment);
-            }
+            
+            mainJson.Add("environment", this.ContentTypeInstance.StackInstance.Config.Environment);
             if (QueryValueJson != null && QueryValueJson.Count > 0)
                 mainJson.Add("query", QueryValueJson);
 

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>2.15.0</Version>
+    <Version>2.15.1</Version>
   </PropertyGroup>
 </Project>