🚧 progress: Squash.

infoderm · Jun 4, 2024 · a4392da · a4392da
1 parent 700684c
commit a4392da
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/imports/api/query/watch.ts b/imports/api/query/watch.ts
@@ -40,14 +40,20 @@ const _watchInit = async <T extends Document, U = T>(
 		sessionOptions,
 	);
 
-const _filterToMatch = <T>(filter: Filter<T>) =>
+const _filterToFullDocumentFilter = <T>(filter: Filter<T>) =>
 	Object.fromEntries(
 		Object.entries(filter).map(([key, value]) => [
 			key.startsWith('$') ? key : `fullDocument.${key}`,
-			isObject(value) ? _filterToMatch(value as Filter<T>) : value,
+			isObject(value) ? _filterToFullDocumentFilter(value as Filter<T>) : value,
 		]),
 	);
 
+const _filterToMatch = <T>(filter: Filter<T>) => ({
+	$match: {
+		$and: _filterToFullDocumentFilter(filter),
+	},
+});
+
 const _filterToPipeline = <T>({$text, ...rest}: Filter<T>) => {
 	return {
 		pipeline: [_filterToMatch(rest as Filter<T>)].filter(Boolean),