Merge pull request #37 from misanram/miguel-viendo-a-ver

fix: Corregido el cálculo del tiempo pra el comando /status

Author: euribates

dev-requirements.txt

@@ -1,3 +1,4 @@
 ruff
 rope
 pytest
+freezegun

test/test_utils.py

@@ -4,55 +4,57 @@
 import datetime
 
 import pytest
+from freezegun import freeze_time
+
 import utils
 
 
+@freeze_time("2019-05-16 13:35:16")
 def test_since_second():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 16, 13, 35, 16)
-    assert utils.since(now, ref) == '1 second'
+    assert utils.since(ref) == "1 second"
 
 
+@freeze_time("2019-05-16 13:35:21")
 def test_since_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 16, 13, 35, 21)
-    assert utils.since(now, ref) == '6 seconds'
+    assert utils.since(ref) == "6 seconds"
 
 
+@freeze_time("2019-05-16 13:36:21")
 def test_since_minute_and_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 16, 13, 36, 21)
-    assert utils.since(now, ref) == '1 minute 6 seconds'
+    assert utils.since(ref) == "1 minute 6 seconds"
 
 
+@freeze_time("2019-05-16 13:37:21")
 def test_since_minutes_and_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 16, 13, 37, 21)
-    assert utils.since(now, ref) == '2 minutes 6 seconds'
+    assert utils.since(ref) == "2 minutes 6 seconds"
 
 
+@freeze_time("2019-05-16 14:37:21")
 def test_since_hour_and_minutes_and_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 16, 14, 37, 21)
-    assert utils.since(now, ref) == '1 hour 2 minutes 6 seconds'
+    assert utils.since(ref) == "1 hour 2 minutes 6 seconds"
 
 
+@freeze_time("2019-05-16 15:37:21")
 def test_since_hours_and_minutes_and_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 16, 15, 37, 21)
-    assert utils.since(now, ref) == '2 hours 2 minutes 6 seconds'
+    assert utils.since(ref) == "2 hours 2 minutes 6 seconds"
 
 
+@freeze_time("2019-05-17 15:37:21")
 def test_since_day_hours_and_minutes_and_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 17, 15, 37, 21)
-    assert utils.since(now, ref) == '1 day 2 hours 2 minutes 6 seconds'
+    assert utils.since(ref) == "1 day 2 hours 2 minutes 6 seconds"
 
 
+@freeze_time("2019-05-19 15:37:21")
 def test_since_days_hours_and_minutes_and_seconds():
     ref = datetime.datetime(2019, 5, 16, 13, 35, 15)
-    now = datetime.datetime(2019, 5, 19, 15, 37, 21)
-    assert utils.since(now, ref) == '3 days 2 hours 2 minutes 6 seconds'
+    assert utils.since(ref) == "3 days 2 hours 2 minutes 6 seconds"
 
 
 if __name__ == "__main__":

utils.py

@@ -101,21 +101,15 @@ def pluralise(number: int, singular: str, plural: Optional[str] = None) -> str:
     return singular if number == 1 else plural
 
 
-def since(dt=None, reference=datetime.datetime.now()) -> str:
+def since(reference) -> str:
     """Returns a textual description of time passed.
 
-    Parameters:
-
-     - dt: datetime is the date to calculate the difference from
-           reference. If not used, take the value from the current
-           datetime.
-
+    Parameter:
      - reference: datetime is the datetime used to get the difference
-        ir delta. If not defined, default value is since the definition
-        of the function, this is,since the moment the current run of the
-        program started.
+        ir delta.
     """
-    dt = dt or datetime.datetime.now()
+
+    dt = datetime.datetime.now()
     delta = dt - reference
     buff = []
     days = delta.days
@@ -125,10 +119,10 @@ def since(dt=None, reference=datetime.datetime.now()) -> str:
     if seconds > 3600:
         hours = seconds // 3600
         buff.append(f"{hours} {pluralise(hours, 'hour')}")
-        seconds = seconds % 3600
+        seconds %= 3600
     minutes = seconds // 60
     if minutes > 0:
         buff.append(f"{minutes} {pluralise(minutes, 'minute')}")
-    seconds = seconds % 60
+    seconds %= 60
     buff.append(f"{seconds} {pluralise(seconds, 'second')}")
     return " ".join(buff)