Debugging

CrowdDotDev · Oct 28, 2024 · b355721 · b355721
1 parent 14b3e83
commit b355721
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/backend/src/database/repositories/dataQualityRepository.ts b/backend/src/database/repositories/dataQualityRepository.ts
@@ -1,10 +1,11 @@
 import {
+  fetchMembersWithConflictingWorkExperiences,
   fetchMembersWithMissingInfoOnWorkExperience,
   fetchMembersWithMissingPeriodOnWorkExperience,
   fetchMembersWithTooManyEmails,
   fetchMembersWithTooManyIdentities,
   fetchMembersWithTooManyIdentitiesPerPlatform,
-  fetchMembersWithoutWorkExperience, fetchMembersWithConflictingWorkExperiences,
+  fetchMembersWithoutWorkExperience,
 } from '@crowd/data-access-layer/src/data-quality'
 
 import SequelizeRepository from '@/database/repositories/sequelizeRepository'
@@ -140,7 +141,6 @@ class DataQualityRepository {
     return fetchMembersWithMissingPeriodOnWorkExperience(qx, tenantId, limit, offset, segmentId)
   }
 
-
   /**
    * Finds members with conflicting work experience based on specified options.
    *

diff --git a/services/libs/data-access-layer/src/data-quality/members.ts b/services/libs/data-access-layer/src/data-quality/members.ts
@@ -312,15 +312,17 @@ export async function fetchMembersWithConflictingWorkExperiences(
             msa."activityCount",
             COUNT(mo1.id) AS "organizationsCount"
         FROM "members" m
-                 JOIN "memberOrganizations" mo1 ON m.id = mo1."memberId" AND mo1."deletedAt" IS NULL
-                 INNER JOIN "memberSegmentsAgg" msa ON m.id = msa."memberId" AND msa."segmentId" = '${segmentId}'
-                 JOIN "memberOrganizations" mo2 ON mo1."memberId" = mo2."memberId"
-            AND mo1."organizationId" = mo2."organizationId"
-            AND mo1.id != mo2.id
-            AND mo1."dateStart" <= COALESCE(mo2."dateEnd", 'infinity'::timestamp)
-            AND COALESCE(mo1."dateEnd", 'infinity'::timestamp) >= mo2."dateStart"
+                JOIN "memberOrganizations" mo1 ON m.id = mo1."memberId" AND mo1."deletedAt" IS NULL
+                INNER JOIN "memberSegmentsAgg" msa ON m.id = msa."memberId" AND msa."segmentId" = '${segmentId}'
+                JOIN "memberOrganizations" mo2 ON mo1."memberId" = mo2."memberId"
+                AND mo1.id != mo2.id
+                AND (
+                   (mo1."dateStart" <= COALESCE(mo2."dateEnd", 'infinity'::timestamp)
+                       AND COALESCE(mo1."dateEnd", 'infinity'::timestamp) >= mo2."dateStart") OR
+                   (mo2."dateStart" <= COALESCE(mo1."dateEnd", 'infinity'::timestamp)
+                       AND COALESCE(mo2."dateEnd", 'infinity'::timestamp) >= mo1."dateStart")
+               )
         WHERE m."tenantId" = '${tenantId}'
-          AND COALESCE((m.attributes -> 'isBot' ->> 'default')::BOOLEAN, FALSE) = FALSE
         GROUP BY m.id, msa."activityCount"
         ORDER BY msa."activityCount" DESC
         LIMIT ${limit} OFFSET ${offset};