SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Gekidou[ [MM-43969, MM-44037] global threads crash, mark as read (#6253)

Browse Source 
* Preparing thread data as well with prepareDeletePost

* observing the post directly to prevent the crash until the data issue is found

* mark as read, delete threeds fix

* Update thread.ts

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Anurag Shivarathri
2022-05-10 15:59:06 +05:30
committed by GitHub
parent 591cfa1ae4
commit ba976dadc2
10 changed files with 104 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/database/operator/server_data_operator/handlers/thread.ts
View File

@@ -1,9 +1,10 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {Q} from '@nozbe/watermelondb';
import Model from '@nozbe/watermelondb/Model';
import {Database} from '@constants';
import {MM_TABLES} from '@constants/database';
import {
transformThreadRecord,
transformThreadParticipantRecord,
@@ -11,6 +12,7 @@ import {
import {getUniqueRawsBy} from '@database/operator/utils/general';
import {sanitizeThreadParticipants} from '@database/operator/utils/thread';
import type Database from '@nozbe/watermelondb/Database';
import type {HandleThreadsArgs, HandleThreadParticipantsArgs} from '@typings/database/database';
import type ThreadModel from '@typings/database/models/servers/thread';
import type ThreadInTeamModel from '@typings/database/models/servers/thread_in_team';
@@ -19,7 +21,7 @@ import type ThreadParticipantModel from '@typings/database/models/servers/thread
const {
THREAD,
THREAD_PARTICIPANT,
} = Database.MM_TABLES.SERVER;
} = MM_TABLES.SERVER;
export interface ThreadHandlerMix {
handleThreads: ({threads, teamId, prepareRecordsOnly, loadedInGlobalThreads}: HandleThreadsArgs) => Promise<Model[]>;
@@ -49,10 +51,42 @@ const ThreadHandler = (superclass: any) => class extends superclass {
key: 'id',
}) as Thread[];
// Seperate threads to be deleted & created/updated
const deletedThreadIds: string[] = [];
const createOrUpdateThreads: Thread[] = [];
uniqueThreads.forEach((thread) => {
if (thread.delete_at > 0) {
deletedThreadIds.push(thread.id);
} else {
createOrUpdateThreads.push(thread);
}
});
if (deletedThreadIds.length) {
const database: Database = this.database;
const threadsToDelete = await database.get<ThreadModel>(THREAD).query(Q.where('id', Q.oneOf(deletedThreadIds))).fetch();
if (threadsToDelete.length) {
await database.write(async () => {
const promises: Array<Promise<void>> = [];
threadsToDelete.forEach((thread) => {
promises.push(thread.destroyPermanently());
promises.push(thread.threadsInTeam.destroyAllPermanently());
promises.push(thread.participants.destroyAllPermanently());
});
await Promise.all(promises);
});
}
}
// As there are no threads to be created or updated
if (!createOrUpdateThreads.length) {
return [];
}
const threadsParticipants: ParticipantsPerThread[] = [];
// Let's process the thread data
for (const thread of uniqueThreads) {
for (const thread of createOrUpdateThreads) {
// Avoid participants field set as "null" from overriding the existing ones
if (Array.isArray(thread.participants)) {
threadsParticipants.push({
@@ -70,7 +104,7 @@ const ThreadHandler = (superclass: any) => class extends superclass {
fieldName: 'id',
transformer: transformThreadRecord,
prepareRecordsOnly: true,
createOrUpdateRawValues: uniqueThreads,
createOrUpdateRawValues: createOrUpdateThreads,
tableName: THREAD,
}) as ThreadModel[];