Fix the routine copy method

We set the start date of the copied routine to the current date, and the duration
to be the same as the original.

Author: rolandgeider

wger/manager/api/views.py

@@ -19,7 +19,6 @@
 from django.conf import settings
 from django.core.cache import cache
 from django.db.models import Q
-
 # Third Party
 from rest_framework import viewsets
 from rest_framework.decorators import action
@@ -165,7 +164,7 @@ def date_sequence_gym_mode(self, request, pk):
     @action(detail=True)
     def structure(self, request, pk):
         """
-        Return full object structure of the routine.
+        Return the full object structure of the routine.
         """
         cache_key = CacheKeyMapper.routine_api_structure_key(pk)
         cached_data = cache.get(cache_key)

wger/manager/models/routine.py

@@ -52,7 +52,6 @@
 )
 from wger.utils.cache import CacheKeyMapper
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -161,6 +160,10 @@ def save(self, *args, **kwargs):
 
         super().save(*args, **kwargs)
 
+    @property
+    def duration(self) -> datetime.timedelta:
+        return self.end - self.start
+
     @property
     def label_dict(self) -> dict[datetime.date, str]:
         out = {}

wger/manager/tests/test_copy_routine.py

@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-
+import datetime
 # Standard Library
 import logging
 
@@ -22,7 +22,6 @@
 from wger.core.tests.base_testcase import WgerTestCase
 from wger.manager.models import Routine
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -45,7 +44,14 @@ def copy_routine_and_assert(self):
         self.assertEqual(count_after, 6)
 
         routine_original = Routine.objects.get(pk=3)
-        routine_copy = Routine.objects.get(pk=4)
+        routine_copy = Routine.objects.get(pk=6)
+
+        self.assertEqual(routine_copy.name, routine_original.name)
+        self.assertEqual(routine_copy.description, routine_original.description)
+        self.assertEqual(routine_copy.is_template, routine_original.is_template)
+        self.assertEqual(routine_copy.is_public, routine_original.is_public)
+        self.assertEqual(routine_copy.start, datetime.date.today())
+        self.assertEqual(routine_copy.end, datetime.date.today() + routine_original.duration)
 
         days_original = routine_original.days.all()
         days_copy = routine_copy.days.all()

wger/manager/views/routine.py

@@ -16,6 +16,7 @@
 
 # Standard Library
 import copy
+import datetime
 import logging
 from typing import List
 
@@ -34,7 +35,6 @@
     SlotEntry,
 )
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -63,9 +63,15 @@ def copy_config(configs: List[AbstractChangeConfig], slot_entry: SlotEntry):
     # Copy workout
     routine_copy: Routine = copy.copy(routine)
     routine_copy.pk = None
+    routine_copy.created = None
     routine_copy.user = request.user
     routine_copy.is_template = False
     routine_copy.is_public = False
+
+    # Update the start and end date
+    routine_copy.start = datetime.date.today()
+    routine_copy.end = routine_copy.start + routine.duration
+
     routine_copy.save()
 
     # Copy the days