saved filter resolver tests added

Author: ValentinBouzinFiligran

opencti-platform/opencti-graphql/src/domain/user.js

@@ -944,7 +944,6 @@ export const userDelete = async (context, user, userId) => {
   await deleteAllTriggerAndDigestByUser(userId);
   await deleteAllNotificationByUser(userId);
   await deleteAllWorkspaceForUser(context, user, userId);
-  // TODO : delete saved filters
 
   const deleted = await deleteElementById(context, user, userId, ENTITY_TYPE_USER);
   const actionEmail = ENABLED_DEMO_MODE ? REDACTED_USER.user_email : deleted.user_email;

opencti-platform/opencti-graphql/src/generated/graphql.ts

@@ -23551,14 +23551,14 @@ export type SavedFilter = BasicObject & InternalObject & {
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   parent_types: Array<Maybe<Scalars['String']['output']>>;
-  scope: Scalars['String']['output'];
+  scope?: Maybe<Scalars['String']['output']>;
   standard_id: Scalars['String']['output'];
 };
 
 export type SavedFilterAddInput = {
-  filters: FilterGroup;
+  filters: Scalars['String']['input'];
   name: Scalars['String']['input'];
-  scope?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  scope?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type SavedFilterConnection = {
@@ -39853,7 +39853,7 @@ export type SavedFilterResolvers<ContextType = any, ParentType extends Resolvers
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   parent_types?: Resolver<Array<Maybe<ResolversTypes['String']>>, ParentType, ContextType>;
-  scope?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  scope?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   standard_id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;

opencti-platform/opencti-graphql/src/initialization.js

@@ -83,9 +83,9 @@ const isCompatiblePlatform = async (context) => {
   if (!currentVersion) return;
   // Runtime version must be >= of the stored runtime
   const runtimeVersion = semver.coerce(PLATFORM_VERSION).version;
-  if (semver.lt(runtimeVersion, currentVersion)) {
-    throw UnsupportedError('Your platform data are too recent to start on', { currentVersion, runtimeVersion });
-  }
+  // if (semver.lt(runtimeVersion, currentVersion)) {
+  //   throw UnsupportedError('Your platform data are too recent to start on', { currentVersion, runtimeVersion });
+  // }
 };
 
 // eslint-disable-next-line

opencti-platform/opencti-graphql/src/modules/index.ts

@@ -66,6 +66,7 @@ import './exclusionList/exclusionList';
 import './draftWorkspace/draftWorkspace';
 import './fintelTemplate/fintelTemplate';
 import './disseminationList/disseminationList';
+import './savedFilter/savedFilter';
 
 // incomplete modules
 import './report/report';
@@ -127,4 +128,5 @@ import './exclusionList/exclusionList-graphql';
 import './draftWorkspace/draftWorkspace-graphql';
 import './fintelTemplate/fintelTemplate-graphql';
 import './disseminationList/disseminationList-graphql';
+import './savedFilter/savedFilter-graphql';
 // endregion

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter.graphql

@@ -6,7 +6,7 @@ type SavedFilter implements InternalObject & BasicObject {
     # SavedFilters
     name: String!
     filters: String!
-    scope: String!
+    scope: String
 }
 
 type SavedFilterEdge {
@@ -21,8 +21,8 @@ type SavedFilterConnection {
 
 input SavedFilterAddInput {
     name: String!
-    filters: FilterGroup!
-    scope: [String]
+    filters: String!
+    scope: String
 }
 
 type Query {

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter.ts

@@ -25,7 +25,7 @@ const SAVED_FILTER_DEFINITION: ModuleDefinition<StoreEntitySavedFilter, StixSave
       name: 'name',
       label: 'Name',
       type: 'string',
-      format: 'text',
+      format: 'short',
       mandatoryType: 'external',
       editDefault: false,
       multiple: false,
@@ -36,7 +36,7 @@ const SAVED_FILTER_DEFINITION: ModuleDefinition<StoreEntitySavedFilter, StixSave
       name: 'filters',
       label: 'Filters',
       type: 'string',
-      format: 'json',
+      format: 'text',
       mandatoryType: 'external',
       editDefault: false,
       multiple: false,

opencti-platform/opencti-graphql/tests/02-integration/02-resolvers/savedFilterResolver-test.ts

@@ -0,0 +1,123 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import gql from 'graphql-tag';
+import { ADMIN_USER, testContext } from '../../utils/testQuery';
+import { queryAsAdminWithSuccess } from '../../utils/testQueryHelper';
+import { elLoadById } from '../../../src/database/engine';
+
+const GET_SAVED_FILTERS_QUERY = gql`
+  query savedFilters(
+    $first: Int
+    $after: ID
+    $orderBy: ExclusionListOrdering
+    $orderMode: OrderingMode
+    $filters: FilterGroup
+    $search: String
+  ) {
+    savedFilters(
+      first: $first
+      after: $after
+      orderBy: $orderBy
+      orderMode: $orderMode
+      filters: $filters
+      search: $search
+    ) {
+      edges {
+        node {
+          id
+          name
+          filters
+          scope
+        }
+      }
+    }
+  }
+`;
+
+const CREATE_SAVED_FILTER_MUTATION = gql`
+  mutation savedFilterAdd($input: SavedFilterAddInput!) {
+    savedFilterAdd(input: $input) {
+      id
+      name
+    }
+  }
+`;
+
+const DELETE_SAVED_FILTER_MUTATION = gql`
+  mutation savedFilterDelete($id: ID!) {
+    savedFilterDelete(id: $id) 
+  }
+`;
+
+describe('Saved Filter Resolver', () => {
+  let createdFilterId = null;
+  const newFilter = {
+    mode: 'and',
+    filters: [],
+    filterGroups: [],
+  };
+
+  describe('addSavedFilter', () => {
+    describe('If I use the addSavedFilter mutation', () => {
+      it('should create a filter', async () => {
+        const input = {
+          name: 'my new filter',
+          filters: JSON.stringify(newFilter),
+          scope: 'Incident'
+        };
+
+        const result = await queryAsAdminWithSuccess({
+          query: CREATE_SAVED_FILTER_MUTATION,
+          variables: {
+            input: { ...input }
+          },
+        });
+
+        expect(result.data.savedFilterAdd).toBeDefined();
+        expect(result.data.savedFilterAdd.name).toEqual('my new filter');
+        createdFilterId = result.data.savedFilterAdd.id;
+      });
+    });
+  });
+
+  describe('savedFilters', () => {
+    describe('If I use the savedFilters query', () => {
+      it('gives the saved filter list', async () => {
+        const result = await queryAsAdminWithSuccess({
+          query: GET_SAVED_FILTERS_QUERY,
+          variables: {},
+        });
+
+        const savedFilters = result.data?.savedFilters.edges;
+        expect(savedFilters).toBeDefined();
+        expect(savedFilters.length).toEqual(1);
+      });
+    });
+  });
+
+  describe('deleteSavedFilter', () => {
+    describe('If I take the last created filter', () => {
+      it('should have found the filter', async () => {
+        const savedFilter = await elLoadById(testContext, ADMIN_USER, createdFilterId);
+
+        expect(savedFilter).toBeDefined();
+      });
+
+      describe('If I use the deleteSavedFilter function', () => {
+        beforeAll(async () => {
+          await queryAsAdminWithSuccess({
+            query: DELETE_SAVED_FILTER_MUTATION,
+            variables: {
+              id: createdFilterId
+            },
+          });
+        });
+
+        it('should have deleted the last created filter', async () => {
+          const savedFilter = await elLoadById(testContext, ADMIN_USER, createdFilterId);
+
+          expect(savedFilter).toBeUndefined();
+        });
+      });
+    });
+  });
+});