Merge pull request #5 from contentstack/develop

uttamukkoji · web-flow · commit f69435d5959e · 2019-11-15T15:46:14.000+05:30
Global fields Support added
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+### Version: 2.2.0
+#### Date: Nov-15-2019
+
+##### Update API:
+- Stack
+  - update function 'GetContentType:'
+- ContentType
+  - update function 'Fetch:'
+  
 ### Version: 2.1.1
 #### Date: Sept-03-2019
 
diff --git a/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj b/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj
@@ -12,7 +12,7 @@
 </Copyright>
     <PackageProjectUrl>https://github.com/contentstack/contentstack-dotnet</PackageProjectUrl>
     <PackageTags>v1.0.0</PackageTags>
-    <ReleaseVersion>2.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Contentstack.Core.Tests/AssetTest.cs b/Contentstack.Core.Tests/AssetTest.cs
@@ -12,8 +12,8 @@ namespace Contentstack.Core.Tests
 {
     public class AssetTest
     {
-        string uid = "blt14d101ddeddaeefb";
-        //string uid = "blt649cfadb08b577db";
+        string uid = "blt9b96cb4720147bc1";
+        // string uid = "blt649cfadb08b577db";
         ContentstackClient client = StackConfig.GetStack();
 
         [Fact]
diff --git a/Contentstack.Core.Tests/ContentTypeTest.cs b/Contentstack.Core.Tests/ContentTypeTest.cs
@@ -20,6 +20,7 @@ public class ContentTypeTest
         public async Task FetchContenTypeSchema()
         {
             ContentType contenttype = client.ContentType(source);
+
             var result = await contenttype.Fetch();
             if (result == null)
             {
@@ -31,6 +32,23 @@ public async Task FetchContenTypeSchema()
             }
         }
 
+        [Fact]
+        public async Task FetchContenTypeSchemaIncludeGlobalFields()
+        {
+            ContentType contenttype = client.ContentType(source);
+            var param = new Dictionary<string, object>();
+            param.Add("include_global_field_schema", true);
+            var result = await contenttype.Fetch(param);
+            if (result == null)
+            {
+                Assert.False(true, "contenttype.FetchSchema() is not match with expected result.");
+            }
+            else
+            {
+                Assert.True(true);
+            }
+        }
+
         [Fact]
         public async Task GetContentTypes()
         {
@@ -46,5 +64,24 @@ public async Task GetContentTypes()
 
             }
         }
+
+        [Fact]
+        public async Task GetContentTypesIncludeGlobalFields()
+        {
+            var param = new Dictionary<string, object>();
+            param.Add("include_global_field_schema", true);
+
+            var result = await client.GetContentTypes(param);
+
+            if (result == null)
+            {
+                Assert.False(true, "client.getContentTypes is not match with expected result.");
+            }
+            else
+            {
+                Assert.True(true);
+
+            }
+        }
     }
-}
+}
diff --git a/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj b/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>2.1.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Contentstack.Core.Tests/EntryTest.cs b/Contentstack.Core.Tests/EntryTest.cs
@@ -14,15 +14,15 @@ public class EntryTest
         ContentstackClient client = StackConfig.GetStack();
 
         ////PROD STAG
-        //String source = "source";
-        //String singelEntryFetchUID = "blt1f94e478501bba46";
-        //string htmlSource = "blt2f0dd6a81f7f40e7";
-        //String referenceFieldUID = "reference";
-        //EU
         String source = "source";
-        String singelEntryFetchUID = "bltf4268538a14fc5e1";
-        string htmlSource = "blt7c4197d43c1156ba";
+        String singelEntryFetchUID = "blt1f94e478501bba46";
+        string htmlSource = "blt2f0dd6a81f7f40e7";
         String referenceFieldUID = "reference";
+        //EU
+        //String source = "source";
+        //String singelEntryFetchUID = "bltf4268538a14fc5e1";
+        //string htmlSource = "blt7c4197d43c1156ba";
+        //String referenceFieldUID = "reference";
 
 
         [Fact]
diff --git a/Contentstack.Core.Tests/Models/SourceModel.cs b/Contentstack.Core.Tests/Models/SourceModel.cs
@@ -17,10 +17,10 @@ public class SourceModel
         public Boolean Boolean;
         public string Date;
         public Asset file;
-        //public List<string> Reference;
-        //public List<string> Other_reference;
-        public List<Dictionary<string, object>> Reference;
-        public List<Dictionary<string, object>> Other_reference;
+        public List<string> Reference;
+        public List<string> Other_reference;
+        // public List<Dictionary<string, object>> Reference;
+        // public List<Dictionary<string, object>> Other_reference;
         public Dictionary<string, object> Group;
         public List<Dictionary<string, object>> Modular_blocks;
         public object[] Tags;
diff --git a/Contentstack.Core.Tests/Models/SourceModelIncludeRef.cs b/Contentstack.Core.Tests/Models/SourceModelIncludeRef.cs
@@ -15,8 +15,8 @@ public class SourceModelIncludeRef
         public Boolean Boolean;
         public string Date;
         public List<Entry> Reference;
