[REF] mail: replace ThreadSeenInfo by ChannelMember data

SeenInfo was a model heavily coupled with ChannelMember.
There was no point to make another model when it could just be
a field on ChannelMember.

This commit simplifies the code by putting `lastSeen/FetchedMessage`
in the ChannelMember model and formatter.

closes odoo#145010

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>

Author: alexkuhn

addons/im_livechat/models/discuss_channel_member.py

@@ -26,6 +26,7 @@ def _get_partner_data(self, fields=None):
             data = {
                 'active': self.partner_id.active,
                 'id': self.partner_id.id,
+                'type': "partner",
                 'is_public': self.partner_id.is_public,
                 'is_bot': self.partner_id.id in self.channel_id.livechat_channel_id.rule_ids.mapped('chatbot_script_id.operator_partner_id.id')
             }

addons/im_livechat/static/tests/helpers/mock_server/models/discuss_channel_member.js

@@ -19,6 +19,7 @@ patch(MockServer.prototype, {
             const data = {
                 id: partner.id,
                 is_public: partner.is_public,
+                type: "partner",
             };
             if (partner.user_livechat_username) {
                 data["user_livechat_username"] = partner.user_livechat_username;

addons/im_livechat/tests/test_get_discuss_channel.py

@@ -22,6 +22,7 @@ def test_get_discuss_channel(self):
             self.assertTrue(all(partner_id in channel_operator_ids for partner_id in self.operators.mapped('partner_id').ids))
 
     def test_channel_get_livechat_visitor_info(self):
+        self.maxDiff = None
         belgium = self.env.ref('base.be')
         test_user = self.env['res.users'].create({'name': 'Roger', 'login': 'roger', 'password': self.password, 'country_id': belgium.id})
 
@@ -81,6 +82,8 @@ def test_channel_get_livechat_visitor_info(self):
                     'type': "partner",
                     'user_livechat_username': 'Michel Operator',
                 },
+                'fetched_message_id': False,
+                'seen_message_id': False,
             },
             {
                 'thread': {'id': channel_info['id'], 'model': "discuss.channel"},
@@ -98,6 +101,8 @@ def test_channel_get_livechat_visitor_info(self):
                     'name': 'Roger',
                     'type': "partner",
                 },
+                'fetched_message_id': False,
+                'seen_message_id': False,
             },
         ]]])
 
@@ -131,6 +136,8 @@ def test_channel_get_livechat_visitor_info(self):
                     'type': "partner",
                     'user_livechat_username': 'Michel Operator',
                 },
+                'fetched_message_id': False,
+                'seen_message_id': False,
             },
         ]]])
 

addons/mail/models/discuss/discuss_channel.py

@@ -819,12 +819,6 @@ def _channel_info(self):
                 # exclude chat and other small channels from this optimization because they are
                 # assumed to be smaller and it's important to know the member list for them
                 info['channelMembers'] = [('ADD', list(members_by_channel[channel]._discuss_channel_member_format().values()))]
