checking deletedAt when finding mutually exclusive org members in merging

epipav · epipav · commit 3cb5b3f76fe5 · 2023-10-23T13:52:25.000+02:00
diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
@@ -1788,6 +1788,7 @@ class OrganizationRepository {
             SELECT "memberId" 
             FROM "memberOrganizations" 
             WHERE "organizationId" = :toOrganizationId
+            AND "deletedAt" IS NULL
         );
       `,
       {

Original file line number	Diff line number	Diff line change
`@@ -1788,6 +1788,7 @@ class OrganizationRepository {`
`1788`	`1788`	`SELECT "memberId"`
`1789`	`1789`	`FROM "memberOrganizations"`
`1790`	`1790`	`WHERE "organizationId" = :toOrganizationId`
	`1791`	`+ AND "deletedAt" IS NULL`
`1791`	`1792`	`);`
`1792`	`1793`	`,
`1793`	`1794`	`{`