Task chunk series: Update task chunk durations

Author: wichmannpas

task/models.py

@@ -231,13 +231,13 @@ def clean_scheduled(self) -> List[int]:
         if self.end:
             chunks |= self.chunks.filter(day__gt=self.end)
         ids = [chunk.id for chunk in chunks]
-        total_duration = sum(chunk.duration for chunk in chunks)
+        cleaned_duration = sum(chunk.duration for chunk in chunks)
         chunks.delete()
 
         self.last_scheduled_day = self.chunks.aggregate(Max('day'))['day__max']
         self.save(update_fields=('last_scheduled_day',))
 
-        self.task.duration = F('duration') - total_duration
+        self.task.duration = F('duration') - cleaned_duration
         self.task.save(update_fields=('duration',))
         # refresh the task from the db to get the actual duration value
         self.task.refresh_from_db()

task/serializers.py

@@ -5,6 +5,7 @@
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
+from django.db.models import F
 from rest_framework import serializers
 from rest_framework.exceptions import ErrorDetail, ValidationError
 
@@ -289,6 +290,20 @@ def validate(self, data):
 
         return data
 
+    @transaction.atomic
+    def update(self, instance, validated_data):
+        if validated_data['duration'] != instance.duration:
+            # duration changed, update chunks duration
+            updated = instance.chunks.filter(duration=instance.duration).update(
+                duration=validated_data['duration'])
+            additional_duration = updated * (validated_data['duration'] - instance.duration)
+            instance.task.duration = F('duration') + additional_duration
+            instance.task.save(update_fields=('duration',))
+            # refresh the task from the db to get the actual duration value
+            instance.task.refresh_from_db()
+
+        return super().update(instance, validated_data)
+
     def _update_errors(
             self, data: dict, errors: DefaultDict[str, List],
             required: List[str], disallowed: List[str]):

task/tests.py

@@ -3522,6 +3522,7 @@ def test_update_interval(self):
 
         serializer = TaskChunkSeriesSerializer(instance=instance, data={
             'task_id': self.task.pk,
+            'duration': 1,
             'start': '2010-02-24',
             'rule': 'interval',
             'interval_days': 7,
@@ -3624,6 +3625,7 @@ def test_validation_update_change_end(self):
 
         serializer = TaskChunkSeriesSerializer(instance=instance, data={
             'task_id': self.task.pk,
+            'duration': 1,
             'start': '2010-02-24',
             'end': '2010-05-01',
             'rule': 'interval',
@@ -3881,7 +3883,7 @@ def test_update_cleaning(self):
 
         resp = self.client.put('/task/chunk/series/{}/'.format(series.pk), {
             'task_id': self.task.pk,
-            'duration': '2',
+            'duration': '1',
             'start': '2010-05-03',
             'end': '2010-05-10',
             'rule': 'interval',
@@ -3912,6 +3914,125 @@ def test_update_cleaning(self):
             self.task.duration,
             initial_task_duration - 2)
 
+    @freeze_time('2010-05-03')
+    def test_update_duration(self):
+        """
+        Test updating the duration of a task chunk series.
+        """
+        series = TaskChunkSeries.objects.create(
+            task=self.task,
+            start=date(2010, 5, 3),
+            end=date(2010, 5, 24),
+            rule='interval',
+            interval_days=7)
+        series.schedule()
+
+        self.assertEqual(
+            TaskChunkSeries.objects.count(),
+            1)
+        self.assertEqual(
+            TaskChunk.objects.count(),
+            4)
+
+        resp = self.client.put('/task/chunk/series/{}/'.format(series.pk), {
+            'task_id': self.task.pk,
+            'duration': 5,
+            'start': '2010-05-03',
+            'end': '2010-05-24',
+            'rule': 'interval',
+            'interval_days': 7,
+        })
+        self.assertEqual(
+            resp.status_code,
+            status.HTTP_200_OK)
+
+        self.assertSetEqual(
+            set(resp.data.keys()),
+            {'series', 'cleaned', 'scheduled', 'task'})
+
+        self.assertEqual(
+            len(resp.data['cleaned']),
+            0)
+        self.assertEqual(
+            len(resp.data['scheduled']),
+            0)
+
+        self.assertEqual(
+            TaskChunk.objects.count(),
+            4)
+
+        # each chunk is increased to the new duration of 5
+        initial_task_duration = self.task.duration
+        self.task.refresh_from_db()
+        self.assertEqual(
+            self.task.duration,
+            initial_task_duration + 4 * (5 - 1))
+        self.assertEqual(
+            Decimal(resp.data['task']['duration']),
+            initial_task_duration + 4 * (5 - 1))
+
+    @freeze_time('2010-05-03')
+    def test_update_duration_modified(self):
+        """
+        Test updating the duration of a task chunk series when the duration
+        of a task chunk was already modified.
+        """
+        series = TaskChunkSeries.objects.create(
+            task=self.task,
+            start=date(2010, 5, 3),
+            end=date(2010, 5, 24),
+            rule='interval',
+            interval_days=7)
+        series.schedule()
+
+        self.assertEqual(
+            TaskChunkSeries.objects.count(),
+            1)
+        self.assertEqual(
+            TaskChunk.objects.count(),
+            4)
+
+        chunk = TaskChunk.objects.last()
+        chunk.duration = 3
+        chunk.save()
+
+        resp = self.client.put('/task/chunk/series/{}/'.format(series.pk), {
+            'task_id': self.task.pk,
+            'duration': 5,
+            'start': '2010-05-03',
+            'end': '2010-05-24',
+            'rule': 'interval',
+            'interval_days': 7,
+        })
+        self.assertEqual(
+            resp.status_code,
+            status.HTTP_200_OK)
+
+        self.assertSetEqual(
+            set(resp.data.keys()),
+            {'series', 'cleaned', 'scheduled', 'task'})
+
+        self.assertEqual(
+            len(resp.data['cleaned']),
+            0)
+        self.assertEqual(
+            len(resp.data['scheduled']),
+            0)
+
+        self.assertEqual(
+            TaskChunk.objects.count(),
+            4)
+
+        # each chunk except for the modified one is increased to the new duration of 5
+        initial_task_duration = self.task.duration
+        self.task.refresh_from_db()
+        self.assertEqual(
+            self.task.duration,
+            initial_task_duration + 3 * (5 - 1))
+        self.assertEqual(
+            Decimal(resp.data['task']['duration']),
+            initial_task_duration + 3 * (5 - 1))
+
     @freeze_time('2010-05-03')
     def test_update_scheduling(self):
         """