FR-239 stream filtering (#447)

* stream filtering added * streamName filter query added --------- Co-authored-by: plehocky <[email protected]>
FRINXio · Jul 17, 2024 · e1314c8 · e1314c8
1 parent 8cd726a
commit e1314c8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -33,7 +33,7 @@ type TopologyConfigEnabled = {
   topologyEnabled: true;
   topologyDiscoveryURL: string;
   topologyDiscoveryGraphqlURL: string;
-  performanceMonitoringGraphqlURL: string;
+  performanceMonitoringGraphqlURL: string | null;
 };
 
 type TopologyConfigDisabled = {
@@ -66,9 +66,9 @@ function getTopologyConfig(): TopologyConfig {
     };
   }
 
-  if (!topologyDiscoveryURL || !topologyDiscoveryGraphqlURL || !performanceMonitoringGraphqlURL) {
+  if (!topologyDiscoveryURL || !topologyDiscoveryGraphqlURL) {
     throw new Error(
-      'Not all mandatory topology discovery url (TOPOLOGY_DISCOVERY_API_URL, TOPOLOGY_DISCOVERY_GRAPHQL_API_URL, PERFORMANCE_MONITORING_GRAPHQL_API_URL) were found.',
+      'Not all mandatory topology discovery url (TOPOLOGY_DISCOVERY_API_URL, TOPOLOGY_DISCOVERY_GRAPHQL_API_URL) were found.',
     );
   }
 

diff --git a/src/external-api/performance-monitoring-graphql.ts b/src/external-api/performance-monitoring-graphql.ts
@@ -62,6 +62,9 @@ function getPerformanceMonitoringAPI() {
       return undefined;
     }
   }
+  if (!config.performanceMonitoringGraphqlURL) {
+    return undefined;
+  }
   const client = new GraphQLClient(config.performanceMonitoringGraphqlURL);
 
   async function getDeviceCpuUsage(deviceName: string): Promise<CurrentCpuUsageQuery> {

diff --git a/src/helpers/stream-helpers.ts b/src/helpers/stream-helpers.ts
@@ -51,3 +51,7 @@ export function getMountParamsForStream(mountParameters: JsonValue, streamParame
     },
   };
 }
+
+export function getStreamNameQuery(streamName?: string | null): Record<string, unknown> | undefined {
+  return streamName ? { contains: streamName, mode: 'insensitive' } : undefined;
+}
diff --git a/src/schema/api.graphql b/src/schema/api.graphql
@@ -340,6 +340,8 @@ input FilterLabelsInput {
 }
 
 input FilterStreamsInput {
+  deviceName: String
+  labels: [String!]
   streamName: String
 }
 

diff --git a/src/schema/nexus-typegen.ts b/src/schema/nexus-typegen.ts
@@ -124,6 +124,8 @@ export interface NexusGenInputs {
   };
   FilterStreamsInput: {
     // input type
+    deviceName?: string | null; // String
+    labels?: string[] | null; // [String!]
     streamName?: string | null; // String
   };
   FilterTopologyInput: {

diff --git a/src/schema/stream.ts b/src/schema/stream.ts
@@ -10,7 +10,7 @@ import {
   installDeviceCache,
   uninstallDeviceCache,
 } from '../external-api/uniconfig-cache';
-import { getMountParamsForStream, getUniconfigStreamName } from '../helpers/stream-helpers';
+import { getMountParamsForStream, getStreamNameQuery, getUniconfigStreamName } from '../helpers/stream-helpers';
 import config from '../config';
 import { Blueprint } from './blueprint';
 
@@ -92,7 +92,9 @@ export const StreamConnection = objectType({
 export const FilterStreamsInput = inputObjectType({
   name: 'FilterStreamsInput',
   definition: (t) => {
-    t.string('streamName', 'deviceName');
+    t.list.nonNull.string('labels');
+    t.string('deviceName');
+    t.string('streamName');
   },
 });
 export const SortStreamBy = enumType({
@@ -118,11 +120,26 @@ export const StreamQuery = extendType({
       },
       resolve: async (_, args, { prisma, tenantId }) => {
         const { filter, orderBy } = args;
-        const filterQuery = getFilterQuery({ deviceName: filter?.streamName });
+        const labels = filter?.labels ?? [];
+        const dbLabels = await prisma.label.findMany({ where: { name: { in: labels } } });
+        const labelIds = dbLabels.map((l) => l.id);
+        const filterQuery = getFilterQuery({ deviceName: filter?.deviceName, labelIds });
         const orderingArgs = getOrderingQuery(orderBy);
-        const baseArgs = { where: { tenantId, ...filterQuery } };
+        const baseArgs = { where: { tenantId } };
         const result = await findManyCursorConnection(
-          (paginationArgs) => prisma.stream.findMany({ ...baseArgs, ...orderingArgs, ...paginationArgs }),
+          (paginationArgs) =>
+            prisma.stream.findMany({
+              ...baseArgs,
+              ...orderingArgs,
+              ...paginationArgs,
+              include: {
+                device: true,
+              },
+              where: {
+                streamName: getStreamNameQuery(filter?.streamName),
+                device: filterQuery,
+              },
+            }),
           () => prisma.device.count(baseArgs),
           args,
         );