Changeset 6211162 in OpenWorkouts-current for ow

Timestamp:

Oct 13, 2019, 4:45:30 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current

Children:

8340661

Parents:

93b23a6

Message:

Put duration/distance on the workout hash only if those values are there

Location:

ow

Files:

• models/workout.py (modified) (1 diff)
• tests/models/test_workout.py (modified) (2 diffs)

ow/models/workout.py

@@ -145 +145 @@
             hashed += str(self.owner.uid)
         hashed += self.start.strftime('%Y%m%d%H%M%S')
-        hashed += str(self.duration.seconds)
-        hashed += str(self.distance)
+        if self.duration is not None:
+            hashed += str(self.duration.seconds)
+        if self.distance is not None:
+            hashed += str(self.distance)
         return hashed
 

ow/tests/models/test_workout.py

@@ -155 +155 @@
         # now a workout that is not (no owner info)
         workout = Workout(
+            sport='running',
             start_time=datetime.now(timezone.utc),
             duration=timedelta(seconds=3600),
@@ -166 +167 @@
         # now an empty workout...
         workout = Workout()
-        with pytest.raises(AttributeError):
-            assert workout.hashed == (
-                workout.start.strftime('%Y%m%d%H%M%S') +
-                str(workout.duration.seconds) +
-                str(workout.distance)
-            )
+        assert workout.hashed == (
+            workout.start.strftime('%Y%m%d%H%M%S')
+        )
 
     def test_trimmed_notes(self):