fix: reverd useless changes

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

backend/src/api/member/memberExport.ts

@@ -32,7 +32,7 @@ export default async (req, res) => {
     args: [
       {
         tenantId: req.currentTenant.id,
-        segmentIds: req.currentSegments.map((s: any) => s.id),
+        segmentIds: req.body.segments,
         criteria: req.body,
         sendTo: [req.currentUser.email],
       } as ITriggerCSVExport,

backend/src/api/organization/organizationExport.ts

@@ -32,7 +32,7 @@ export default async (req, res) => {
     args: [
       {
         tenantId: req.currentTenant.id,
-        segmentIds: req.currentSegments.map((s: any) => s.id),
+        segmentIds: req.body.segments,
         criteria: req.body,
         sendTo: [req.currentUser.email],
       } as ITriggerCSVExport,

backend/src/api/segment/index.ts

@@ -1,5 +1,4 @@
 import { safeWrap } from '../../middlewares/errorMiddleware'
-import { segmentByIdMiddleware } from '../../middlewares/segmentMiddleware'
 
 export default (app) => {
   app.post(`/segment/projectGroup`, safeWrap(require('./segmentCreateProjectGroup').default))
@@ -21,14 +20,9 @@ export default (app) => {
     safeWrap(require('./segmentSubprojectQueryLite').default),
   )
 
-  // get/update segment by id — segmentByIdMiddleware overrides currentSegments with the target
-  // segment so that permission checks validate against the actual resource being accessed
-  app.get(`/segment/:segmentId`, segmentByIdMiddleware, safeWrap(require('./segmentFind').default))
-  app.put(
-    `/segment/:segmentId`,
-    segmentByIdMiddleware,
-    safeWrap(require('./segmentUpdate').default),
-  )
+  // get segment by id
+  app.get(`/segment/:segmentId`, safeWrap(require('./segmentFind').default))
+  app.put(`/segment/:segmentId`, safeWrap(require('./segmentUpdate').default))
   // Multiple ids
   app.post(`/segment/id`, safeWrap(require('./segmentByIds').default))
 }

backend/src/middlewares/segmentMiddleware.ts

@@ -11,30 +11,6 @@ import SegmentRepository from '../database/repositories/segmentRepository'
 
 const log = getServiceChildLogger('segmentMiddleware')
 
-/**
- * Route-specific middleware for endpoints with :segmentId param (e.g. PUT/GET /segment/:segmentId).
- *
- * The global segmentMiddleware runs via app.use() before Express matches routes, so req.params
- * is never populated there. This middleware is registered directly on the route handler, where
- * Express has already resolved :segmentId, and overrides req.currentSegments with the leaf
- * segments of the target segment so that permission checks validate against the actual resource
- * being accessed rather than whatever segments the caller chose to include in body/query.
- */
-export async function segmentByIdMiddleware(req: Request, _res: Response, next: NextFunction) {
-  try {
-    const segmentId = req.params.segmentId
-    if (segmentId) {
-      const segmentRepository = new SegmentRepository(req as unknown as IRepositoryOptions)
-      const resolved = await resolveToLeafSegments(segmentRepository, [segmentId], req)
-      const options = req as unknown as IRepositoryOptions
-      options.currentSegments = resolved
-    }
-    next()
-  } catch (error) {
-    next(error)
-  }
-}
-
 export async function segmentMiddleware(req: Request, _res: Response, next: NextFunction) {
   try {
     let segments: any = null

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

@@ -16,10 +16,10 @@ import { QueryOptions } from '../utils'
 export interface ICreateCollection {
   categoryId: string
   color?: string | null
-  description?: string | null
+  description?: string
   imageUrl?: string | null
   name: string
-  slug?: string | null
+  slug?: string
   starred: boolean
   isPrivate?: boolean
   ssoUserId?: string | null
@@ -139,12 +139,12 @@ export async function createCollection(
   collection: ICreateCollection,
 ): Promise<ICollection> {
   const data = {
+    description: null,
+    slug: null,
+    logoUrl: null,
+    imageUrl: null,
+    color: null,
     ...collection,
-    description: collection.description ?? null,
-    slug: collection.slug ?? null,
-    logoUrl: collection.logoUrl ?? null,
-    imageUrl: collection.imageUrl ?? null,
-    color: collection.color ?? null,
   }
   return qx.selectOne(
     `