From af7dd7d79d077799fca6318415758b85a902bfb8 Mon Sep 17 00:00:00 2001
From: "Louis Wicket (wil)" <wil@odoo.com>
Date: Tue, 23 Aug 2022 11:43:57 +0000
Subject: [PATCH] [FIX] mail: get_mention_suggestions returns correct channel
 data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ac08da0a834631b2a7c39c40b1f36f01a85e8617 moved channel_type from Thread
to Channel, but data returned by get_mention_suggestions have not been
updated accordingly. This commit adapts it.

Follow-up of task-2948676.

closes odoo/odoo#98677

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/models/mail_channel.py              | 11 ++++++++++-
 addons/mail/static/src/models/thread.js         |  5 +----
 addons/mail/static/tests/helpers/mock_server.js |  4 ++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py
index 7e934126a83..cfc9ca88e61 100644
--- a/addons/mail/models/mail_channel.py
+++ b/addons/mail/models/mail_channel.py
@@ -1137,7 +1137,16 @@ class Channel(models.Model):
                             [('channel_partner_ids', 'in', [self.env.user.partner_id.id])]
                         ])
                     ])
-        return self.search_read(domain, ['id', 'name', 'public', 'channel_type'], limit=limit)
+        channels = self.search(domain, limit=limit)
+        return [{
+            'channel': {
+                'channel_type': channel.channel_type,
+                'id': channel.id,
+            },
+            'id': channel.id,
+            'name': channel.name,
+            'public': channel.public,
+        } for channel in channels]
 
     def channel_fetch_preview(self):
         """ Return the last message of the given channels """
diff --git a/addons/mail/static/src/models/thread.js b/addons/mail/static/src/models/thread.js
index fbad7d8f138..38a1713b0c6 100644
--- a/addons/mail/static/src/models/thread.js
+++ b/addons/mail/static/src/models/thread.js
@@ -214,10 +214,7 @@ registerModel({
                 { shadow: true },
             );
             this.messaging.models['Thread'].insert(channelsData.map(channelData =>
-                Object.assign(
-                    { model: 'mail.channel' },
-                    this.messaging.models['Thread'].convertData(channelData),
-                )
+                this.messaging.models['Thread'].convertData(channelData)
             ));
         },
         /**
diff --git a/addons/mail/static/tests/helpers/mock_server.js b/addons/mail/static/tests/helpers/mock_server.js
index 073e26fbec1..a5f6c8956e8 100644
--- a/addons/mail/static/tests/helpers/mock_server.js
+++ b/addons/mail/static/tests/helpers/mock_server.js
@@ -1224,6 +1224,10 @@ patch(MockServer.prototype, 'mail', {
                 }).map(channel => {
                     // expected format
                     return {
+                        channel: {
+                            channel_type: channel.channel_type,
+                            id: channel.id,
+                        },
                         id: channel.id,
                         name: channel.name,
                         public: channel.public,