[MIG] mail_gateway: continue migration

Author: chienandalu

mail_gateway/__init__.py

@@ -1,6 +1,5 @@
 from . import controllers
 from . import models
 
-# from . import services
 from .hooks import pre_init_hook
 from . import wizards

mail_gateway/__manifest__.py

@@ -19,20 +19,16 @@
         "security/ir.model.access.csv",
         "views/mail_gateway.xml",
         "views/res_partner_gateway_channel.xml",
+        "views/mail_guest_views.xml",
     ],
     "assets": {
-        "mail.assets_messaging": [
-            "mail_gateway/static/src/models/**/*.js",
-        ],
         "web.assets_backend": [
-            "mail_gateway/static/src/components/**/*.xml",
-            "mail_gateway/static/src/components/**/*.js",
-            "mail_gateway/static/src/components/**/*.scss",
-        ],
-        "mail.assets_discuss_public": [
-            "mail_gateway/static/src/components/**/*.xml",
-            "mail_gateway/static/src/components/**/*.js",
-            "mail_gateway/static/src/components/**/*.scss",
+            "mail_gateway/static/src/components/**/*",
+            "mail_gateway/static/src/core/**/*",
+            "mail_gateway/static/src/models/**/*",
         ],
+        # "mail.assets_public": [
+        #     "mail_gateway/static/src/components/**/*",
+        # ],
     },
 }

mail_gateway/controllers/gateway.py

@@ -6,6 +6,8 @@
 
 from odoo.http import Controller, request, route
 
+from odoo.addons.mail.models.discuss.mail_guest import add_guest_to_context
+
 _logger = logging.getLogger(__name__)
 
 
@@ -17,6 +19,7 @@ class GatewayController(Controller):
         methods=["GET", "POST"],
         csrf=False,
     )
+    @add_guest_to_context
     def post_update(self, usage, token, *args, **kwargs):
         if request.httprequest.method == "GET":
             bot_data = request.env["mail.gateway"]._get_gateway(

mail_gateway/hooks.py

@@ -8,5 +8,5 @@ def pre_init_hook(env):
     """
     env.cr.execute(
         """ALTER TABLE mail_message
-    ADD COLUMN gateway_channel_id int"""
+    ADD COLUMN IF NOT EXISTS gateway_channel_id int"""
     )

mail_gateway/models/__init__.py

@@ -1,12 +1,11 @@
+from . import ir_websocket
+from . import mail_gateway_abstract
 from . import mail_message
 from . import mail_notification
-from . import mail_channel
+from . import discuss_channel
 from . import mail_gateway
-from . import ir_websocket
 from . import res_partner
 from . import mail_guest
-from . import mail_gateway_abstract
 from . import res_users
+from . import res_users_settings
 from . import mail_thread
-
-from . import discuss

mail_gateway/models/discuss/__init__.py

@@ -26,6 +26,13 @@ class MailChannel(models.Model):
         required=False,
     )
 
+    def _compute_is_chat(self):
+        res = super()._compute_is_chat()
+        for record in self:
+            if record.channel_type == "gateway":
+                record.is_chat = True
+        return res
+
     def _channel_info(self):
         result = super()._channel_info()
         for record, item in zip(self, result, strict=True):

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

@@ -14,7 +14,7 @@ def _build_bus_channel_list(self, channels):
         result = super()._build_bus_channel_list(channels)
         if req.session.uid:
             if req.env.user.has_group("mail_gateway.gateway_user"):
-                for channel in req.env["mail.channel"].search(
+                for channel in req.env["discuss.channel"].search(
                     [("channel_type", "=", "gateway")]
                 ):
                     result.append(channel)

mail_gateway/models/ir_websocket.py

@@ -51,7 +51,7 @@ def _compute_webhook_url(self):
 
     def _get_channel_id(self, chat_token):
         return (
-            self.env["mail.channel"]
+            self.env["discuss.channel"]
             .search(
                 [
                     ("gateway_channel_token", "=", str(chat_token)),

mail_gateway/models/mail_gateway.py

@@ -33,10 +33,10 @@ def _remove_webhook(self, gateway):
     def _get_channel(self, gateway, token, update, force_create=False):
         chat_id = gateway._get_channel_id(token)
         if chat_id:
-            return gateway.env["mail.channel"].browse(chat_id)
+            return gateway.env["discuss.channel"].browse(chat_id)
         if not force_create and gateway.has_new_channel_security:
             return False
-        channel = gateway.env["mail.channel"].create(
+        channel = gateway.env["discuss.channel"].create(
             self._get_channel_vals(gateway, token, update)
         )
         channel._broadcast(channel.channel_member_ids.mapped("partner_id").ids)