Add support for date range and marks filtering in recentEvents

Author: pavelzotikov

.gitignore

@@ -7,3 +7,4 @@ uploads
 globalConfig.json
 coverage
 tls
+.history

src/models/eventsFactory.js

@@ -149,8 +149,11 @@ class EventsFactory extends Factory {
    * @param {Number} limit - events count limitations
    * @param {Number} skip - certain number of documents to skip
    * @param {'BY_DATE' | 'BY_COUNT'} sort - events sort order
-   * @param {EventsFilters} filters - marks by which events should be filtered
-   * @param {String} search - Search query
+   * @param {Object} filters - filter object
+   * @param {Object.<string, boolean>} [filters.marks] - mark filters: e.g. { starred: true, ignored: false }
+   * @param {string|number} [filters.dateFrom] - filter start date (ISO or timestamp)
+   * @param {string|number} [filters.dateTo] - filter end date (ISO or timestamp)
+   * @param {String} search - search query
    *
    * @return {RecentEventSchema[]}
    */
@@ -165,9 +168,6 @@ class EventsFactory extends Factory {
       throw new Error('Search parameter must be a string');
     }
 
-    /**
-     * Check if pattern is safe RegExp
-     */
     if (!safe(search)) {
       throw new Error('Invalid regular expression pattern');
     }
@@ -231,13 +231,41 @@ class EventsFactory extends Factory {
       }
       : {};
 
-    const matchFilter = filters
-      ? Object.fromEntries(
-        Object
-          .entries(filters)
-          .map(([mark, exists]) => [`event.marks.${mark}`, { $exists: exists } ])
-      )
-      : {};
+    const matchFilter = {
+      ...searchFilter,
+    };
+
+    // Filter by marks (event.marks.{key})
+    if (filters.marks && typeof filters.marks === 'object') {
+      for (const [mark, exists] of Object.entries(filters.marks)) {
+        matchFilter[`event.marks.${mark}`] = { $exists: exists };
+      }
+    }
+
+    // Filter by date (groupingTimestamp)
+    if (filters.dateFrom || filters.dateTo) {
+      matchFilter.groupingTimestamp = {};
+
+      if (filters.dateFrom) {
+        const from = typeof filters.dateFrom === 'string'
+          ? Math.floor(new Date(filters.dateFrom).getTime() / 1000)
+          : filters.dateFrom;
+
+        matchFilter.groupingTimestamp.$gte = from;
+      }
+
+      if (filters.dateTo) {
+        const to = typeof filters.dateTo === 'string'
+          ? Math.floor(new Date(filters.dateTo).getTime() / 1000)
+          : filters.dateTo;
+
+        matchFilter.groupingTimestamp.$lte = to;
+      }
+
+      if (Object.keys(matchFilter.groupingTimestamp).length === 0) {
+        delete matchFilter.groupingTimestamp;
+      }
+    }
 
     pipeline.push(
       {
@@ -252,10 +280,7 @@ class EventsFactory extends Factory {
         $unwind: '$event',
       },
       {
-        $match: {
-          ...matchFilter,
-          ...searchFilter,
-        },
+        $match: matchFilter,
       },
       { $skip: skip },
       { $limit: limit },
@@ -272,17 +297,8 @@ class EventsFactory extends Factory {
     );
 
     const cursor = this.getCollection(this.TYPES.DAILY_EVENTS).aggregate(pipeline);
-
     const result = (await cursor.toArray()).shift();
 
-    /**
-     * aggregation can return empty array so that
-     * result can be undefined
-     *
-     * for that we check result existence
-     *
-     * extra field `projectId` needs to satisfy GraphQL query
-     */
     if (result && result.events) {
       result.events.forEach(event => {
         event.projectId = this.projectId;

src/typeDefs/project.ts

@@ -16,16 +16,32 @@ Events filters input type
 """
 input EventsFiltersInput {
   """
-  If True, includes events with resolved mark to the output
+  Filter events by marks (e.g. starred, resolved, ignored).
+  Set to true to include only events that have the mark, or false to exclude those.
+  Example: { starred: true, ignored: false }
   """
-  resolved: Boolean
+  marks: MarksFilterInput
+
   """
-  If True, includes events with starred mark to the output
+  Include only events that occurred after this date (inclusive).
+  Accepts ISO date string or Unix timestamp (in seconds).
   """
-  starred: Boolean
+  dateFrom: Timestamp
+
   """
-  If True, includes events with ignored mark to the output
+  Include only events that occurred before this date (inclusive).
+  Accepts ISO date string or Unix timestamp (in seconds).
   """
+  dateTo: Timestamp
+}
+
+"""
+Allows filtering by specific event marks.
+Each field corresponds to event.marks.{name}.
+"""
+input MarksFilterInput {
+  starred: Boolean
+  resolved: Boolean
   ignored: Boolean
 }
 
@@ -122,12 +138,17 @@ type Project {
     "Events sort order"
     sort: EventsSortOrder = lastRepetitionTime
 
-    "Event marks by which events should be sorted"
+    """
+    Filters for narrowing down the event results:
+    - By marks (e.g., starred, resolved)
+    - By date range (dateFrom / dateTo)
+    """
     filters: EventsFiltersInput
 
     "Search query"
     search: String
   ): RecentEvents
+  
   """
   Return events that occurred after a certain timestamp
   """