Merge pull request #1286 from dod-ccpo/bugfix/inclusive-pop-dates

Bugfix - Inclusive pop dates

atst/domain/authnid/crl/util.py

@@ -276,7 +276,7 @@ def existing_crl_modification_time(crl):
         prev_time = os.path.getmtime(crl)
         buffered = prev_time + MODIFIED_TIME_BUFFER
         mod_time = prev_time if pendulum.now().timestamp() < buffered else buffered
-        dt = pendulum.from_timestamp(mod_time, tz="GMT")
+        dt = pendulum.from_timestamp(mod_time, tz="UTC")
         return dt.format("ddd, DD MMM YYYY HH:mm:ss zz")
 
     else:

atst/models/task_order.py

@@ -9,7 +9,7 @@ from atst.models.base import Base
 import atst.models.types as types
 import atst.models.mixins as mixins
 from atst.models.attachment import Attachment
-from atst.utils.clock import Clock
+from pendulum import today
 
 
 class Status(Enum):
@@ -83,26 +83,10 @@ class TaskOrder(Base, mixins.TimestampsMixin):
     def is_active(self):
         return self.status == Status.ACTIVE
 
-    @property
-    def is_upcoming(self):
-        return self.status == Status.UPCOMING
-
     @property
     def is_expired(self):
         return self.status == Status.EXPIRED
 
-    @property
-    def is_unsigned(self):
-        return self.status == Status.UNSIGNED
-
-    @property
-    def has_begun(self):
-        return self.start_date is not None and Clock.today() >= self.start_date
-
-    @property
-    def has_ended(self):
-        return self.start_date is not None and Clock.today() >= self.end_date
-
     @property
     def clins_are_completed(self):
         return all([len(self.clins), (clin.is_completed for clin in self.clins)])
@@ -117,17 +101,17 @@ class TaskOrder(Base, mixins.TimestampsMixin):
 
     @property
     def status(self):
-        today = Clock.today()
+        todays_date = today(tz="UTC").date()
 
         if not self.is_completed and not self.is_signed:
             return Status.DRAFT
         elif self.is_completed and not self.is_signed:
             return Status.UNSIGNED
-        elif today < self.start_date:
+        elif todays_date < self.start_date:
             return Status.UPCOMING
-        elif today >= self.end_date:
+        elif todays_date > self.end_date:
             return Status.EXPIRED
-        elif self.start_date <= today < self.end_date:
+        elif self.start_date <= todays_date <= self.end_date:
             return Status.ACTIVE
 
     @property
@@ -141,34 +125,17 @@ class TaskOrder(Base, mixins.TimestampsMixin):
     @property
     def days_to_expiration(self):
         if self.end_date:
-            return (self.end_date - Clock.today()).days
+            return (self.end_date - today(tz="UTC").date()).days
 
     @property
     def total_obligated_funds(self):
-        total = 0
+        return sum(
-        for clin in self.clins:
+            (clin.obligated_amount for clin in self.clins if clin.obligated_amount)
-            if clin.obligated_amount is not None:
+        )
-                total += clin.obligated_amount
-        return total
 
     @property
     def total_contract_amount(self):
-        total = 0
+        return sum((clin.total_amount for clin in self.clins if clin.total_amount))
-        for clin in self.clins:
-            if clin.total_amount is not None:
-                total += clin.total_amount
-        return total
-
-    @property
-    # TODO delete when we delete task_order_review flow
-    def budget(self):
-        return 100000
-
-    @property
-    def balance(self):
-        # TODO: fix task order -- reimplement using CLINs
-        # Faked for display purposes
-        return 50
 
     @property
     def invoiced_funds(self):

atst/utils/clock.py

@@ -1,11 +0,0 @@
-import pendulum
-
-
-class Clock(object):
-    @classmethod
-    def today(cls, tz="UTC"):
-        return pendulum.today(tz=tz).date()
-
-    @classmethod
-    def now(cls, tz="UTC"):
-        return pendulum.now(tz=tz)

tests/models/test_task_order.py

@@ -87,17 +87,28 @@ class TestTaskOrderStatus:
     @patch("atst.models.TaskOrder.is_completed", new_callable=PropertyMock)
     @patch("atst.models.TaskOrder.is_signed", new_callable=PropertyMock)
     def test_active_status(self, is_signed, is_completed, start_date, end_date):
-        # Given that I have a signed TO and today is within its start_date and end_date
+        today = pendulum.today(tz="UTC").date()
-        today = pendulum.today().date()
-        to = TaskOrderFactory.create()
 
-        start_date.return_value = today.subtract(days=1)
-        end_date.return_value = today.add(days=1)
         is_signed.return_value = True
         is_completed.return_value = True
 
+        # Given that I have a signed TO and today is within its start_date and end_date
+        to_1 = TaskOrderFactory.create()
+        start_date.return_value = today.subtract(days=1)
+        end_date.return_value = today.add(days=1)
+
         # Its status should be active
-        assert to.status == Status.ACTIVE
+        assert to_1.status == Status.ACTIVE
+
+        # A period of performance's start and end dates are inclusive, so a TO
+        # should be active on its start and end dates
+        to_2 = TaskOrderFactory.create()
+        start_date.return_value = today
+        end_date.return_value = today
+        is_signed.return_value = True
+        is_completed.return_value = True
+
+        assert to_2.status == Status.ACTIVE
 
     @patch("atst.models.TaskOrder.end_date", new_callable=PropertyMock)
     @patch("atst.models.TaskOrder.start_date", new_callable=PropertyMock)