From a2eefbe0842a22762736de37773b243ef0b20d66 Mon Sep 17 00:00:00 2001
From: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Date: Fri, 3 Jul 2026 17:11:41 +0530
Subject: [PATCH] fix: deleting member fails when removing segments (CM-1312)

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
---
 backend/src/database/repositories/memberRepository.ts       | 4 ++++
 backend/src/database/repositories/organizationRepository.ts | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/backend/src/database/repositories/memberRepository.ts b/backend/src/database/repositories/memberRepository.ts
index e79fe35495..9fa32b2b41 100644
--- a/backend/src/database/repositories/memberRepository.ts
+++ b/backend/src/database/repositories/memberRepository.ts
@@ -244,6 +244,10 @@ class MemberRepository {
 
     const subprojectIds = await getSegmentSubprojectIds(qx, currentSegments)
 
+    if (subprojectIds.length === 0) {
+      return
+    }
+
     await seq.query(bulkDeleteMemberSegments, {
       replacements: {
         memberIds,
diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
index add23f6a41..9f6a50b28c 100644
--- a/backend/src/database/repositories/organizationRepository.ts
+++ b/backend/src/database/repositories/organizationRepository.ts
@@ -192,6 +192,10 @@ class OrganizationRepository {
     const qx = SequelizeRepository.getQueryExecutor(options)
     const subprojectIds = await getSegmentSubprojectIds(qx, currentSegments)
 
+    if (subprojectIds.length === 0) {
+      return
+    }
+
     await seq.query(bulkDeleteOrganizationSegments, {
       replacements: {
         organizationIds,