fix: getAssemblyMembers to handle multiple roles (#108)

wevisdemo · Sep 25, 2024 · 6b4ccb6 · 6b4ccb6
1 parent 90fa7f7
commit 6b4ccb6
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/lib/datasheets/assembly-member.ts b/src/lib/datasheets/assembly-member.ts
@@ -6,11 +6,21 @@ import type { ComponentProps } from 'svelte';
 
 export const getAssemblyMembers = (assembly: Assembly, politicians: Politician[]) =>
 	politicians
-		.map(({ assemblyRoles, ...rest }) => ({
-			...rest,
-			assemblyRole: assemblyRoles.find(({ assembly: a }) => a.id === assembly.id)
-		}))
-		.filter(({ assemblyRole }) => assemblyRole)
+		.map(({ assemblyRoles, ...rest }) => {
+			const filteredAssemblyRoles = assemblyRoles.filter(({ assembly: a }) => a.id === assembly.id);
+			return {
+				...rest,
+				assemblyRoles: filteredAssemblyRoles
+			};
+		})
+		.filter(({ assemblyRoles }) => assemblyRoles.length > 0)
+		.map(({ assemblyRoles, ...rest }) =>
+			assemblyRoles.map((assemblyRole) => ({
+				...rest,
+				assemblyRole
+			}))
+		)
+		.flat()
 		.map(({ partyRoles, ...rest }) => {
 			const partyRole = partyRoles
 				.filter(({ startedAt }) => !assembly.endedAt || dayjs(startedAt).isBefore(assembly.endedAt))