Merge pull request #7 from contentstack/fix/CS-36240-token-issue

uttamukkoji · web-flow · commit 29e7b2d02071 · 2023-04-04T10:02:26.000+05:30
Fix issue for management token
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -0,0 +1,23 @@
+name: Unit Test & Reports
+on:
+  pull_request:
+  push:
+
+jobs:
+  unit-test:  
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v1
+      - name: Setup .NET Core @ Latest
+        uses: actions/setup-dotnet@v1
+      - name: Build solution and run unit test
+        run: sh ./Scripts/run-unit-test-case.sh
+      - name: Test Report
+        uses: dorny/test-reporter@v1
+        if: success() || failure()
+        with:
+          name: DotNet unit Tests
+          path: ./Contentstack.Management.Core.Unit.Tests/TestResults/Report-Contentstack-DotNet-Test-Case.trx
+          reporter: dotnet-trx
+          fail-on-error: true
diff --git a/Contentstack.Management.ASPNETCore/contentstack.management.aspnetcore.csproj b/Contentstack.Management.ASPNETCore/contentstack.management.aspnetcore.csproj
@@ -15,7 +15,7 @@
     <Description>.NET SDK for the Contentstack Content Management API.</Description>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageTags>v0.1.2</PackageTags>
-    <ReleaseVersion>0.1.2</ReleaseVersion>
+    <ReleaseVersion>0.1.3</ReleaseVersion>
     <RootNamespace>Contentstack.Management.ASPNETCore</RootNamespace>
   </PropertyGroup>
 
diff --git a/Contentstack.Management.Core.Tests/Contentstack.Management.Core.Tests.csproj b/Contentstack.Management.Core.Tests/Contentstack.Management.Core.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>0.1.2</ReleaseVersion>
+    <ReleaseVersion>0.1.3</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Contentstack.Management.Core.Unit.Tests/Contentstack.Management.Core.Unit.Tests.csproj b/Contentstack.Management.Core.Unit.Tests/Contentstack.Management.Core.Unit.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>0.1.2</ReleaseVersion>
+    <ReleaseVersion>0.1.3</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Contentstack.Management.Core.Unit.Tests/Http/ContentstackHttpResponseTest.cs b/Contentstack.Management.Core.Unit.Tests/Http/ContentstackHttpResponseTest.cs
@@ -17,7 +17,6 @@ public void Initialize_Response_On_Success()
 
             Assert.IsNotNull(contentstackHttpResponse.ResponseBody);
             Assert.AreEqual(HttpStatusCode.OK, contentstackHttpResponse.StatusCode);
-            Assert.AreEqual(1200, contentstackHttpResponse.ContentLength);
             Assert.AreEqual("application/json", contentstackHttpResponse.ContentType);
             Assert.AreEqual(true, contentstackHttpResponse.IsSuccessStatusCode);
         }
diff --git a/Contentstack.Management.Core.sln b/Contentstack.Management.Core.sln
@@ -51,7 +51,7 @@ Global
 		{C90C9782-D041-43A1-B13E-21B72B9A6BE2} = {0977D0FB-EACA-4FBE-A780-2DC2B6523E53}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 0.1.2
+		version = 0.1.3
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
 		$1.DirectoryNamespaceAssociation = PrefixedHierarchical
diff --git a/Contentstack.Management.Core/Models/Fields/FieldMetadata.cs b/Contentstack.Management.Core/Models/Fields/FieldMetadata.cs
@@ -82,4 +82,12 @@ public class FieldMetadata
         public bool RefMultiple { get; set; }
 
     }
+    public class FileFieldMetadata: FieldMetadata
+    {
+        /// <summary>
+        /// Allows you to set single or multiple reference to Reference field.
+        /// </summary>
+        [JsonProperty(propertyName: "image")]
+        public bool AllowOnlyImage { get; set; }
+    }
 }
diff --git a/Contentstack.Management.Core/Models/Fields/FileField.cs b/Contentstack.Management.Core/Models/Fields/FileField.cs
@@ -8,5 +8,27 @@ public class FileField : Field
     {
         [JsonProperty(propertyName: "extensions")]
         public List<string> Extensions { get; set; }
+        [JsonProperty(propertyName: "max")]
+        public int Maxsize { get; set; }
+        [JsonProperty(propertyName: "min")]
+        public int MinSize { get; set; }
+        
+    }
+    public class ImageField : FileField
+    {
+        [JsonProperty(propertyName: "dimension")]
+        public Dimension Dimensions { get; set; }
+        /// <summary>
+        /// Allows you to enter additional data about a field. Also, you can add additional values under ‘field_metadata’.
+        /// </summary>
+        [JsonProperty(propertyName: "field_metadata")]
+        public new FileFieldMetadata FieldMetadata { get; set; }
+    }
+    public class Dimension
+    {
+        [JsonProperty(propertyName: "height")]
+        public Dictionary<string, int> Height { get; set; }
+        [JsonProperty(propertyName: "width")]
+        public Dictionary<string, int> Width { get; set; }
     }
 }
