Merge pull request #636 from codex-team/feat/events-assignee-filter

feat(events): enhance assignee filtering with sentinel values for una…

Author: Dobrunia

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {

src/models/eventsFactory.js

@@ -340,7 +340,7 @@ class EventsFactory extends Factory {
       ? Object.fromEntries(
         Object
           .entries(filters)
-          .filter(([mark]) => markFilters.includes(mark))
+          .filter(([ mark ]) => markFilters.includes(mark))
           .map(([mark, exists]) => [`event.marks.${mark}`, { $exists: exists } ])
       )
       : {};
@@ -364,9 +364,43 @@ class EventsFactory extends Factory {
       }
       : {};
 
-    const assigneeFilter = assignee
-      ? { 'event.assignee': String(assignee) }
-      : {};
+    /**
+     * Sentinel values from garage assignee filter (not user ids)
+     */
+    const FILTER_UNASSIGNED = '__filter_unassigned__';
+    const FILTER_ANY_ASSIGNEE = '__filter_any_assignee__';
+
+    const assigneeFilter = (() => {
+      if (!assignee) {
+        return {};
+      }
+      if (assignee === FILTER_UNASSIGNED) {
+        /**
+         * Use $and so this does not collide with searchFilter’s top-level $or in $match spread
+         */
+        return {
+          $and: [
+            {
+              $or: [
+                { 'event.assignee': { $exists: false } },
+                { 'event.assignee': null },
+                { 'event.assignee': '' },
+              ],
+            },
+          ],
+        };
+      }
+      if (assignee === FILTER_ANY_ASSIGNEE) {
+        return {
+          'event.assignee': {
+            $exists: true,
+            $nin: [null, ''],
+          },
+        };
+      }
+
+      return { 'event.assignee': String(assignee) };
+    })();
 
     pipeline.push(
       /**

src/typeDefs/project.ts

@@ -353,7 +353,7 @@ type Project {
     release: String
 
     """
-    User id to filter events by assignee
+    Filter by assignee: workspace user id, or sentinels __filter_unassigned__ (no assignee) / __filter_any_assignee__ (has assignee)
     """
     assignee: ID
   ): DailyEventsPortion

test/resolvers/project-daily-events-portion.test.ts

@@ -55,6 +55,38 @@ describe('Project resolver dailyEventsPortion', () => {
     );
   });
 
+  it('should pass assignee sentinel for unassigned filter to factory', async () => {
+    const findDailyEventsPortion = jest.fn().mockResolvedValue({
+      nextCursor: null,
+      dailyEvents: [],
+    });
+    (getEventsFactory as unknown as jest.Mock).mockReturnValue({
+      findDailyEventsPortion,
+    });
+
+    const project = { _id: 'project-1' };
+    const args = {
+      limit: 50,
+      nextCursor: null,
+      sort: 'BY_DATE',
+      filters: {},
+      search: '',
+      assignee: '__filter_unassigned__',
+    };
+
+    await projectResolver.Project.dailyEventsPortion(project, args, {});
+
+    expect(findDailyEventsPortion).toHaveBeenCalledWith(
+      50,
+      null,
+      'BY_DATE',
+      {},
+      '',
+      undefined,
+      '__filter_unassigned__'
+    );
+  });
+
   it('should keep old call shape when assignee is not provided', async () => {
     const findDailyEventsPortion = jest.fn().mockResolvedValue({
       nextCursor: null,