[IMP] shift_change: prevent registering to a not available shift

Author: remytms

shift_change/models/shift_change.py

@@ -55,6 +55,27 @@ def _get_hour_limit_change(self):
             hour_limit_change = 0
         return hour_limit_change
 
+    @api.model
+    def _get_available_new_shift_ids(self, worker_id):
+        """List new shifts available for the given worker"""
+        next_templates = (
+            self.env["shift.shift"]
+            .search(
+                [
+                    ("worker_id", "=", worker_id.id),
+                    ("start_time", ">=", datetime.now()),
+                ]
+            )
+            .mapped("task_template_id")
+        )
+        return self.env["shift.shift"].search(
+            [
+                ("worker_id", "=", False),
+                ("start_time", ">=", datetime.now()),
+                ("task_template_id", "not in", next_templates.ids),
+            ]
+        )
+
     @api.model_create_multi
     def create(self, vals_list):
         """
@@ -155,3 +176,7 @@ def _check_new_shift(self, new_shift_id):
             raise ValidationError(
                 _("You can't subscribe to a shift so close in the futur.")
             )
+        if new_shift_id not in self._get_available_new_shift_ids(self.worker_id):
+            raise ValidationError(
+                _("You can't subscribe to this shift, it’s not available for you.")
+            )

shift_change/tests/test_shift_change.py

@@ -88,6 +88,25 @@ def setUp(self):
                 "worker_id": False,
             }
         )
+        self.shift_7 = self.shift_model.create(
+            {
+                "name": "shift_7",
+                "task_template_id": self.task_template_1.id,
+                "start_time": self.now + timedelta(days=4),
+                "end_time": self.now + timedelta(days=4),
+                "is_regular": True,
+                "worker_id": self.worker_regular_1.id,
+            }
+        )
+        self.shift_7_bis = self.shift_model.create(
+            {
+                "name": "shift_7_bis",
+                "task_template_id": self.task_template_1.id,
+                "start_time": self.now + timedelta(days=4),
+                "end_time": self.now + timedelta(days=4),
+                "worker_id": False,
+            }
+        )
 
         # Set context to avoid shift generation in the past
         self.env.context = dict(self.env.context, visualize_date=date.today())
@@ -228,3 +247,17 @@ def test_shift_origin_empty(self):
                     "new_shift_id": self.shift_3.id,
                 }
             )
+
+    def test_new_shift_not_available(self):
+        """Test that fails if worker has already subscribed to a sibling
+        of new_shift"""
+        self.assertEqual(self.shift_1.worker_id, self.worker_regular_1)
+        self.assertFalse(self.shift_7_bis.worker_id)
+        with self.assertRaises(ValidationError):
+            self.shift_change_model.create(
+                {
+                    "worker_id": self.worker_regular_1.id,
+                    "old_shift_id": self.shift_1.id,
+                    "new_shift_id": self.shift_7_bis.id,
+                }
+            )

shift_change/wizard/shift_change_create_wizard.py

@@ -48,23 +48,9 @@ def _on_change_worker_id(self):
     @api.depends("worker_id", "old_shift_id")
     def _compute_available_new_shift_ids(self):
         for rec in self:
-            next_templates = (
-                self.env["shift.shift"]
-                .search(
-                    [
-                        ("worker_id", "=", self.worker_id.id),
-                        ("start_time", ">=", datetime.now()),
-                    ]
-                )
-                .mapped("task_template_id")
-            )
-            rec.available_new_shift_ids = self.env["shift.shift"].search(
-                [
-                    ("worker_id", "=", False),
-                    ("start_time", ">=", datetime.now()),
-                    ("task_template_id", "not in", next_templates.ids),
-                ]
-            )
+            rec.available_new_shift_ids = self.env[
+                "shift.change"
+            ]._get_available_new_shift_ids(rec.worker_id)
 
     @api.model
     def _get_hour_limit_change(self):