findById performance improvements

Author: epipav

backend/src/database/repositories/organizationRepository.ts

@@ -1152,21 +1152,19 @@ class OrganizationRepository {
     const query = `
     with leaf_segment_ids as (${segmentsSubQuery}),
     member_data as (select a."organizationId",
-        count(distinct m.id) filter ( where mo."dateEnd" is null )                  as "memberCount",
+        count(distinct a."memberId")                                                        as "memberCount",
         count(distinct a.id)                                                        as "activityCount",
         case
             when array_agg(distinct a.platform) = array [null] then array []::text[]
             else array_agg(distinct a.platform) end                                 as "activeOn",
         max(a.timestamp)                                                            as "lastActive",
         min(a.timestamp) filter ( where a.timestamp <> '1970-01-01T00:00:00.000Z' ) as "joinedAt"
     from leaf_segment_ids ls
-          left join activities a
+          join activities a
                     on a."segmentId" = ls.id and a."organizationId" = :id and
                       a."deletedAt" is null
-          left join members m on a."memberId" = m.id and m."deletedAt" is null
-          left join "memberOrganizations" mo
-                    on m.id = mo."memberId" and mo."organizationId" = :id
-          left join "memberIdentities" mi on m.id = mi."memberId"
+          join members m on a."memberId" = m.id and m."deletedAt" is null
+          join "memberOrganizations" mo on m.id = mo."memberId" and mo."organizationId" = :id and mo."dateEnd" is null
     group by a."organizationId"),
     organization_segments as (select "organizationId", array_agg("segmentId") as "segments"
           from "organizationSegments"