Adjust YearWeek Year and StartDate

unosquare · Jan 3, 2024 · a8ed51e · a8ed51e
1 parent 4fc3312
commit a8ed51e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Unosquare.DateTimeExt/YearWeek.cs b/src/Unosquare.DateTimeExt/YearWeek.cs
@@ -41,10 +41,10 @@ public YearWeek(DateTime? dateTime)
 
     public bool IsCurrent => IsCurrentYear && Week == DateTime.UtcNow.GetWeekOfYear();
 
-    public bool IsCurrentYear => Year == DateTime.UtcNow.Year;
+    public bool IsCurrentYear => Year == WeekYear;
 
     private static DateTime GetStartDate(int? week = null, int? year = null) =>
-        DateExtensions.FirstDateOfWeek(year ?? DateTime.UtcNow.Year, week ?? DateTime.UtcNow.GetWeekOfYear());
+        DateExtensions.FirstDateOfWeek(year ?? WeekYear, week ?? DateTime.UtcNow.GetWeekOfYear());
 
     public YearWeek AddWeeks(int count) => new(StartDate.AddDays(WeekDays * count));
 
@@ -83,4 +83,8 @@ public static bool TryParse(string? value, out YearWeek result)
         result = new(week, year);
         return true;
     }
+
+    private static int WeekYear => DateTime.UtcNow.Month == 1 && DateTime.UtcNow.GetWeekOfYear() > 5
+        ? DateTime.UtcNow.Year - 1
+        : DateTime.UtcNow.Year;
 }
diff --git a/test/Unosquare.DateTimeExt.Test/Unosquare.DateTimeExt.Test/YearWeek-Tests.cs b/test/Unosquare.DateTimeExt.Test/Unosquare.DateTimeExt.Test/YearWeek-Tests.cs
@@ -114,7 +114,9 @@ public void YearWeek_Current()
     {
         var yearWeek = YearWeek.Current;
 
-        Assert.Equal(DateTime.UtcNow.Year, yearWeek.Year);
+        Assert.Equal(DateTime.UtcNow.Month == 1 && DateTime.UtcNow.GetWeekOfYear() > 5
+            ? DateTime.UtcNow.Year - 1
+            : DateTime.UtcNow.Year, yearWeek.Year);
     }
 
     [Fact]