[MIG] mail_gateway: Migratio to 17.0

Author: CarlosRoca13

mail_gateway/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Mail Gateway",
     "summary": """
         Set a gateway""",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "license": "AGPL-3",
     "author": "Creu Blanca,Dixmit,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/social",

mail_gateway/controllers/discuss.py

@@ -1,10 +1,10 @@
 # Copyright 2024 Dixmit
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
-from odoo.addons.mail.controllers.discuss import DiscussController
+from odoo.addons.mail.controllers.thread import ThreadController
 
 
-class GatewayDiscussController(DiscussController):
+class GatewayThreadController(ThreadController):
     def _get_allowed_message_post_params(self):
         result = super()._get_allowed_message_post_params()
         result.add("gateway_notifications")

mail_gateway/hooks.py

@@ -1,12 +1,12 @@
-def pre_init_hook(cr):
+def pre_init_hook(env):
     """
     The objective of this hook is to speed up the installation
     of the module on an existing Odoo instance.
 
     Without this script, big databases can take a long time to install this
     module.
     """
-    cr.execute(
+    env.cr.execute(
         """ALTER TABLE mail_message
     ADD COLUMN gateway_channel_id int"""
     )

mail_gateway/models/__init__.py

@@ -8,3 +8,5 @@
 from . import mail_gateway_abstract
 from . import res_users
 from . import mail_thread
+
+from . import discuss

mail_gateway/models/discuss/__init__.py

@@ -0,0 +1 @@
+from . import discuss_channel

mail_gateway/models/mail_channel.py renamed to mail_gateway/models/discuss/discuss_channel.py

@@ -7,7 +7,7 @@
 
 
 class MailChannel(models.Model):
-    _inherit = "mail.channel"
+    _inherit = "discuss.channel"
 
     gateway_channel_token = fields.Char()
     anonymous_name = fields.Char()  # Same field we will use on im_livechat
@@ -26,9 +26,9 @@ class MailChannel(models.Model):
         required=False,
     )
 
-    def channel_info(self):
-        result = super().channel_info()
-        for record, item in zip(self, result):
+    def _channel_info(self):
+        result = super()._channel_info()
+        for record, item in zip(self, result, strict=True):
             item["gateway"] = {
                 "id": record.gateway_id.id,
                 "name": record.gateway_id.name,

mail_gateway/models/mail_gateway.py

@@ -63,7 +63,7 @@ def _get_channel_id(self, chat_token):
         )
 
     def _get_webhook_url(self):
-        return "%s/gateway/%s/%s/update" % (
+        return "{}/gateway/{}/{}/update".format(
             self.webhook_url
             or self.env["ir.config_parameter"].get_param("web.base.url"),
             self.gateway_type,
@@ -93,7 +93,7 @@ def update_webhook(self):
         self.set_webhook()
 
     def write(self, vals):
-        res = super(MailGateway, self).write(vals)
+        res = super().write(vals)
         if (
             "webhook_key" in vals
             or "integrated_webhook_state" in vals
@@ -105,7 +105,7 @@ def write(self, vals):
 
     @api.model_create_multi
     def create(self, mvals):
-        res = super(MailGateway, self).create(mvals)
+        res = super().create(mvals)
         self.clear_caches()
         return res
 

mail_gateway/models/mail_message.py

@@ -48,14 +48,18 @@ def _compute_gateway_thread_data(self):
     def _compute_gateway_channel_ids(self):
         for record in self:
             if self.env.user.has_group("mail_gateway.gateway_user"):
-                channels = record.notification_ids.res_partner_id.gateway_channel_ids.filtered(
-                    lambda r: (r.gateway_token, r.gateway_id.id)
+                partners = record.notification_ids.res_partner_id
+                channels = partners.gateway_channel_ids.filtered(
+                    lambda r, messages=record.gateway_message_ids: (
+                        r.gateway_token,
+                        r.gateway_id.id,
+                    )
                     not in [
                         (
                             notification.gateway_channel_id.gateway_channel_token,
                             notification.gateway_channel_id.gateway_id.id,
                         )
-                        for notification in record.gateway_message_ids.gateway_notification_ids
+                        for notification in messages.gateway_notification_ids
                     ]
                 )
             else:
@@ -76,9 +80,7 @@ def _compute_gateway_channel_id(self):
 
     def _get_message_format_fields(self):
         result = super()._get_message_format_fields()
-        result.append("gateway_type")
-        result.append("gateway_channel_data")
-        result.append("gateway_thread_data")
+        result += ["gateway_type", "gateway_channel_data", "gateway_thread_data"]
         return result
 
     def _send_to_gateway_thread(self, gateway_channel_id):

mail_gateway/models/mail_notification.py

@@ -26,7 +26,7 @@ def _set_read_gateway(self):
 
     def _notification_format(self):
         result = super()._notification_format()
-        for record, formatted_value in zip(self, result):
+        for record, formatted_value in zip(self, result, strict=True):
             formatted_value["gateway_type"] = record.gateway_type
             formatted_value["channel_name"] = record.gateway_channel_id.name
         return result

mail_gateway/models/mail_thread.py

@@ -72,14 +72,14 @@ def _message_update_content(
         )
         if body == "":
             # Unlink the message
-            for gateway_message in message.gateway_message_ids:
-                gateway_message.gateway_message_id = False
+            for gateway_msg in message.gateway_message_ids:
+                gateway_msg.gateway_message_id = False
                 self.env["bus.bus"]._sendone(
                     self.env.user.partner_id,
                     "mail.message/insert",
                     {
-                        "id": gateway_message.id,
-                        "gateway_thread_data": gateway_message.sudo().gateway_thread_data,
+                        "id": gateway_msg.id,
+                        "gateway_thread_data": gateway_msg.sudo().gateway_thread_data,
                     },
                 )
         return result