-                info['seenInfos'] = sorted([{
-                    'id': cp.id,
-                    'partner': {'id': cp.partner_id.id, 'type': "partner"},
-                    'lastFetchedMessage': {'id': cp.fetched_message_id.id} if cp.fetched_message_id else False,
-                    'lastSeenMessage': {'id': cp.seen_message_id.id} if cp.seen_message_id else False,
-                } for cp in members_by_channel[channel] if cp.partner_id], key=lambda p: p['partner']['id'])
             # add RTC sessions info
             info.update({
                 'invitedMembers': [('ADD', list(invited_members_by_channel[channel]._discuss_channel_member_format(fields={'id': True, 'channel': {}, 'persona': {'partner': {'id': True, 'name': True, 'im_status': True}, 'guest': {'id': True, 'name': True, 'im_status': True}}}).values()))],

addons/mail/models/discuss/discuss_channel_member.py

@@ -173,7 +173,7 @@ def _unmute(self):
 
     def _discuss_channel_member_format(self, fields=None):
         if not fields:
-            fields = {'id': True, 'channel': {}, 'persona': {}}
+            fields = {'id': True, 'channel': {}, 'persona': {}, 'fetched_message_id': True, 'seen_message_id': True}
         members_formatted_data = {}
         for member in self:
             data = {}
@@ -185,7 +185,6 @@ def _discuss_channel_member_format(self, fields=None):
                 if member.partner_id:
                     # sudo: res.partner - reading _get_partner_data related to a member is considered acceptable
                     persona = member.sudo()._get_partner_data(fields=fields.get('persona', {}).get('partner'))
-                    persona['type'] = "partner"
                 if member.guest_id:
                     # sudo: mail.guest - reading _guest_format related to a member is considered acceptable
                     persona = member.guest_id.sudo()._guest_format(fields=fields.get('persona', {}).get('guest')).get(member.guest_id)
@@ -194,6 +193,10 @@ def _discuss_channel_member_format(self, fields=None):
                 data['custom_notifications'] = member.custom_notifications
             if 'mute_until_dt' in fields:
                 data['mute_until_dt'] = member.mute_until_dt
+            if 'fetched_message_id' in fields:
+                data['fetched_message_id'] = {'id': member.fetched_message_id.id} if member.fetched_message_id else False
+            if 'seen_message_id' in fields:
+                data['seen_message_id'] = {'id': member.seen_message_id.id} if member.seen_message_id else False
             members_formatted_data[member] = data
         return members_formatted_data
 

addons/mail/static/src/core/common/@types/models.d.ts

@@ -17,7 +17,6 @@ declare module "models" {
     import { Settings as SettingsClass } from "@mail/core/common/settings_model";
     import { Store as StoreClass } from "@mail/core/common/store_service";
     import { Thread as ThreadClass } from "@mail/core/common/thread_model";
-    import { ThreadSeenInfo as ThreadSeenInfoClass } from "@mail/core/common/thread_seen_info_model";
     import { Volume as VolumeClass } from "@mail/core/common/volume_model";
 
     // define interfaces for jsdoc, including with patches
@@ -39,7 +38,6 @@ declare module "models" {
     export interface Settings extends SettingsClass {}
     export interface Store extends StoreClass {}
     export interface Thread extends ThreadClass {}
-    export interface ThreadSeenInfo extends ThreadSeenInfoClass {}
     export interface Volume extends VolumeClass {}
 
     // required to propagate types in relational fields
@@ -62,7 +60,6 @@ declare module "models" {
         "Settings": Settings,
         "Store": Store,
         "Thread": Thread,
-        "ThreadSeenInfo": ThreadSeenInfo,
         "Volume": Volume,
     }
 }

addons/mail/static/src/core/common/channel_member_model.js

@@ -2,13 +2,6 @@
 
 import { Record } from "@mail/core/common/record";
 
-/**
- * @class ChannelMember
- * @typedef Data
- * @property {number} id
- * @property {import("models").Persona} persona
- * @property {import("models").Thread} thread
- */
 export class ChannelMember extends Record {
     static id = "id";
     /** @type {Object.<number, import("models").ChannelMember>} */
@@ -27,6 +20,8 @@ export class ChannelMember extends Record {
     persona = Record.one("Persona", { inverse: "channelMembers" });
     rtcSession = Record.one("RtcSession");
     thread = Record.one("Thread", { inverse: "channelMembers" });
+    fetched_message_id = Record.one("Message");
+    seen_message_id = Record.one("Message");
 
     /**
      * @returns {string}

addons/mail/static/src/core/common/message_seen_indicator.js

@@ -18,21 +18,20 @@ export class MessageSeenIndicator extends Component {
     }
 
     get hasEveryoneSeen() {
-        const otherDidNotSee = this.props.thread.seenInfos.filter((seenInfo) => {
+        const otherDidNotSee = this.props.thread.channelMembers.filter((member) => {
             return (
-                seenInfo.partner.notEq(this.props.message.author) &&
-                (!seenInfo.lastSeenMessage || seenInfo.lastSeenMessage.id < this.props.message.id)
+                member.persona.notEq(this.props.message.author) &&
+                (!member.seen_message_id || member.seen_message_id.id < this.props.message.id)
             );
         });
         return otherDidNotSee.length === 0;
     }
 
     get hasEveryoneReceived() {
-        return !this.props.thread.seenInfos.some((seenInfo) => {
+        return !this.props.thread.channelMembers.some((member) => {
             return (
-                seenInfo.partner.notEq(this.props.message.author) &&
-                (!seenInfo.lastFetchedMessage ||
-                    seenInfo.lastFetchedMessage.id < this.props.message.id)
+                member.persona.notEq(this.props.message.author) &&
+                (!member.fetched_message_id || member.fetched_message_id.id < this.props.message.id)
             );
         });
     }
@@ -45,19 +44,19 @@ export class MessageSeenIndicator extends Component {
     }
 
     get hasSomeoneSeen() {
-        const otherSeen = this.props.thread.seenInfos.filter(
-            (seenInfo) =>
-                seenInfo.partner.notEq(this.props.message.author) &&
-                seenInfo.lastSeenMessage?.id >= this.props.message.id
+        const otherSeen = this.props.thread.channelMembers.filter(
+            (member) =>
+                member.persona.notEq(this.props.message.author) &&
+                member.seen_message_id?.id >= this.props.message.id
         );
         return otherSeen.length > 0;
     }
 
     get hasSomeoneFetched() {
-        const otherFetched = this.props.thread.seenInfos.filter(
-            (seenInfo) =>
-                seenInfo.partner.notEq(this.props.message.author) &&
-                seenInfo.lastFetchedMessage?.id >= this.props.message.id
+        const otherFetched = this.props.thread.channelMembers.filter(
+            (member) =>
+                member.persona.notEq(this.props.message.author) &&
+                member.fetched_message_id?.id >= this.props.message.id
         );
         return otherFetched.length > 0;
     }

addons/mail/static/src/core/common/store_service.js

@@ -46,8 +46,6 @@ export class Store extends BaseStore {
     Settings;
     /** @type {typeof import("@mail/core/common/thread_model").Thread} */
     Thread;
-    /** @type {typeof import("@mail/core/common/thread_seen_info_model").ThreadSeenInfo} */
-    ThreadSeenInfo;
     /** @type {typeof import("@mail/core/common/volume_model").Volume} */
     Volume;
 

addons/mail/static/src/core/common/thread_model.js

@@ -243,7 +243,6 @@ export class Thread extends Record {
     });
     /** @type {string} */
     defaultDisplayMode;
-    seenInfos = Record.many("ThreadSeenInfo");
     /** @type {SuggestedRecipient[]} */
     suggestedRecipients = [];
     hasLoadingFailed = false;
@@ -444,15 +443,15 @@ export class Thread extends Record {
     }
 
     get lastSelfMessageSeenByEveryone() {
-        const otherSeenInfos = [...this.seenInfos].filter((seenInfo) =>
-            seenInfo.partner.notEq(this._store.self)
+        const otherMembers = this.channelMembers.filter((member) =>
+            member.persona.notEq(this._store.self)
         );
-        if (otherSeenInfos.length === 0) {
+        if (otherMembers.length === 0) {
             return false;
         }
-        const otherLastSeenMessageIds = otherSeenInfos
-            .filter((seenInfo) => seenInfo.lastSeenMessage)
-            .map((seenInfo) => seenInfo.lastSeenMessage.id);
+        const otherLastSeenMessageIds = otherMembers
+            .filter((member) => member.seen_message_id)
+            .map((member) => member.seen_message_id.id);
         if (otherLastSeenMessageIds.length === 0) {
             return false;
         }