storage lib - fix duplicate conversations bug

Author: AlexNi245

packages/lib/storage/src/new/storage.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { stringify } from '@dm3-org/dm3-lib-shared';
 import { createStorage } from './index';
 import { makeEnvelop } from './testHelper';
@@ -18,15 +17,13 @@ describe('createStorage Integration Tests', () => {
                 const s = new Map<string, string>();
                 return {
                     read: async (key: string): Promise<Chunk | undefined> => {
-                        console.log('read', key);
                         const res = await s.get(key);
                         if (!res) {
                             return undefined;
                         }
                         return JSON.parse(res) as Chunk;
                     },
                     write: async (key: string, value: Chunk): Promise<void> => {
-                        console.log('write', key, value);
                         await s.set(key, stringify(value));
                     },
                     s,
@@ -64,6 +61,22 @@ describe('createStorage Integration Tests', () => {
             expect(list.length).toBe(1);
             expect(list[0]).toBe('bob.eth');
         });
+        it('addConversation - conversationList should not contain duplicates', async () => {
+            await storageApi.addConversation('bob.eth');
+            await storageApi.addConversation('max.eth');
+            await storageApi.addConversation('bob.eth');
+            //We acreate an newStorageApi to verify that the data is stored in remote storage and not just locally
+            storageApi = await createStorage('alice.eth', mockSign, {
+                readStrategy: ReadStrategy.RemoteFirst,
+                keyValueStoreRemote: remoteKeyValueStore,
+            });
+            const list = await storageApi.getConversationList(0);
+
+            expect(list.length).toBe(2);
+            expect(list[0]).toBe('bob.eth');
+            expect(list[1]).toBe('max.eth');
+            expect(list[2]).toBe(undefined);
+        });
         it('add new message - stores new message', async () => {
             await storageApi.addConversation('bob.eth');
             //We acreate an newStorageApi to verify that the data is stored in remote storage and not just locally

packages/lib/storage/src/new/write.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 import { Envelop } from '@dm3-org/dm3-lib-messaging';
 import {
     MAX_CONVERATION_ENTRIES_PER_CHUNK,
@@ -52,17 +53,29 @@ export async function addConversation(
     // with the new conversation added
     const key = await getConversationListKey(db, targetChunkIndex);
 
+    const conversationIsAlreadyInList =
+        conversationListChunk &&
+        conversationListChunk.conversationList.includes(contactEnsName);
+
+    const conversationList = !conversationListChunk
+        ? //If the conversation list chunk does not exist, we have to create it and add the conversation as the first element
+          [contactEnsName]
+        : //If the conversation list chunk exists, we have to check if the conversation has been already added. If so we can just return the conversation list chunk as it is.
+        conversationIsAlreadyInList
+        ? [...conversationListChunk.conversationList]
+        : //If the conversation has not been added yet, we have to add it to the conversation list chunk
+          [...conversationListChunk.conversationList, contactEnsName];
+
     return {
         conversationList: {
             key,
-            conversationList: conversationListChunk
-                ? [...conversationListChunk.conversationList, contactEnsName]
-                : [contactEnsName],
+            conversationList,
         },
         accountManifest: {
             ...accountMainfest,
-            conversationListCounter:
-                accountMainfest.conversationListCounter + 1,
+            conversationListCounter: conversationListChunk
+                ? accountMainfest.conversationListCounter
+                : accountMainfest.conversationListCounter + 1,
         },
     };
 }