perf: skip segment leaf expansion in organizationsToMerge query

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

backend/src/database/repositories/organizationRepository.ts

@@ -842,10 +842,9 @@ class OrganizationRepository {
     const HIGH_CONFIDENCE_LOWER_BOUND = 0.9
     const MEDIUM_CONFIDENCE_LOWER_BOUND = 0.7
 
-    const currentSegments = SequelizeRepository.getSegmentIds(options)
-    const segmentIds = (
-      await new SegmentRepository(options).getSegmentSubprojects(currentSegments)
-    ).map((s) => s.id)
+    // Organization segments are aggregated at each hierarchy level (group -> project -> subproject).
+    // Match the selected segment ID(s) directly; do not expand to leaf subprojects.
+    const segmentIds = SequelizeRepository.getSegmentIds(options)
 
     let similarityFilter = ''
     const similarityConditions = []

frontend/src/modules/data-quality/components/member/data-quality-member-merge-suggestions.vue

@@ -84,20 +84,8 @@ const detailsOffset = ref<number>(0);
 const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
 
 const segments = computed(() => (selectedProjectGroup.value?.id === props.projectGroup
-  ? [
-    selectedProjectGroup.value?.id,
-    ...selectedProjectGroup.value.projects.map((p) => [
-      ...p.subprojects.map((sp) => sp.id),
-    ]).flat(),
-  ]
-  : [
-    props.projectGroup,
-    ...selectedProjectGroup.value.projects
-      .filter((p) => p.id === props.projectGroup)
-      .map((p) => [
-        ...p.subprojects.map((sp) => sp.id),
-      ]).flat(),
-  ]));
+  ? [selectedProjectGroup.value?.id]
+  : [props.projectGroup]));
 
 const loadMergeSuggestions = () => {
   loading.value = true;

frontend/src/modules/data-quality/components/organization/data-quality-organization-merge-suggestions.vue

@@ -78,20 +78,8 @@ const detailsOffset = ref<number>(0);
 const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
 
 const segments = computed(() => (selectedProjectGroup.value?.id === props.projectGroup
-  ? [
-    selectedProjectGroup.value?.id,
-    ...selectedProjectGroup.value.projects.map((p) => [
-      ...p.subprojects.map((sp) => sp.id),
-    ]).flat(),
-  ]
-  : [
-    props.projectGroup,
-    ...selectedProjectGroup.value.projects
-      .filter((p) => p.id === props.projectGroup)
-      .map((p) => [
-        ...p.subprojects.map((sp) => sp.id),
-      ]).flat(),
-  ]));
+  ? [selectedProjectGroup.value?.id]
+  : [props.projectGroup]));
 
 const loadMergeSuggestions = () => {
   loading.value = true;

frontend/src/modules/organization/organization-service.js

@@ -1,7 +1,6 @@
 import authAxios from '@/shared/axios/auth-axios';
 import { AuthService } from '@/modules/auth/services/auth.service'; import { storeToRefs } from 'pinia';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
-import { getSegmentsFromProjectGroup } from '@/utils/segments';
 
 const getSelectedProjectGroup = () => {
   const lsSegmentsStore = useLfSegmentsStore();
@@ -216,10 +215,7 @@ export class OrganizationService {
   }
 
   static async fetchMergeSuggestions(limit, offset, query) {
-    const segments = [
-      ...getSegmentsFromProjectGroup(getSelectedProjectGroup()),
-      getSelectedProjectGroup().id,
-    ];
+    const segments = [getSelectedProjectGroup().id];
 
     const data = {
       limit,

frontend/src/modules/organization/services/organization.api.service.ts

@@ -1,6 +1,5 @@
 import authAxios from '@/shared/axios/auth-axios';
 import { Organization } from '@/modules/organization/types/Organization';
-import { getSegmentsFromProjectGroup } from '@/utils/segments';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import { storeToRefs } from 'pinia';
 
@@ -33,10 +32,7 @@ export class OrganizationApiService {
     const lsSegmentsStore = useLfSegmentsStore();
     const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
 
-    const segments = [
-      ...getSegmentsFromProjectGroup(selectedProjectGroup.value),
-      selectedProjectGroup.value?.id,
-    ];
+    const segments = [selectedProjectGroup.value?.id];
 
     const data = {
       limit,