fix: resolve pr review comments

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

Author: skwowet

backend/src/services/activityService.ts

@@ -10,7 +10,6 @@ import SequelizeRepository from '@/database/repositories/sequelizeRepository'
 import { getDataSinkWorkerEmitter } from '@/serverless/utils/queueService'
 
 import ActivityRepository from '../database/repositories/activityRepository'
-import SegmentRepository from '../database/repositories/segmentRepository'
 import {
   UsernameIdentities,
   mapUsernameToIdentities,
@@ -122,9 +121,9 @@ export default class ActivityService extends LoggerBase {
     const qx = SequelizeRepository.getQueryExecutor(this.options)
     const currentSegments = SequelizeRepository.getSegmentIds(this.options)
 
-    const subprojectIds = await getSegmentSubprojectIds(qx, currentSegments)
+    const subprojects = await getSegmentSubprojects(qx, currentSegments)
 
-    if (subprojectIds.length === 0) {
+    if (subprojects.length === 0) {
       return {
         count: 0,
         rows: [],
@@ -133,11 +132,11 @@ export default class ActivityService extends LoggerBase {
       }
     }
 
-    const activitiyTypes = SegmentRepository.getActivityTypes(this.options)
+    const activitiyTypes = SegmentService.getTenantActivityTypes(subprojects)
 
     const page = await queryActivities(
       {
-        segmentIds: subprojectIds,
+        segmentIds: subprojects.map((s) => s.id),
         filter,
         orderBy,
         limit,

backend/src/services/segmentService.ts

@@ -555,8 +555,12 @@ export default class SegmentService extends LoggerBase {
   }
 
   static getTenantActivityTypes(
-    subprojects: Array<SegmentData | SegmentRawData>,
+    subprojects?: Array<SegmentData | SegmentRawData> | null,
   ): ActivityTypeSettings {
+    if (!subprojects?.length) {
+      return { custom: {}, default: {} }
+    }
+
     return subprojects.reduce(
       (acc: ActivityTypeSettings, subproject) => {
         const activityTypes = buildSegmentActivityTypes(subproject as SegmentRawData)

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

@@ -193,7 +193,7 @@ export async function getSegmentSubprojects(
           "grandparentSlug"
         from input_segment
       )
-        select s.*
+        select distinct s.*
         from segments s
         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" = sl."parentSlug")