fix: resolve pr review comments

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

Author: skwowet

backend/src/middlewares/segmentMiddleware.ts

@@ -9,17 +9,14 @@ export async function segmentMiddleware(req: Request, _res: Response, next: Next
     const options = req as unknown as IRepositoryOptions
     const segmentRepository = new SegmentRepository(options)
 
-    // Query parameters take precedence; request body acts as the fallback.
-    const rawSegments = req.query.segments ?? (req.body as Record<string, unknown>)?.segments
+    const querySegments = toStringArray(req.query.segments)
+    const bodySegments = toStringArray((req.body as Record<string, unknown>)?.segments)
 
-    // Express can parse segments as a single string or an array (?segments=a vs ?segments=a&segments=b).
-    // Normalize into a clean, flat array of non-empty strings.
-    const segmentIds = toStringArray(rawSegments)
+    const segmentIds = querySegments.length > 0 ? querySegments : bodySegments
 
     if (segmentIds.length > 0) {
       options.currentSegments = await segmentRepository.findInIds(segmentIds)
     } else {
-      // No segmentIds in the request — use the first subproject as the default
       const { rows } = await segmentRepository.querySubprojects({ limit: 1, offset: 0 })
       options.currentSegments = rows
     }

backend/src/services/activityService.ts

@@ -124,6 +124,15 @@ export default class ActivityService extends LoggerBase {
 
     const subprojectIds = await getSegmentSubprojectIds(qx, currentSegments)
 
+    if (subprojectIds.length === 0) {
+      return {
+        count: 0,
+        rows: [],
+        limit,
+        offset,
+      }
+    }
+
     const activitiyTypes = SegmentRepository.getActivityTypes(this.options)
 
     const page = await queryActivities(

backend/src/services/segmentService.ts

@@ -554,10 +554,12 @@ export default class SegmentService extends LoggerBase {
     return getSegmentSubprojects(qx, segments)
   }
 
-  static getTenantActivityTypes(subprojects: any): ActivityTypeSettings {
+  static getTenantActivityTypes(
+    subprojects: Array<SegmentData | SegmentRawData>,
+  ): ActivityTypeSettings {
     return subprojects.reduce(
       (acc: ActivityTypeSettings, subproject) => {
-        const activityTypes = buildSegmentActivityTypes(subproject)
+        const activityTypes = buildSegmentActivityTypes(subproject as SegmentRawData)
 
         return {
           custom: {

services/libs/data-access-layer/src/segments/index.ts

@@ -198,7 +198,8 @@ export async function getSegmentSubprojects(
         join segment_level sl on (sl.level = 'child' and s.id = sl.id)
             or (sl.level = 'parent' and s."parentSlug" = sl.slug and s."grandparentSlug" is not null)
             or (sl.level = 'grandparent' and s."grandparentSlug" = sl.slug)
-        where status = 'active';
+        where status = 'active'
+          and s."tenantId" = $(tenantId);
     `,
     {
       tenantId: DEFAULT_TENANT_ID,