Implement deadlines (#60)

* Implement deadlines

* Fix build

Author: olsh

build/Build.cs

@@ -2,8 +2,8 @@
 using Nuke.Common.CI;
 using Nuke.Common.CI.AppVeyor;
 using Nuke.Common.ProjectModel;
+using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
-using Nuke.Common.Tools.Git;
 using Nuke.Common.Tools.SonarScanner;
 
 using static Nuke.Common.Tools.DotNet.DotNetTasks;

build/_build.csproj

@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="8.1.2" />
-    <PackageDownload Include="dotnet-sonarscanner" Version="[9.0.1]" />
+    <PackageReference Include="Nuke.Common" Version="9.0.4" />
+    <PackageDownload Include="dotnet-sonarscanner" Version="[9.0.2]" />
   </ItemGroup>
 
 </Project>

src/Todoist.Net.Tests/Services/ItemsServiceTests.cs

@@ -240,6 +240,25 @@ public async Task CreateNewItem_DueDateIsLocal_DueDateNotChanged()
             }
         }
 
+        [Fact]
+        [Trait(Constants.TraitName, Constants.IntegrationFreeTraitValue)]
+        public async Task CreateNewItem_DeadlineIsLocal_DeadlaneNotChanged()
+        {
+            var client = TodoistClientFactory.Create(_outputHelper);
+
+            var item = new AddItem("New task") { Deadline = new Deadline(DateTime.Now.AddYears(1).Date) };
+            var taskId = await client.Items.AddAsync(item);
+            try
+            {
+                var itemInfo = await client.Items.GetAsync(taskId);
+
+                Assert.Equal(item.Deadline.Date, itemInfo.Item.Deadline.Date);
+            }
+            finally
+            {
+                await client.Items.DeleteAsync(item.Id);
+            }
+        }
 
         [Fact]
         [Trait(Constants.TraitName, Constants.IntegrationPremiumTraitValue)]

src/Todoist.Net.Tests/Services/ProjectsServiceTests.cs

@@ -76,7 +76,16 @@ public async Task CreateUpdateOrderMoveAndDelete_Success()
             }
             finally
             {
-                await client.Projects.DeleteAsync(project.Id);
+                try
+                {
+                    await client.Projects.DeleteAsync(project.Id);
+                }
+                // Parent project removes child projects too
+                // So the project may be deleted already
+                catch
+                {
+                    // ignored
+                }
             }
         }
 

src/Todoist.Net.Tests/Todoist.Net.Tests.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/Todoist.Net/Models/BaseItem.cs

@@ -93,5 +93,12 @@ private protected BaseItem()
         /// <value>The responsible uid.</value>
         [JsonPropertyName("responsible_uid")]
         public string ResponsibleUid { get; set; }
+
+        /// <summary>
+        /// Gets or sets the deadline for the task.
+        /// </summary>
+        /// <value>The deadline.</value>
+        [JsonPropertyName("deadline")]
+        public Deadline Deadline { get; set; }
     }
 }

src/Todoist.Net/Models/Deadline.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Text.Json.Serialization;
+
+using Todoist.Net.Serialization.Converters;
+
+namespace Todoist.Net.Models
+{
+    /// <summary>
+    /// Represents a deadline for a task.
+    /// </summary>
+    public class Deadline
+    {
+        [JsonConstructor]
+        internal Deadline()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Deadline"/> class with the specified date.
+        /// </summary>
+        /// <param name="date">The date of the deadline.</param>
+        public Deadline(DateTime date)
+        {
+            Date = date;
+        }
+
+        /// <summary>
+        /// Gets the date of the deadline.
+        /// </summary>
+        [JsonPropertyName("date")]
+        [JsonConverter(typeof(DateOnlyConverter))]
+        public DateTime Date { get; internal set; }
+
+        [JsonInclude]
+        [JsonPropertyName("lang")]
+        internal string Lang { get; } = "en";
+    }
+}

src/Todoist.Net/Serialization/Converters/DateOnlyConverter.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Todoist.Net.Serialization.Converters
+{
+    internal sealed class DateOnlyConverter : JsonConverter<DateTime>
+    {
+        private const string CustomDateFormat = "yyyy-MM-dd";
+
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return DateTime.Parse(reader.GetString(), CultureInfo.InvariantCulture, DateTimeStyles.None);
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString(CustomDateFormat));
+        }
+    }
+}

src/Todoist.Net/Todoist.Net.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A Todoist API client for .NET</Description>
-    <VersionPrefix>8.0.0</VersionPrefix>
+    <VersionPrefix>8.1.0</VersionPrefix>
     <Authors>Oleg Shevchenko, Ahmed Zaki</Authors>
     <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -29,10 +29,6 @@
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0"/>
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
@@ -48,4 +44,8 @@
     <None Include="../../README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.1" />
+  </ItemGroup>
+
 </Project>