diff --git a/Contentstack.Management.Core/Queryable/Query.cs b/Contentstack.Management.Core/Queryable/Query.cs
@@ -82,7 +82,7 @@ public Query IncludeCount()
         /// <returns>The <see cref="ContentstackResponse"/></returns>
         public ContentstackResponse Find(ParameterCollection collection = null)
         {
-            _stack.client.ThrowIfNotLoggedIn();
+            _stack.ThrowIfNotLoggedIn();
             this.ThrowIfAPIKeyEmpty();
             if (collection != null)
             {
@@ -102,7 +102,7 @@ public ContentstackResponse Find(ParameterCollection collection = null)
         /// <returns>The Task</returns>
         public Task<ContentstackResponse> FindAsync(ParameterCollection collection = null)
         {
-            _stack.client.ThrowIfNotLoggedIn();
+            _stack.ThrowIfNotLoggedIn();
             this.ThrowIfAPIKeyEmpty();
             if (collection != null)
             {
diff --git a/Contentstack.Management.Core/contentstack.management.core.csproj b/Contentstack.Management.Core/contentstack.management.core.csproj
@@ -3,19 +3,19 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net471;net472;</TargetFrameworks>
     <PackageId>contentstack.management.csharp</PackageId>
-    <PackageVersion>0.1.2</PackageVersion>
+    <PackageVersion>0.1.3</PackageVersion>
     <Authors>Contentstack</Authors>
     <Copyright>Copyright © 2012-2023 Contentstack. All Rights Reserved</Copyright>
     <Owners>Contentstack </Owners>
     <PackageProjectUrl>https://github.com/contentstack/contentstack-management-dotnet</PackageProjectUrl>
-    <PackageReleaseNotes>Initial Release</PackageReleaseNotes>
+    <PackageReleaseNotes>ContentType query issue resolved</PackageReleaseNotes>
     <Summary>.NET SDK for the Contentstack Content Delivery API.</Summary>
     <PackageTags>Contentstack management API </PackageTags>
     <Title>Contentstack Management</Title>
     <Description>.NET SDK for the Contentstack Content Management API.</Description>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <PackageTags>v0.1.2</PackageTags>
-    <ReleaseVersion>0.1.2</ReleaseVersion>
+    <PackageTags>v0.1.3</PackageTags>
+    <ReleaseVersion>0.1.3</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Scripts/run-test-case.sh b/Scripts/run-test-case.sh
@@ -4,7 +4,7 @@
 #  Contentstack
 #
 #  Created by Uttam Ukkoji on 12/04/21.
-#  Copyright © 2020 Contentstack. All rights reserved.
+#  Copyright © 2023 Contentstack. All rights reserved.
 
 echo "Removing files"
 
diff --git a/Scripts/run-unit-test-case.sh b/Scripts/run-unit-test-case.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+#  run-unit-test-case.sh
+#  Contentstack
+#
+#  Created by Uttam Ukkoji on 30/03/2023.
+#  Copyright © 2023 Contentstack. All rights reserved.
+
+echo "Removing files"
+rm -rf "./Contentstack.Management.Core.Unit.Tests/TestResults"
+
+FILE_NAME="Contentstack-DotNet-Test-Case"
+
+echo "Running test case..."
+dotnet test "Contentstack.Management.Core.Unit.Tests/Contentstack.Management.Core.Unit.Tests.csproj" --logger "trx;LogFileName=Report-$FILE_NAME.trx" --collect:"XPlat code coverage"
+
+echo "Test case Completed..."   

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ public void Initialize_Response_On_Success()`
`17`	`17`
`18`	`18`	`Assert.IsNotNull(contentstackHttpResponse.ResponseBody);`
`19`	`19`	`Assert.AreEqual(HttpStatusCode.OK, contentstackHttpResponse.StatusCode);`
`20`		`- Assert.AreEqual(1200, contentstackHttpResponse.ContentLength);`
`21`	`20`	`Assert.AreEqual("application/json", contentstackHttpResponse.ContentType);`
`22`	`21`	`Assert.AreEqual(true, contentstackHttpResponse.IsSuccessStatusCode);`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,12 @@ public class FieldMetadata`
`82`	`82`	`public bool RefMultiple { get; set; }`
`83`	`83`
`84`	`84`	`}`
	`85`	`+ public class FileFieldMetadata: FieldMetadata`
	`86`	`+ {`
	`87`	`+ /// <summary>`
	`88`	`+ /// Allows you to set single or multiple reference to Reference field.`
	`89`	`+ /// </summary>`
	`90`	`+ [JsonProperty(propertyName: "image")]`
	`91`	`+ public bool AllowOnlyImage { get; set; }`
	`92`	`+ }`
`85`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public Query IncludeCount()`
`82`	`82`	`/// <returns>The <see cref="ContentstackResponse"/></returns>`
`83`	`83`	`public ContentstackResponse Find(ParameterCollection collection = null)`
`84`	`84`	`{`
`85`		`- _stack.client.ThrowIfNotLoggedIn();`
	`85`	`+ _stack.ThrowIfNotLoggedIn();`
`86`	`86`	`this.ThrowIfAPIKeyEmpty();`
`87`	`87`	`if (collection != null)`
`88`	`88`	`{`
`@@ -102,7 +102,7 @@ public ContentstackResponse Find(ParameterCollection collection = null)`
`102`	`102`	`/// <returns>The Task</returns>`
`103`	`103`	`public Task<ContentstackResponse> FindAsync(ParameterCollection collection = null)`
`104`	`104`	`{`
`105`		`- _stack.client.ThrowIfNotLoggedIn();`
	`105`	`+ _stack.ThrowIfNotLoggedIn();`
`106`	`106`	`this.ThrowIfAPIKeyEmpty();`
`107`	`107`	`if (collection != null)`
`108`	`108`	`{`