Merge pull request #88 from PickwickSoft/bugfix/fix-date-edge-case

🐛 Fix edge case scenarios in date conditions

Author: garlontas

pystreamapi/conditions/date.py

@@ -123,9 +123,7 @@ def this_week():
     A condition that checks if a datetime is this week.
     :return: A condition that checks if a datetime is this week.
     """
-    return lambda d: __datetime.now().date().isocalendar()[1] == d.date().isocalendar()[1] \
-        if isinstance(d, __datetime) \
-        else __datetime.now().date().isocalendar()[1] == d.isocalendar()[1]
+    return __check_is_week
 
 
 def this_week_utc():
@@ -134,19 +132,15 @@ def this_week_utc():
     parenthesis in your Stream).
     :return: A condition that checks if a datetime is this week.
     """
-    return lambda d: __datetime.now(__timezone.utc).date().isocalendar()[1] == \
-        d.astimezone(__timezone.utc).date().isocalendar()[1] if isinstance(d, __datetime) else \
-        __datetime.now(__timezone.utc).date().isocalendar()[1] == d.isocalendar()[1]
+    return lambda d: __check_is_week(d, tz=__timezone.utc)
 
 
 def last_week():
     """
     A condition that checks if a datetime is last week.
     :return: A condition that checks if a datetime is last week.
     """
-    return lambda d: __datetime.now().date().isocalendar()[1] - 1 == d.date().isocalendar()[1] if \
-        isinstance(d, __datetime) \
-        else __datetime.now().date().isocalendar()[1] - 1 == d.isocalendar()[1]
+    return lambda d: __check_is_week(d, -1)
 
 
 def last_week_utc():
@@ -155,21 +149,15 @@ def last_week_utc():
     parenthesis in your Stream).
     :return: A condition that checks if a datetime is last week.
     """
-    return lambda d: __datetime.now(__timezone.utc).date().isocalendar()[1] - 1 == \
-        d.astimezone(__timezone.utc).date().isocalendar()[1] if isinstance(d, __datetime) else \
-        __datetime.now(__timezone.utc).date().isocalendar()[1] - 1 == d.isocalendar()[1]
+    return lambda d: __check_is_week(d, -1, tz=__timezone.utc)
 
 
 def next_week():
     """
     A condition that checks if a datetime is next week.
     :return: A condition that checks if a datetime is next week.
     """
-    week = __datetime.now().date().isocalendar()[1] + 1
-    week = reduce_to_valid_range(week, 52)
-    return lambda d: week == d.date().isocalendar()[1] if \
-        isinstance(d, __datetime) \
-        else week == d.isocalendar()[1]
+    return lambda d: __check_is_week(d, 1)
 
 
 def next_week_utc():
@@ -178,10 +166,14 @@ def next_week_utc():
     parenthesis in your Stream).
     :return: A condition that checks if a datetime is next week.
     """
-    week = __datetime.now(__timezone.utc).date().isocalendar()[1] + 1
-    week = reduce_to_valid_range(week, 52)
-    return lambda d: week == d.astimezone(__timezone.utc).date().isocalendar()[1] \
-        if isinstance(d, __datetime) else week == d.isocalendar()[1]
+    return lambda d: __check_is_week(d, 1, tz=__timezone.utc)
+
+
+def __check_is_week(d: Union[__datetime, __date], offset: int = 0, tz: __timezone = None):
+    target_week = __datetime.now(tz=tz) + __timedelta(weeks=offset)
+    return target_week.isocalendar()[1] == d.date().isocalendar()[1] if \
+        isinstance(d, __datetime) \
+        else target_week.isocalendar()[1] == d.isocalendar()[1]
 
 
 def this_month():
@@ -267,8 +259,8 @@ def this_year_utc():
 
 def last_year():
     """
-    A condition that checks if a datetime is last year.
-    :return: A condition that checks if a datetime is last year.
+    A condition that checks if a datetime is from last year.
+    :return: A condition that checks if a datetime is from last year.
     """
     return lambda d: __check_is_year(d, -1)
 
@@ -277,7 +269,7 @@ def last_year_utc():
     """
     A condition that checks if a datetime is last year calculating in UTC (use without
     parenthesis in your Stream).
-    :return: A condition that checks if a datetime is last year.
+    :return: A condition that checks if a datetime is from last year.
     """
     return lambda d: __check_is_year(d, -1, tz=__timezone.utc)
 

tests/_conditions/test_date_conditions.py

@@ -1,5 +1,4 @@
 # pylint: disable=wildcard-import,too-many-instance-attributes,unused-wildcard-import
-
 from _conditions.date_test import DateTest
 from pystreamapi.conditions import equal_to, not_equal_to, between, not_between
 from pystreamapi.conditions.date import *