Use minimal replacement class for MessageModel

ts/test-electron/sql/conversationSummary_test.ts

@@ -9,6 +9,7 @@ import { generateAci } from '../../types/ServiceId';
 import { DurationInSeconds } from '../../util/durations';
 
 import type { MessageAttributesType } from '../../model-types.d';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, getConversationMessageStats } = DataReader;
 const { removeAll, saveMessages } = DataWriter;
@@ -56,6 +57,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -109,6 +111,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -199,6 +202,7 @@ describe('sql/conversationSummary', () => {
         {
           forceSave: true,
           ourAci,
+          postSaveUpdates,
         }
       );
 
@@ -306,6 +310,7 @@ describe('sql/conversationSummary', () => {
         {
           forceSave: true,
           ourAci,
+          postSaveUpdates,
         }
       );
 
@@ -355,6 +360,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 2);
@@ -404,6 +410,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 2);
@@ -446,6 +453,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 2);
@@ -490,6 +498,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 2);
@@ -549,6 +558,7 @@ describe('sql/conversationSummary', () => {
       await saveMessages([message1, message2], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 2);

ts/test-electron/sql/fullTextSearch_test.ts

@@ -8,6 +8,7 @@ import { DataReader, DataWriter } from '../../sql/Client';
 import { generateAci } from '../../types/ServiceId';
 
 import type { MessageAttributesType } from '../../model-types.d';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, searchMessages } = DataReader;
 const { removeAll, saveMessages, saveMessage } = DataWriter;
@@ -54,6 +55,7 @@ describe('sql/searchMessages', () => {
     await saveMessages([message1, message2, message3], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 3);
@@ -63,7 +65,7 @@ describe('sql/searchMessages', () => {
     assert.strictEqual(searchResults[0].id, message2.id);
 
     message3.body = 'message 3 - unique string';
-    await saveMessage(message3, { ourAci });
+    await saveMessage(message3, { ourAci, postSaveUpdates });
 
     const searchResults2 = await searchMessages({ query: 'unique' });
     assert.lengthOf(searchResults2, 2);
@@ -110,6 +112,7 @@ describe('sql/searchMessages', () => {
     await saveMessages([message1, message2, message3], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 3);
@@ -119,7 +122,7 @@ describe('sql/searchMessages', () => {
     assert.strictEqual(searchResults[0].id, message1.id);
 
     message1.body = 'message 3 - unique string';
-    await saveMessage(message3, { ourAci });
+    await saveMessage(message3, { ourAci, postSaveUpdates });
 
     const searchResults2 = await searchMessages({ query: 'unique' });
     assert.lengthOf(searchResults2, 1);
@@ -165,6 +168,7 @@ describe('sql/searchMessages', () => {
     await saveMessages([message1, message2, message3], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 3);
@@ -174,7 +178,7 @@ describe('sql/searchMessages', () => {
     assert.strictEqual(searchResults[0].id, message1.id);
 
     message1.body = 'message 3 - unique string';
-    await saveMessage(message3, { ourAci });
+    await saveMessage(message3, { ourAci, postSaveUpdates });
 
     const searchResults2 = await searchMessages({ query: 'unique' });
     assert.lengthOf(searchResults2, 1);
@@ -211,6 +215,7 @@ describe('sql/searchMessages', () => {
     await saveMessages([message1, message2], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 2);
@@ -251,6 +256,7 @@ describe('sql/searchMessages/withMentions', () => {
     await saveMessages(messages, {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
     return messages;
   }

ts/test-electron/sql/getCallHistoryMessageByCallId_test.ts

@@ -8,6 +8,7 @@ import { DataReader, DataWriter } from '../../sql/Client';
 import { generateAci } from '../../types/ServiceId';
 
 import type { MessageAttributesType } from '../../model-types.d';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, getCallHistoryMessageByCallId } = DataReader;
 const { removeAll, saveMessages } = DataWriter;
@@ -37,6 +38,7 @@ describe('sql/getCallHistoryMessageByCallId', () => {
     await saveMessages([callHistoryMessage], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     const allMessages = await _getAllMessages();

ts/test-electron/sql/getMessagesBetween_test.ts

@@ -8,6 +8,7 @@ import { generateAci } from '../../types/ServiceId';
 import { DataReader, DataWriter } from '../../sql/Client';
 
 import type { MessageAttributesType } from '../../model-types';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, getMessagesBetween } = DataReader;
 const { saveMessages, _removeAllMessages } = DataWriter;
@@ -45,6 +46,7 @@ describe('sql/getMessagesBetween', () => {
     await saveMessages([message1, message2, message3, message4, message5], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 5);
@@ -93,6 +95,7 @@ describe('sql/getMessagesBetween', () => {
     await saveMessages([message1, message2, message3, message5], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 4);

ts/test-electron/sql/getNearbyMessageFromDeletedSet_test.ts

@@ -8,6 +8,7 @@ import { DataReader, DataWriter } from '../../sql/Client';
 import { generateAci } from '../../types/ServiceId';
 
 import type { MessageAttributesType } from '../../model-types';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, getNearbyMessageFromDeletedSet } = DataReader;
 const { saveMessages, _removeAllMessages } = DataWriter;
@@ -45,6 +46,7 @@ describe('sql/getNearbyMessageFromDeletedSet', () => {
     await saveMessages([message1, message2, message3, message4, message5], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 5);

ts/test-electron/sql/getRecentStoryReplies_test.ts

@@ -8,6 +8,7 @@ import { DataReader, DataWriter } from '../../sql/Client';
 import { generateAci } from '../../types/ServiceId';
 
 import type { MessageAttributesType } from '../../model-types.d';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, getRecentStoryReplies } = DataReader;
 const { removeAll, saveMessages } = DataWriter;
@@ -91,6 +92,7 @@ describe('sql/getRecentStoryReplies', () => {
       {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       }
     );
 

ts/test-electron/sql/markRead_test.ts

@@ -12,6 +12,7 @@ import { ReactionReadStatus } from '../../types/Reactions';
 import { DurationInSeconds } from '../../util/durations';
 import type { MessageAttributesType } from '../../model-types.d';
 import { ReadStatus } from '../../messages/MessageReadStatus';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllReactions, _getAllMessages, getTotalUnreadForConversation } =
   DataReader;
@@ -126,6 +127,7 @@ describe('sql/markRead', () => {
       {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       }
     );
 
@@ -290,6 +292,7 @@ describe('sql/markRead', () => {
       {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       }
     );
 
@@ -392,6 +395,7 @@ describe('sql/markRead', () => {
     await saveMessages([message1, message2, message3, message4, message5], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.strictEqual(
@@ -518,6 +522,7 @@ describe('sql/markRead', () => {
       {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       }
     );
     assert.lengthOf(await _getAllMessages(), pad.length + 5);
@@ -673,6 +678,7 @@ describe('sql/markRead', () => {
     await saveMessages([message1, message2, message3, message4, message5], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
     assert.lengthOf(await _getAllMessages(), 5);
 
@@ -823,6 +829,7 @@ describe('sql/markRead', () => {
     await saveMessages([message1, message2, message3, message4], {
       forceSave: true,
       ourAci,
+      postSaveUpdates,
     });
 
     assert.lengthOf(await _getAllMessages(), 4);

ts/test-electron/sql/sendLog_test.ts

@@ -7,7 +7,7 @@ import { v4 as generateUuid } from 'uuid';
 import { DataReader, DataWriter } from '../../sql/Client';
 import { generateAci } from '../../types/ServiceId';
 import { constantTimeEqual, getRandomBytes } from '../../Crypto';
-import { singleProtoJobQueue } from '../../jobs/singleProtoJobQueue';
+import { cleanupMessages, postSaveUpdates } from '../../util/cleanup';
 
 const {
   _getAllSentProtoMessageIds,
@@ -128,7 +128,7 @@ describe('sql/sendLog', () => {
         timestamp,
         type: 'outgoing',
       },
-      { forceSave: true, ourAci }
+      { forceSave: true, ourAci, postSaveUpdates }
     );
 
     const bytes = getRandomBytes(128);
@@ -152,7 +152,7 @@ describe('sql/sendLog', () => {
 
     assert.strictEqual(actual.timestamp, proto.timestamp);
 
-    await removeMessage(id, { singleProtoJobQueue });
+    await removeMessage(id, { cleanupMessages });
 
     assert.lengthOf(await getAllSentProtos(), 0);
   });

ts/test-electron/sql/stories_test.ts

@@ -8,6 +8,7 @@ import { DataReader, DataWriter } from '../../sql/Client';
 import { generateAci } from '../../types/ServiceId';
 
 import type { MessageAttributesType } from '../../model-types.d';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const { _getAllMessages, getAllStories } = DataReader;
 const { removeAll, saveMessages } = DataWriter;
@@ -80,6 +81,7 @@ describe('sql/stories', () => {
       await saveMessages([story1, story2, story3, story4, story5], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 5);
@@ -217,6 +219,7 @@ describe('sql/stories', () => {
         {
           forceSave: true,
           ourAci,
+          postSaveUpdates,
         }
       );
 

ts/test-electron/sql/timelineFetches_test.ts

@@ -9,6 +9,7 @@ import { generateAci } from '../../types/ServiceId';
 
 import type { MessageAttributesType } from '../../model-types.d';
 import { ReadStatus } from '../../messages/MessageReadStatus';
+import { postSaveUpdates } from '../../util/cleanup';
 
 const {
   _getAllMessages,
@@ -86,6 +87,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3, message4, message5], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 5);
@@ -144,6 +146,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -199,6 +202,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -251,6 +255,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -305,6 +310,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -363,6 +369,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -442,6 +449,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3, message4, message5], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 5);
@@ -499,6 +507,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -552,6 +561,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -608,6 +618,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -662,6 +673,7 @@ describe('sql/timelineFetches', () => {
       await saveMessages([message1, message2, message3], {
         forceSave: true,
         ourAci,
+        postSaveUpdates,
       });
 
       assert.lengthOf(await _getAllMessages(), 3);
@@ -781,7 +793,7 @@ describe('sql/timelineFetches', () => {
           newestInStory,
           newest,
         ],
-        { forceSave: true, ourAci }
+        { forceSave: true, ourAci, postSaveUpdates }
       );
 
       assert.lengthOf(await _getAllMessages(), 8);
@@ -873,7 +885,11 @@ describe('sql/timelineFetches', () => {
         }
       );
 
-      await saveMessages(formattedMessages, { forceSave: true, ourAci });
+      await saveMessages(formattedMessages, {
+        forceSave: true,
+        ourAci,
+        postSaveUpdates,
+      });
 
       assert.lengthOf(await _getAllMessages(), 4);