fix: add safer default order

Author: ulemons

services/libs/data-access-layer/src/members/base.ts

@@ -184,7 +184,6 @@ export async function queryMembersAdvanced(
     { pgPromiseFormat: true },
   )
 
-  // Build queries
   const countQuery = buildCountQuery({
     withAggregates,
     searchConfig,
@@ -212,6 +211,9 @@ export async function queryMembersAdvanced(
       return { alias: f, ...mappedField }
     })
     .filter((mappedField) => mappedField.queryable !== false)
+    // Exclude fields from SELECT if their source table isn't joined:
+    // - skip msa.* when aggregates aren't included (no join with memberSegmentsAgg)
+    // - skip mo.* when member organizations aren't included (no join with member_orgs)
     .filter((mappedField) => {
       if (!withAggregates && mappedField.name.includes('msa.')) return false
       if (!include.memberOrganizations && mappedField.name.includes('mo.')) return false
@@ -233,7 +235,6 @@ export async function queryMembersAdvanced(
 
   log.info(`main query: ${mainQuery} with params ${JSON.stringify(params)}`)
 
-  // Execute queries in parallel
   const [rows, countResult] = await Promise.all([
     qx.select(mainQuery, params),
     qx.selectOne(countQuery, params),
@@ -253,7 +254,6 @@ export async function queryMembersAdvanced(
     include.maintainers ? findMaintainerRoles(qx, memberIds) : Promise.resolve([]),
   ])
 
-  // Second parallel batch - fetch related data
   const [orgExtra, segmentsInfo, maintainerSegmentsInfo] = await Promise.all([
     include.memberOrganizations
       ? fetchOrganizationData(qx, memberOrganizations)
@@ -264,8 +264,6 @@ export async function queryMembersAdvanced(
       : Promise.resolve([]),
   ])
 
-  // Data processing section
-
   if (include.memberOrganizations) {
     const { orgs = [], lfx = [] } = orgExtra
 
@@ -350,7 +348,6 @@ export async function queryMembersAdvanced(
   return { rows, count, limit, offset }
 }
 
-// ...existing code... (resto delle funzioni rimangono uguali)
 export async function queryMembers<T extends MemberField>(
   qx: QueryExecutor,
   opts: QueryOptions<T>,

services/libs/data-access-layer/src/members/queryBuilder.ts

@@ -103,13 +103,27 @@ const getOrderClause = (
   direction: OrderDirection,
   withAggregates: boolean,
 ): string => {
+  // Default sort:
+  // - when aggregates are included → sort by activityCount (from msa)
+  // - otherwise → sort by joinedAt (from members)
   const defaultOrder = withAggregates ? 'msa."activityCount" DESC' : 'm."joinedAt" DESC'
 
+  // If no specific order field is provided, use the default one
   if (!parsedField) return defaultOrder
 
   const fieldExpr = ORDER_FIELD_MAP[parsedField]
+
+  // If the requested field is not mapped, fall back to default order
   if (!fieldExpr) return defaultOrder
 
+  // Safety check:
+  // If the order field refers to msa.* but aggregates are not included,
+  // fallback to the default safe order instead of generating invalid SQL.
+  if (!withAggregates && fieldExpr.includes('msa.')) {
+    return defaultOrder
+  }
+
+  // Return the valid ORDER BY clause
   return `${fieldExpr} ${direction}`
 }
 
@@ -128,6 +142,7 @@ export const buildQuery = ({
   const { field: sortField, direction } = parseOrderBy(orderBy, fallbackDir)
 
   // Detect if filters reference extra aliases.
+  // TODO: capire che cosa sono questi mo. me.
   const filterHasMo = filterString.includes('mo.')
   const filterHasMe = filterString.includes('me.')
 
@@ -145,9 +160,6 @@ export const buildQuery = ({
   if (useActivityCountOptimized) {
     const ctes: string[] = []
 
-    // For optimized path:
-    // - We MAY include member_orgs CTE only if includeMemberOrgs is true.
-    // - But filterString is guaranteed not to reference mo/me here.
     if (includeMemberOrgs) {
       const memberOrgsCTE = buildMemberOrgsCTE(true)
       ctes.push(memberOrgsCTE.trim())