feat: simplify member api [CM-762] (#3564)

Author: ulemons

backend/src/services/member/memberOrganizationsService.ts

@@ -21,7 +21,7 @@ import SequelizeRepository from '@/database/repositories/sequelizeRepository'
 
 import { IServiceOptions } from '../IServiceOptions'
 
-type IOrganizationSummary = Pick<IOrganization, 'id' | 'displayName' | 'logo'>
+type IOrganizationSummary = Pick<IOrganization, 'id' | 'displayName' | 'logo' | 'createdAt'>
 
 export default class MemberOrganizationsService extends LoggerBase {
   options: IServiceOptions
@@ -64,7 +64,12 @@ export default class MemberOrganizationsService extends LoggerBase {
             in: orgIds,
           },
         },
-        fields: [OrganizationField.ID, OrganizationField.DISPLAY_NAME, OrganizationField.LOGO],
+        fields: [
+          OrganizationField.ID,
+          OrganizationField.DISPLAY_NAME,
+          OrganizationField.LOGO,
+          OrganizationField.CREATED_AT,
+        ],
       })
     }
 
@@ -84,15 +89,64 @@ export default class MemberOrganizationsService extends LoggerBase {
       {},
     )
 
-    // Format the results
-    return memberOrganizations.map((mo) => ({
-      ...(orgByid[mo.organizationId] || {}),
-      id: mo.organizationId,
-      memberOrganizations: {
-        ...mo,
-        affiliationOverride: affiliationOverrides.find((ao) => ao.memberOrganizationId === mo.id),
-      },
-    }))
+    // Format the results and order by dateStart and dateEnd
+    const allOrganizations = memberOrganizations
+      .filter((mo) => orgByid[mo.organizationId]) // Only include non-deleted organizations
+      .map((mo) => ({
+        ...(orgByid[mo.organizationId] || {}),
+        id: mo.organizationId,
+        memberOrganizations: {
+          ...mo,
+          affiliationOverride: affiliationOverrides.find((ao) => ao.memberOrganizationId === mo.id),
+        },
+      }))
+      .sort((a, b) => {
+        if (!a || !b) {
+          return 0
+        }
+
+        // Sort by dateStart (newest first), then by dateEnd (active first - null dateEnd comes first)
+        const aDateStart = a.memberOrganizations.dateStart
+          ? new Date(a.memberOrganizations.dateStart).getTime()
+          : 0
+        const bDateStart = b.memberOrganizations.dateStart
+          ? new Date(b.memberOrganizations.dateStart).getTime()
+          : 0
+
+        if (aDateStart !== bDateStart) {
+          return bDateStart - aDateStart // Newest dateStart first
+        }
+
+        // If dateStart is the same, prioritize active memberships (null dateEnd)
+        const aDateEnd = a.memberOrganizations.dateEnd
+        const bDateEnd = b.memberOrganizations.dateEnd
+
+        if (!aDateEnd && bDateEnd) return -1 // a is active, b is not
+        if (aDateEnd && !bDateEnd) return 1 // b is active, a is not
+
+        // Both have null dateEnd and dateStart - sort by createdAt, then alphabetically
+        if (!aDateEnd && !bDateEnd && aDateStart === 0 && bDateStart === 0) {
+          // First try to sort by createdAt
+          const aCreatedAt = a.createdAt ? new Date(a.createdAt).getTime() : 0
+          const bCreatedAt = b.createdAt ? new Date(b.createdAt).getTime() : 0
+
+          if (aCreatedAt !== bCreatedAt) {
+            return bCreatedAt - aCreatedAt // Newest createdAt first
+          }
+
+          // If createdAt is also the same, sort alphabetically by displayName
+          const aName = (a.displayName || '').toLowerCase()
+          const bName = (b.displayName || '').toLowerCase()
+          return aName.localeCompare(bName)
+        }
+
+        if (!aDateEnd && !bDateEnd) return 0 // both are active with same dateStart
+
+        // Both have dateEnd, sort by dateEnd (newest first)
+        return new Date(bDateEnd).getTime() - new Date(aDateEnd).getTime()
+      })
+
+    return allOrganizations
   }
 
   // Member organization creation

frontend/src/modules/contributor/helpers/contributor.helpers.ts

@@ -1,8 +1,8 @@
-import { MemberIdentity } from '@/modules/member/types/Member';
-import memberOrder from '@/shared/modules/identities/config/identitiesOrder/member';
-import { Contributor } from '@/modules/contributor/types/Contributor';
 import { lfIdentities } from '@/config/identities';
+import { Contributor } from '@/modules/contributor/types/Contributor';
+import { MemberIdentity } from '@/modules/member/types/Member';
 import { dateHelper } from '@/shared/date-helper/date-helper';
+import memberOrder from '@/shared/modules/identities/config/identitiesOrder/member';
 
 const useContributorHelpers = () => {
   const avatar = (contributor: Contributor) => contributor.attributes?.avatarUrl?.default;
@@ -66,15 +66,7 @@ const useContributorHelpers = () => {
     }));
   };
 
-  const activeOrganization = (contributor: Contributor) => {
-    const { organizations } = contributor;
-
-    return organizations.find((org) => org.memberOrganizations.affiliationOverride?.isPrimaryWorkExperience
-      && !!org.memberOrganizations.dateStart
-      && !org.memberOrganizations.dateEnd)
-      || organizations.find((org) => !!org.memberOrganizations.dateStart && !org.memberOrganizations.dateEnd)
-      || organizations.find((org) => !org.memberOrganizations.dateStart && !org.memberOrganizations.dateEnd) || null;
-  };
+  const activeOrganization = (contributor: Contributor) => contributor.organizations;
 
   return {
     avatar,