Skip to content

feat(Duration): Added option for business days calculation at duration ctor #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion src/Todoist.Net/Extensions/DateTimeExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;

namespace Todoist.Net.Extensions
{
Expand All @@ -8,5 +8,37 @@ public static string ToFilterParameter(this DateTime dateTime)
{
return dateTime.ToString("s");
}

public static DateTime AddBusinessDays(this DateTime date, int days)
{
if (days < 0)
{
throw new ArgumentException("days cannot be negative", "days");
}

if (days == 0) return date;

if (date.DayOfWeek == DayOfWeek.Friday)
{
date = date.AddDays(2);
days -= 1;
}
else if (date.DayOfWeek == DayOfWeek.Saturday)
{
date = date.AddDays(1);
days -= 1;
}

date = date.AddDays(days / 5 * 7);
int extraDays = days % 5;

if ((int)date.DayOfWeek + extraDays > 5)
{
extraDays += 2;
}

return date.AddDays(extraDays);

}
}
}
12 changes: 12 additions & 0 deletions src/Todoist.Net/Models/Duration.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Text.Json.Serialization;

using Todoist.Net.Extensions;

namespace Todoist.Net.Models
{
/// <summary>
Expand All @@ -23,6 +25,16 @@ public Duration(int amount, DurationUnit unit)
Unit = unit;
}

/// <summary>
/// Initializes a new instance of the <see cref="Duration" /> class.
/// </summary>
/// <param name="businessDaysAmount">Business Days amount</param>
public Duration(int businessDaysAmount)
{
Unit = DurationUnit.Day;
Amount = (int)(DateTime.Now.Date.AddBusinessDays(businessDaysAmount) - DateTime.Now.Date).TotalDays;
}

[JsonConstructor]
internal Duration()
{
Expand Down