@event-driven-io/emmett-postgresql 0.43.0-beta.20 → 0.43.0-beta.21

package/dist/index.cjs

@@ -570,7 +570,7 @@ const pongoProjection = ({ name, kind, version, truncate, handle, canHandle, eve
 	} : void 0
 });
 const pongoMultiStreamProjection = (options) => {
-	const { collectionName, getDocumentId, canHandle } = options;
+	const { collectionName, getDocumentId, getDocumentIds, canHandle } = options;
 	const collectionNameWithVersion = options.version && options.version > 0 ? `${collectionName}_v${options.version}` : collectionName;
 	return pongoProjection({
 		name: collectionNameWithVersion,
@@ -579,12 +579,13 @@ const pongoMultiStreamProjection = (options) => {
 		eventsOptions: options.eventsOptions,
 		handle: async (events, { pongo }) => {
 			const collection = pongo.db().collection(collectionNameWithVersion, options.collectionOptions);
-			const eventsByDocumentId = events.map((event) => {
-				return {
-					documentId: getDocumentId(event),
+			const eventsByDocumentId = events.flatMap((event) => {
+				return (getDocumentId ? [getDocumentId(event)].filter((e) => e !== null) : getDocumentIds(event)).map((documentId) => ({
+					documentId,
 					event
-				};
+				}));
 			}).reduce((acc, { documentId, event }) => {
+				if (documentId === null) return acc;
 				if (!acc.has(documentId)) acc.set(documentId, []);
 				acc.get(documentId).push(event);
 				return acc;
@@ -628,11 +629,11 @@ const pongoMultiStreamProjection = (options) => {
 		}
 	});
 };
-const pongoSingleStreamProjection = (options) => {
+const pongoSingleStreamProjection = ({ getDocumentId, getDocumentIds, ...options }) => {
 	return pongoMultiStreamProjection({
-		...options,
 		kind: "emt:projections:postgresql:pongo:single_stream",
-		getDocumentId: options.getDocumentId ?? ((event) => event.metadata.streamName)
+		...options,
+		...getDocumentId ? { getDocumentId } : getDocumentIds ? { getDocumentIds } : { getDocumentId: (event) => event.metadata.streamName }
 	});
 };
 
@@ -1020,10 +1021,10 @@ const transactionToPostgreSQLProjectionHandlerContext = async (connectionString,
 });
 const handleProjections = async (options) => {
 	const { projections: allProjections, events, connection: { pool, transaction, connectionString }, partition = defaultTag } = options;
-	const eventTypes = events.map((e) => e.type);
-	const projections = allProjections.filter((p) => p.canHandle.some((type) => eventTypes.includes(type)));
 	const client = await transaction.connection.open();
-	for (const projection of projections) {
+	for (const projection of allProjections) {
+		const filteredEvents = events.filter(({ type }) => projection.canHandle.includes(type));
+		if (filteredEvents.length === 0) continue;
 		if (projection.name) {
 			if (!await postgreSQLProjectionLock({
 				projectionName: projection.name,
@@ -1031,7 +1032,7 @@ const handleProjections = async (options) => {
 				version: projection.version ?? 1
 			}).tryAcquire({ execute: transaction.execute })) continue;
 		}
-		await projection.handle(events, {
+		await projection.handle(filteredEvents, {
 			connection: {
 				connectionString,
 				pool,