-        //public List<string> Other_reference;
-        public List<Dictionary<string, object>> Other_reference;
+        public List<string> Other_reference;
+        // public List<Dictionary<string, object>> Other_reference;
         public Dictionary<string, object> Group;
         public List<Dictionary<string, object>> Modular_blocks;
 
diff --git a/Contentstack.Core/Contentstack.Core.csproj b/Contentstack.Core/Contentstack.Core.csproj
@@ -5,16 +5,16 @@
     <PackageId>contentstack.csharp</PackageId>
     <Authors>Contentstack</Authors>
     <Description>.NET SDK for the Contentstack Content Delivery API.</Description>
-    <PackageVersion>2.1.1</PackageVersion>
+    <PackageVersion>2.2.0</PackageVersion>
     <Owners>Contentstack</Owners>
     <PackageReleaseNotes>Query Find method, Entry Fetch method returns ContentstackCollection of Model.</PackageReleaseNotes>
     <Copyright>Copyright © 2012-2019 Contentstack. All Rights Reserved
 </Copyright>
     <PackOnBuild>true</PackOnBuild>
-    <PackageTags>v2.1.1</PackageTags>
+    <PackageTags>v2.2.0</PackageTags>
     <PackageProjectUrl>https://github.com/contentstack/contentstack-dotnet</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/contentstack/contentstack-dotnet/blob/master/LICENSE</PackageLicenseUrl>
-    <ReleaseVersion>2.0</ReleaseVersion>
+    <ReleaseVersion>2.2.0</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Contentstack.Core/ContentstackClient.cs b/Contentstack.Core/ContentstackClient.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using Contentstack.Core.Internals;
 using Contentstack.Core.Configuration;
@@ -245,11 +245,14 @@ internal Asset Asset()
         /// <example>
         /// <code>
         ///     ContentstackClient stack = new ContentstackClinet(&quot;blt5d4sample2633b&quot;, &quot;blt6d0240b5sample254090d&quot;, &quot;stag&quot;);
-        ///     var result = await stack.GetContentTypes();
+        ///     var param = new Dictionary&lt;string, object&gt;();
+        ///     param.Add("include_global_field_schema",true);
+        ///     var result = await stack.GetContentTypes(param);
         /// </code>
         /// </example>
+        /// <param name="param">is dictionary of additional parameter</param>
         /// <returns>The List of content types schema.</returns>
-        public async Task<IList> GetContentTypes()
+        public async Task<IList> GetContentTypes(Dictionary<string, object> param = null)
         {
             Dictionary<String, Object> headers = GetHeader(_LocalHeaders);
             Dictionary<String, object> headerAll = new Dictionary<string, object>();
diff --git a/Contentstack.Core/Models/ContentType.cs b/Contentstack.Core/Models/ContentType.cs
@@ -135,11 +135,14 @@ internal void SetStackInstance(ContentstackClient stack)
         /// <code>
         /// ContentstackClient stack = new ContentstackClinet(&quot;blt5d4sample2633b&quot;, &quot;blt6d0240b5sample254090d&quot;, &quot;stag&quot;);
         /// ContentType contenttype = stack.ContentType("contentType_name");
-        /// var result = await contenttype.Fetch();        
+        /// var param = new Dictionary&lt;string, object&gt;();
+        /// param.Add("include_global_field_schema",true);
+        /// var result = await contenttype.Fetch(param);        
         /// </code>
         /// </example>
+        /// <param name="param">is dictionary of additional parameter</param>
         /// <returns>The Content-Type Schema Object.</returns>
-        public async Task<JObject>Fetch()
+        public async Task<JObject>Fetch(Dictionary<string, object> param = null)
         {
             Dictionary<String, Object> headers = GetHeader(_Headers);
             Dictionary<String, object> headerAll = new Dictionary<string, object>();
@@ -175,6 +178,12 @@ public async Task<JObject>Fetch()
             {
                 mainJson.Add(kvp.Key, kvp.Value);
             }
+            if (param != null && param.Count() > 0) { 
+                foreach (var kvp in param)
+                {
+                    mainJson.Add(kvp.Key, kvp.Value);
+                }
+            }
             try
             {
                 HTTPRequestHandler RequestHandler = new HTTPRequestHandler();
diff --git a/Contentstack.Core/Models/Entry.cs b/Contentstack.Core/Models/Entry.cs
@@ -1121,6 +1121,7 @@ private Entry IncludeSchema()
             try
             {
                 UrlQueries.Add("include_schema", true);
+                UrlQueries.Add("include_global_field_schema", true);
             }
             catch (Exception e)
             {
diff --git a/Contentstack.Core/Models/Query.cs b/Contentstack.Core/Models/Query.cs
diff --git a/Contentstack.Net.sln b/Contentstack.Net.sln

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ namespace Contentstack.Core.Tests`
`12`	`12`	`{`
`13`	`13`	`public class AssetTest`
`14`	`14`	`{`
`15`		`- string uid = "blt14d101ddeddaeefb";`
`16`		`- //string uid = "blt649cfadb08b577db";`
	`15`	`+ string uid = "blt9b96cb4720147bc1";`
	`16`	`+ // string uid = "blt649cfadb08b577db";`
`17`	`17`	`ContentstackClient client = StackConfig.GetStack();`
`18`	`18`
`19`	`19`	`[Fact]`