From a009948e086ff5d366fb0d8f527f4fdc7edd3e2f Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Sun, 24 Mar 2019 11:09:14 +0100 Subject: [PATCH] Do not take order_before hours into account --- kaba/models.py | 2 +- tests/test_models.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kaba/models.py b/kaba/models.py index 1a1d4c6..1d71078 100644 --- a/kaba/models.py +++ b/kaba/models.py @@ -137,7 +137,7 @@ class Delivery(Base): @property def is_open(self): - return self.order_before > datetime.now() + return datetime.now().date() <= self.order_before.date() @classmethod def get_root(cls): diff --git a/tests/test_models.py b/tests/test_models.py index 55816f9..0a405a9 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -28,8 +28,11 @@ def test_wrong_datetime_raise_valueerror(): def test_delivery_is_open_when_order_before_is_in_the_future(delivery): delivery.order_before = now() + timedelta(hours=1) assert delivery.is_open - delivery.order_before = now() - timedelta(hours=1) + delivery.order_before = now() - timedelta(days=1) assert not delivery.is_open + # We don't take the hour into account + delivery.order_before = now() - timedelta(hours=1) + assert delivery.is_open def test_can_create_product():