[FIX] helpdesk_mgmt_activity: Assigned user is added for ticket

OCA · Oct 23, 2024 · d595725 · d595725
1 parent d949b2f
commit d595725
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/helpdesk_mgmt_activity/models/helpdesk_ticket.py b/helpdesk_mgmt_activity/models/helpdesk_ticket.py
@@ -27,6 +27,9 @@ class HelpdeskTicket(models.Model):
         store=True,
         index=True,
     )
+    assigned_user_id = fields.Many2one(
+        comodel_name="res.users",
+    )
     is_new_stage = fields.Boolean(compute="_compute_is_new_stage")
 
     @api.model
@@ -122,6 +125,8 @@ def _check_activity_values(self):
             raise models.UserError(_("Activity Type is not set!"))
         if not self.date_deadline:
             raise models.UserError(_("Date Deadline is not set!"))
+        if not self.assigned_user_id:
+            raise models.UserError(_("Assigned User is not set!"))
 
     def perform_action(self):
         """Perform action for ticket"""
@@ -136,7 +141,7 @@ def perform_action(self):
                 date_deadline=self.date_deadline,
                 activity_type_id=self.source_activity_type_id.id,
                 ticket_id=self.id,
-                user_id=self.user_id.id,
+                user_id=self.assigned_user_id.id,
             )
             self.set_next_stage()
         except Exception as e:

diff --git a/helpdesk_mgmt_activity/tests/test_helpdesk_ticket.py b/helpdesk_mgmt_activity/tests/test_helpdesk_ticket.py
@@ -33,6 +33,7 @@ def create_ticket_and_activity(self):
                 "record_ref": f"res.partner,{self.test_partner.id}",
                 "source_activity_type_id": self.activity_type_meeting.id,
                 "date_deadline": Date.today(),
+                "assigned_user_id": self.env.user.id,
             }
         )
         ticket.perform_action()
@@ -62,6 +63,7 @@ def test_ticket_next_stage(self):
                 "record_ref": f"res.partner,{self.test_partner.id}",
                 "source_activity_type_id": self.activity_type_meeting.id,
                 "date_deadline": Date.today(),
+                "assigned_user_id": self.env.user.id,
             }
         )
 
@@ -168,6 +170,16 @@ def test_perform_action(self):
 
         ticket.date_deadline = Date.today()
 
+        with self.assertRaises(UserError) as error:
+            ticket.perform_action()
+        self.assertEqual(
+            error.exception.args[0],
+            "Assigned User is not set!",
+            "Errors must be the same",
+        )
+
+        ticket.assigned_user_id = self.env.user
+
         action = ticket.perform_action()
 
         self.assertDictEqual(
@@ -193,7 +205,7 @@ def test_perform_action(self):
                     "date_deadline": ticket.date_deadline,
                     "activity_type_id": ticket.source_activity_type_id.id,
                     "ticket_id": ticket.id,
-                    "user_id": ticket.user_id.id,
+                    "user_id": self.env.user.id,
                 }
             ],
         )

diff --git a/helpdesk_mgmt_activity/views/helpdesk_ticket_view.xml b/helpdesk_mgmt_activity/views/helpdesk_ticket_view.xml
@@ -31,6 +31,10 @@
                         name="date_deadline"
                         attrs="{'invisible': [('source_activity_type_id', '=', False)]}"
                     />
+                    <field
+                        name="assigned_user_id"
+                        attrs="{'invisible': [('source_activity_type_id', '=', False)]}"
+                    />
                 </group>
             </group>
         </field>