Keep old timestamp when upserting activities (#144)

Co-authored-by: Joana Maia <joana@crowd.dev>

Author: Joan Reyero

backend/src/services/__tests__/activityService.test.ts

@@ -457,6 +457,43 @@ describe('ActivityService tests', () => {
       expect(activityCreated7.conversationId).toStrictEqual(conversationCreated2.id)
     })
 
+    it('Should keep old timestamp', async () => {
+      const mockIRepositoryOptions = await SequelizeTestUtils.getTestIRepositoryOptions(db)
+      const memberService = new MemberService(mockIRepositoryOptions)
+      const activityService = new ActivityService(mockIRepositoryOptions)
+
+      const cm = await memberService.upsert({
+        username: {
+          [PlatformType.DISCORD]: 'test',
+        },
+        platform: PlatformType.DISCORD,
+      })
+
+      const activity1 = {
+        type: 'message',
+        timestamp: '2020-05-27T15:13:30Z',
+        member: cm.id,
+        platform: PlatformType.DISCORD,
+        sourceId: 'sourceId#1',
+      }
+
+      const activityCreated1 = await activityService.upsert(activity1)
+
+      const activity2 = {
+        type: 'message',
+        timestamp: '2022-05-27T15:13:30Z',
+        member: cm.id,
+        platform: PlatformType.DISCORD,
+        sourceId: 'sourceId#1',
+        body: 'What is love?',
+      }
+
+      const activityCreated2 = await activityService.upsert(activity2)
+
+      expect(activityCreated2.timestamp).toStrictEqual(activityCreated1.timestamp)
+      expect(activityCreated2.body).toBe(activity2.body)
+    })
+
     it('Should create various conversations successfully with given parent-child relationships of activities [descending timestamp order]', async () => {
       const mockIRepositoryOptions = await SequelizeTestUtils.getTestIRepositoryOptions(db)
       const memberService = new MemberService(mockIRepositoryOptions)

backend/src/services/activityService.ts

@@ -71,7 +71,10 @@ export default class ActivityService {
       if (existing) {
         const { id } = existing
         delete existing.id
-        const toUpdate = merge(existing, data)
+        const toUpdate = merge(existing, data, {
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          timestamp: (oldValue, _newValue) => oldValue,
+        })
         record = await ActivityRepository.update(id, toUpdate, {
           ...this.options,
           transaction,