[backend/frontend] refactor: mutualize code for private document list

Author: Kroustille

apps/portal-api/src/__generated__/resolvers-types.ts

@@ -38,14 +38,5 @@ type CustomDashboardConnection {
 type Query {
   seoCustomDashboardsByServiceSlug(serviceSlug: String): [CustomDashboard]
   seoCustomDashboardBySlug(slug: String): CustomDashboard
-  customDashboards(
-    first: Int!
-    after: ID
-    orderBy: DocumentOrdering!
-    orderMode: OrderingMode!
-    searchTerm: String
-    logicalFilters: LogicalFilterInput
-    serviceInstanceId: String
-  ): CustomDashboardConnection! @auth
   customDashboard(id: ID, serviceInstanceId: ID): CustomDashboard @auth
 }

apps/portal-api/src/modules/services/custom-dashboards/custom-dashboards.graphql

@@ -1,7 +1,4 @@
-import {
-  CustomDashboardConnection,
-  Resolvers,
-} from '../../../__generated__/resolvers-types';
+import { Resolvers } from '../../../__generated__/resolvers-types';
 import { DocumentId } from '../../../model/kanel/public/Document';
 import { ServiceInstanceId } from '../../../model/kanel/public/ServiceInstance';
 import { extractId } from '../../../utils/utils';
@@ -49,13 +46,6 @@ const resolvers: Resolvers = {
     seoCustomDashboardBySlug: async (_, { slug }) => {
       return CustomDashboardsApp.loadSeoCustomDashboard(slug);
     },
-    customDashboards: async (_, input) => {
-      return DocumentDomain.loadParentDocumentsByServiceInstance<CustomDashboardConnection>(
-        OPENCTI_CUSTOM_DASHBOARD_DOCUMENT_TYPE,
-        input,
-        CUSTOM_DASHBOARD_METADATA_KEYS
-      );
-    },
     customDashboard: async (_, { id }) =>
       CustomDashboardsApp.loadCustomDashboard(extractId<DocumentId>(id)),
   },

apps/portal-api/src/modules/services/custom-dashboards/custom-dashboards.resolver.ts

@@ -1,8 +1,10 @@
 import {
   CreateDocumentInput,
+  DocumentConnection,
   DocumentMetadata as DocumentMetadataResolverType,
   IntegrationType,
   MutationUpdateDocumentArgs as MutationUpdateDocumentArgsResolverType,
+  QueryDocumentsArgs,
 } from '../../../__generated__/resolvers-types';
 import { withTransaction } from '../../../context/database.context';
 import { requestContext } from '../../../context/request.context';
@@ -25,6 +27,7 @@ import { buildCreateEvent } from '../../telemetry/telemetry.helper';
 import { serviceDefinitionDomain } from '../definition/service-definition.domain';
 import { OPENCTI_INTEGRATION_DOCUMENT_TYPE } from '../integrations/integrations.model';
 import {
+  ALL_METADATA_KEYS,
   DocumentHelper,
   ManageableServiceDefinitionIdentifier,
 } from './document.helper';
@@ -349,6 +352,27 @@ export const DocumentApp = {
 
     return documentFromDb as T;
   },
+
+  loadDocuments: async (input: QueryDocumentsArgs) => {
+    const serviceDefinition =
+      await serviceDefinitionDomain.loadServiceDefinitionByServiceInstance(
+        extractId<ServiceInstanceId>(input.serviceInstanceId)
+      );
+    if (!serviceDefinition) {
+      throw new Error(ErrorCode.ServiceDefinitionNotFound);
+    }
+
+    const documentType =
+      DocumentHelper.retrieveDocumentTypeFromServiceDefinition(
+        serviceDefinition.identifier as ManageableServiceDefinitionIdentifier
+      );
+
+    return DocumentDomain.loadParentDocumentsByServiceInstance<DocumentConnection>(
+      documentType,
+      input,
+      ALL_METADATA_KEYS
+    );
+  },
 };
 
 const upsertDocument = async <T extends DocumentModel>(

apps/portal-api/src/modules/services/document/document.app.ts

@@ -138,7 +138,6 @@ type Query {
     orderBy: DocumentOrdering!
     orderMode: OrderingMode!
     searchTerm: String
-    filters: [Filter!]
     logicalFilters: LogicalFilterInput
     serviceInstanceId: String
     parentsOnly: Boolean

apps/portal-api/src/modules/services/document/document.graphql

@@ -22,10 +22,12 @@ import { telemetryApp } from '../../telemetry/telemetry.app';
 import { TelemetryEventType } from '../../telemetry/telemetry.types';
 import {
   CUSTOM_DASHBOARD_METADATA,
+  CUSTOM_DASHBOARD_METADATA_KEYS,
   OPENCTI_CUSTOM_DASHBOARD_DOCUMENT_TYPE,
 } from '../custom-dashboards/custom-dashboards.domain';
 import {
   INTEGRATION_CSV_FEED_METADATA,
+  INTEGRATION_METADATA_KEYS,
   INTEGRATION_STREAM_METADATA,
   INTEGRATION_TAXII_FEED_METADATA,
   INTEGRATION_THIRD_PARTY_INTEGRATION_METADATA,
@@ -35,6 +37,7 @@ import {
 import {
   OPENAEV_SCENARIO_DOCUMENT_TYPE,
   OPENAEV_SCENARIO_METADATA,
+  OPENAEV_SCENARIO_METADATA_KEYS,
 } from '../openaev-scenarios/openaev-scenarios.domain';
 import { DocumentApp } from './document.app';
 import { Upload } from './document.uploads.helper';
@@ -52,6 +55,14 @@ export type FullDocumentMutator = Partial<DocumentModel> & {
   parent_document_id?: DocumentId;
 };
 
+export const ALL_METADATA_KEYS: string[] = Array.from(
+  new Set([
+    ...INTEGRATION_METADATA_KEYS,
+    ...CUSTOM_DASHBOARD_METADATA_KEYS,
+    ...OPENAEV_SCENARIO_METADATA_KEYS,
+  ])
+);
+
 export type ManageableServiceDefinitionIdentifier =
   | ServiceDefinitionIdentifier.OpenctiIntegrations
   | ServiceDefinitionIdentifier.OpenctiCustomDashboards

apps/portal-api/src/modules/services/document/document.helper.ts

@@ -188,39 +188,7 @@ const resolvers: Resolvers = {
         throw mapToGraphQLError(error);
       }
     },
-    documents: async (
-      _,
-      {
-        first,
-        after,
-        orderMode,
-        orderBy,
-        searchTerm,
-        filters,
-        serviceInstanceId,
-        parentsOnly,
-      }
-    ) => {
-      try {
-        return DocumentDomain.loadDocuments(
-          {
-            first,
-            after,
-            orderMode,
-            orderBy,
-            parentsOnly,
-            filters,
-            searchTerm: searchTerm ?? '',
-          },
-          {
-            'Document.service_instance_id': fromGlobalId(serviceInstanceId).id,
-          }
-        );
-      } catch (error) {
-        logApp.error('Error while fetching documents:', error);
-        throw mapToGraphQLError(error);
-      }
-    },
+    documents: async (_, input) => DocumentApp.loadDocuments(input),
     document: async (_, { documentId }) =>
       DocumentDomain.loadDocumentWithMetadataById(
         extractId<DocumentId>(documentId)

apps/portal-api/src/modules/services/document/document.resolver.ts

@@ -125,7 +125,7 @@ export const DocumentDomain = {
     return DocumentDomain.loadDocuments<T>(
       {
         ...input,
-        parentsOnly: true,
+        parentsOnly: input.parentsOnly ?? true,
         searchTerm: input.searchTerm,
       },
       {

apps/portal-api/src/modules/services/document/domain/document.domain.ts

@@ -1,6 +1,5 @@
 import {
   IntegrationConnection,
-  QueryIntegrationsArgs,
   QueryPublicIntegrationsArgs,
 } from '../../../__generated__/resolvers-types';
 import { DocumentId } from '../../../model/kanel/public/Document';
@@ -17,13 +16,6 @@ import {
 } from './integrations.model';
 
 export const integrationsApp = {
-  loadIntegrations: async (input: QueryIntegrationsArgs) => {
-    return DocumentDomain.loadParentDocumentsByServiceInstance<IntegrationConnection>(
-      OPENCTI_INTEGRATION_DOCUMENT_TYPE,
-      input,
-      INTEGRATION_METADATA_KEYS
-    );
-  },
   loadIntegration: async (
     documentId: DocumentId
   ): Promise<WithUseCases<Integration>> => {

apps/portal-api/src/modules/services/integrations/integrations.app.ts

@@ -267,15 +267,6 @@ type IntegrationConnection {
 }
 
 type Query {
-  integrations(
-    first: Int!
-    after: ID
-    orderBy: DocumentOrdering!
-    orderMode: OrderingMode!
-    searchTerm: String
-    logicalFilters: LogicalFilterInput
-    serviceInstanceId: String
-  ): IntegrationConnection! @auth
   integration(id: ID, serviceInstanceId: ID): Integration @auth
   publicIntegrations(
     slug: String!