new type for chart data

Author: pavelzotikov

src/models/eventsFactory.js

@@ -466,29 +466,54 @@ class EventsFactory extends Factory {
       const hasRateLimited = Array.isArray(rateLimitedSeries) && rateLimitedSeries.length > 0;
 
       if (hasAccepted || hasRateLimited) {
-        return {
-          accepted: acceptedSeries,
-          rateLimited: hasRateLimited
-            ? rateLimitedSeries
-            : this._composeZeroSeries(acceptedSeries),
-        };
+        let normalizedAccepted = acceptedSeries;
+
+        if (!hasAccepted && hasRateLimited) {
+          normalizedAccepted = this._composeZeroSeries(rateLimitedSeries);
+        }
+
+        const normalizedRateLimited = hasRateLimited
+          ? rateLimitedSeries
+          : this._composeZeroSeries(normalizedAccepted);
+
+        const series = [
+          {
+            label: 'accepted',
+            data: normalizedAccepted,
+          },
+        ];
+
+        if (normalizedRateLimited.length > 0) {
+          series.push({
+            label: 'rate-limited',
+            data: normalizedRateLimited,
+          });
+        }
+
+        return series;
       }
 
       // Fallback to Mongo (empty groupHash for project-level data)
       const fallbackAccepted = await this.findChartData(days, timezoneOffset, '');
 
-      return {
-        accepted: fallbackAccepted,
-      };
+      return [
+        {
+          label: 'accepted',
+          data: fallbackAccepted,
+        },
+      ];
     } catch (err) {
       console.error('[EventsFactory] getProjectChartData error:', err);
 
       // Fallback to Mongo on error (empty groupHash for project-level data)
       const fallbackAccepted = await this.findChartData(days, timezoneOffset, '');
 
-      return {
-        accepted: fallbackAccepted,
-      };
+      return [
+        {
+          label: 'accepted',
+          data: fallbackAccepted,
+        },
+      ];
     }
   }
 

src/typeDefs/chart.ts

@@ -14,17 +14,17 @@ export default gql`
   }
 
   """
-  Project chart data split by metric type
+  Chart line definition
   """
-  type ProjectChartSeries {
+  type ChartLine {
     """
-    Accepted events (successfully processed)
+    Series label (e.g., events-accepted)
     """
-    accepted: [ChartDataItem!]!
+    label: String!
 
     """
-    Events rejected due to rate limiting
+    Data points for the series
     """
-    rateLimited: [ChartDataItem!]
+    data: [ChartDataItem!]!
   }
 `;

src/typeDefs/project.ts

@@ -372,7 +372,7 @@ type Project {
     User's local timezone offset in minutes
     """
     timezoneOffset: Int! = 0
-  ): ProjectChartSeries
+  ): [ChartLine!]!
   """
   Returns number of unread events
   """