Bugfix/slack member issue c 653

backend/src/database/migrations/U1677503916__activity-source-index.sql

@@ -0,0 +1 @@
+drop index create unique index ix_unique_activities_tenantId_platform_type_sourceId;

backend/src/database/migrations/V1677503916__activity-source-index.sql

@@ -0,0 +1 @@
+create unique index ix_unique_activities_tenantId_platform_type_sourceId on activities ("tenantId", platform, type, "sourceId");

backend/src/database/repositories/__tests__/memberRepository.test.ts

@@ -297,8 +297,8 @@ describe('MemberRepository tests', () => {
 
       const memberCreated = await MemberRepository.create(member2add, mockIRepositoryOptions)
       expect(memberCreated.tasks).toHaveLength(2)
-      expect(memberCreated.tasks[0].id).toEqual(tasks1.id)
-      expect(memberCreated.tasks[1].id).toEqual(task2.id)
+      expect(memberCreated.tasks.find((t) => t.id === tasks1.id)).not.toBeUndefined()
+      expect(memberCreated.tasks.find((t) => t.id === task2.id)).not.toBeUndefined()
     })
   })
 
@@ -1655,8 +1655,8 @@ describe('MemberRepository tests', () => {
         mockIRepositoryOptions,
       )
       expect(memberUpdated.tasks).toHaveLength(2)
-      expect(memberUpdated.tasks[0].id).toEqual(tasks1.id)
-      expect(memberUpdated.tasks[1].id).toEqual(task2.id)
+      expect(memberUpdated.tasks.find((t) => t.id === tasks1.id)).not.toBeUndefined()
+      expect(memberUpdated.tasks.find((t) => t.id === task2.id)).not.toBeUndefined()
     })
 
     it('Should throw 404 error when trying to update non existent member', async () => {

backend/src/database/repositories/__tests__/organizationRepository.test.ts

@@ -1015,7 +1015,7 @@ describe('OrganizationRepository tests', () => {
               type: 'activity',
               timestamp: '2022-02-27T15:13:30Z',
               platform: PlatformType.DEVTO,
-              sourceId: '#sourceId4',
+              sourceId: '#sourceId5',
             },
           ],
         },

backend/src/database/repositories/__tests__/taskRepository.test.ts

@@ -136,8 +136,12 @@ describe('TaskRepository tests', () => {
         createdById: mockIRepositoryOptions.currentUser.id,
         updatedById: mockIRepositoryOptions.currentUser.id,
       }
-      expect(createdTask).toStrictEqual(expectedTaskCreated)
-      expect(createdTask.members.length).toBe(sampleMembers.length)
+      const clone1 = { ...createdTask }
+      const clone2 = { ...expectedTaskCreated }
+      delete clone1.members
+      delete clone2.members
+      expect(clone1).toStrictEqual(clone2)
+      expect(createdTask.members.sort()).toEqual(expectedTaskCreated.members.sort())
 
       // Make sure the task exists in the member
       for (const memberId of createdTask.members) {
@@ -210,7 +214,13 @@ describe('TaskRepository tests', () => {
         createdById: mockIRepositoryOptions.currentUser.id,
         updatedById: mockIRepositoryOptions.currentUser.id,
       }
-      expect(createdTask).toStrictEqual(expectedTaskCreated)
+
+      const clone1 = { ...createdTask }
+      const clone2 = { ...expectedTaskCreated }
+      delete clone1.members
+      delete clone2.members
+      expect(clone1).toStrictEqual(clone2)
+      expect(createdTask.members.sort()).toEqual(expectedTaskCreated.members.sort())
       expect(createdTask.activities.length).toBe(sampleActivities.length)
       expect(createdTask.members.length).toBe(sampleMembers.length)
     })
@@ -315,7 +325,12 @@ describe('TaskRepository tests', () => {
         createdById: mockIRepositoryOptions.currentUser.id,
         updatedById: mockIRepositoryOptions.currentUser.id,
       }
-      expect(createdTask).toStrictEqual(expectedTaskCreated)
+      const clone1 = { ...createdTask }
+      const clone2 = { ...expectedTaskCreated }
+      delete clone1.members
+      delete clone2.members
+      expect(clone1).toStrictEqual(clone2)
+      expect(createdTask.members.sort()).toEqual(expectedTaskCreated.members.sort())
       expect(createdTask.members.length).toBe(sampleMembers.length)
 
       // Make sure the task exists in the member
@@ -389,7 +404,13 @@ describe('TaskRepository tests', () => {
         createdById: mockIRepositoryOptions.currentUser.id,
         updatedById: mockIRepositoryOptions.currentUser.id,
       }
-      expect(createdTask).toStrictEqual(expectedTaskCreated)
+
+      const clone1 = { ...createdTask }
+      const clone2 = { ...expectedTaskCreated }
+      delete clone1.members
+      delete clone2.members
+      expect(clone1).toStrictEqual(clone2)
+      expect(createdTask.members.sort()).toEqual(expectedTaskCreated.members.sort())
       expect(createdTask.activities.length).toBe(sampleActivities.length)
       expect(createdTask.members.length).toBe(sampleMembers.length)
     })