Variable Updates

Author: cs-raj

Contentstack.Core.Tests/ContentstackClientTest.cs

@@ -42,7 +42,7 @@ public void SetEntryUid_SetsValue_WhenNonEmpty()
         {
             var client = CreateClient();
             client.SetEntryUid("entry123");
-            Assert.Equal("entry123", GetPrivateField(client, "lastEntryUid"));
+            Assert.Equal("entry123", GetPrivateField(client, "currentEntryUid"));
         }
 
         [Fact]
@@ -51,7 +51,7 @@ public void SetEntryUid_DoesNotSet_WhenEmpty()
             var client = CreateClient();
             client.SetEntryUid("entry123");
             client.SetEntryUid("");
-            Assert.Equal("entry123", GetPrivateField(client, "lastEntryUid"));
+            Assert.Equal("entry123", GetPrivateField(client, "currentEntryUid"));
         }
 
         [Fact]
@@ -60,15 +60,15 @@ public void SetEntryUid_DoesNotSet_WhenNull()
             var client = CreateClient();
             client.SetEntryUid("entry123");
             client.SetEntryUid(null);
-            Assert.Equal("entry123", GetPrivateField(client, "lastEntryUid"));
+            Assert.Equal("entry123", GetPrivateField(client, "currentEntryUid"));
         }
 
         [Fact]
-        public void ContentType_SetsLastContentTypeUid_WhenNonEmpty()
+        public void ContentType_SetscurrentContenttypeUid_WhenNonEmpty()
         {
             var client = CreateClient();
             client.ContentType("blog");
-            Assert.Equal("blog", GetPrivateField(client, "lastContentTypeUid"));
+            Assert.Equal("blog", GetPrivateField(client, "currentContenttypeUid"));
         }
 
         [Fact]
@@ -77,7 +77,7 @@ public void ContentType_DoesNotSet_WhenEmpty()
             var client = CreateClient();
             client.ContentType("blog");
             client.ContentType("");
-            Assert.Equal("blog", GetPrivateField(client, "lastContentTypeUid"));
+            Assert.Equal("blog", GetPrivateField(client, "currentContenttypeUid"));
         }
 
         [Fact]
@@ -86,7 +86,7 @@ public void ContentType_DoesNotSet_WhenNull()
             var client = CreateClient();
             client.ContentType("blog");
             client.ContentType(null);
-            Assert.Equal("blog", GetPrivateField(client, "lastContentTypeUid"));
+            Assert.Equal("blog", GetPrivateField(client, "currentContenttypeUid"));
         }
 
         [Fact]
@@ -208,8 +208,8 @@ public async Task LivePreviewQueryAsync_SetsLivePreviewConfigFields()
             // we only test the config fields are set correctly before the call
             await client.LivePreviewQueryAsync(query);
             var v = client.GetLivePreviewConfig();
-            Assert.Equal("ctuid", GetPrivateField(client, "lastContentTypeUid"));
-            Assert.Equal("euid", GetPrivateField(client, "lastEntryUid"));
+            Assert.Equal("ctuid", GetPrivateField(client, "currentContenttypeUid"));
+            Assert.Equal("euid", GetPrivateField(client, "currentEntryUid"));
             Assert.Equal(true, v.Enable );
             Assert.Equal("rid", v.ReleaseId);
             Assert.Equal("ts", v.PreviewTimestamp);

Contentstack.Core/ContentstackClient.cs

@@ -58,8 +58,8 @@ private string _Url
         private Dictionary<string, object> _StackHeaders = new Dictionary<string, object>();
 
         // This is used to store the last content type UID for live preview
-        private string lastContentTypeUid = null;
-        private string lastEntryUid = null;
+        private string currentContenttypeUid = null;
+        private string currentEntryUid = null;
         public List<IContentstackPlugin> Plugins { get; set; } = new List<IContentstackPlugin>();
         /// <summary>
         /// Initializes a instance of the <see cref="ContentstackClient"/> class. 
@@ -403,7 +403,7 @@ public void SetEntryUid(string entryUid)
         {
             if (!string.IsNullOrEmpty(entryUid))
             {
-                this.lastEntryUid = entryUid;
+                this.currentEntryUid = entryUid;
             }
         }
         /// <summary>
@@ -421,7 +421,7 @@ public ContentType ContentType(String contentTypeName)
         {
             if (!string.IsNullOrEmpty(contentTypeName))
             {
-                this.lastContentTypeUid = contentTypeName;
+                this.currentContenttypeUid = contentTypeName;
             }
             ContentType contentType = new ContentType(contentTypeName);
             contentType.SetStackInstance(this);
@@ -619,9 +619,9 @@ public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
                 query.TryGetValue("content_type_uid", out contentTypeUID);
                 this.LivePreviewConfig.ContentTypeUID = contentTypeUID;
             }
-            else if (!string.IsNullOrEmpty(this.lastContentTypeUid))
+            else if (!string.IsNullOrEmpty(this.currentContenttypeUid))
             {
-                this.LivePreviewConfig.ContentTypeUID = this.lastContentTypeUid;
+                this.LivePreviewConfig.ContentTypeUID = this.currentContenttypeUid;
             }
 
 
@@ -631,9 +631,9 @@ public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
                 query.TryGetValue("entry_uid", out entryUID);
                 this.LivePreviewConfig.EntryUID = entryUID;
             }
-            else if (!string.IsNullOrEmpty(this.lastEntryUid))
+            else if (!string.IsNullOrEmpty(this.currentEntryUid))
             {
-                this.LivePreviewConfig.EntryUID = this.lastEntryUid;
+                this.LivePreviewConfig.EntryUID = this.currentEntryUid;
             }