Fix metadata exception handler #2 (#3357)

twentyhq · Jan 10, 2024 · 22047fa · 22047fa
1 parent 4f9ea78
commit 22047fa
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 24 deletions.
diff --git a/packages/twenty-server/src/filters/utils/global-exception-handler.util.ts b/packages/twenty-server/src/filters/utils/global-exception-handler.util.ts
@@ -1,7 +1,5 @@
 import { HttpException } from '@nestjs/common';
 
-import { TypeORMError } from 'typeorm';
-
 import {
   AuthenticationError,
   BaseGraphQLError,
@@ -29,12 +27,10 @@ export const handleException = (
   exception: Error,
   exceptionHandlerService: ExceptionHandlerService,
 ): void => {
-  if (
-    exception instanceof TypeORMError ||
-    (exception instanceof HttpException && exception.getStatus() >= 500)
-  ) {
-    exceptionHandlerService.captureException(exception);
+  if (exception instanceof HttpException && exception.getStatus() < 500) {
+    return;
   }
+  exceptionHandlerService.captureException(exception);
 };
 
 export const convertExceptionToGraphQLError = (

diff --git a/packages/twenty-server/src/integrations/exception-handler/drivers/sentry.driver.ts b/packages/twenty-server/src/integrations/exception-handler/drivers/sentry.driver.ts
@@ -11,7 +11,7 @@ export class ExceptionHandlerSentryDriver
 {
   constructor(options: ExceptionHandlerSentryDriverFactoryOptions['options']) {
     Sentry.init({
-      dsn: options.dns,
+      dsn: options.dsn,
       integrations: [
         // enable HTTP calls tracing
         new Sentry.Integrations.Http({ tracing: true }),

diff --git a/...ages/twenty-server/src/integrations/exception-handler/exception-handler.module-factory.ts b/...ages/twenty-server/src/integrations/exception-handler/exception-handler.module-factory.ts
@@ -25,7 +25,7 @@ export const exceptionHandlerModuleFactory = async (
       return {
         type: ExceptionHandlerDriver.Sentry,
         options: {
-          dns: environmentService.getSentryDSN() ?? '',
+          dsn: environmentService.getSentryDSN() ?? '',
           serverInstance: adapterHost.httpAdapter?.getInstance(),
           debug: environmentService.isDebugMode(),
         },

diff --git a/...wenty-server/src/integrations/exception-handler/interfaces/exception-handler.interface.ts b/...wenty-server/src/integrations/exception-handler/interfaces/exception-handler.interface.ts
@@ -8,7 +8,7 @@ export enum ExceptionHandlerDriver {
 export interface ExceptionHandlerSentryDriverFactoryOptions {
   type: ExceptionHandlerDriver.Sentry;
   options: {
-    dns: string;
+    dsn: string;
     serverInstance?: Router;
     debug?: boolean;
   };

diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.resolver.ts
@@ -19,14 +19,10 @@ export class FieldMetadataResolver {
     @Args('input') input: CreateOneFieldMetadataInput,
     @AuthWorkspace() { id: workspaceId }: Workspace,
   ) {
-    try {
-      return this.fieldMetadataService.createOne({
-        ...input.field,
-        workspaceId,
-      });
-    } catch (error) {
-      console.log(error);
-    }
+    return this.fieldMetadataService.createOne({
+      ...input.field,
+      workspaceId,
+    });
   }
 
   @Mutation(() => FieldMetadataDTO)

diff --git a/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/metadata/field-metadata/field-metadata.service.ts
@@ -56,7 +56,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       );
 
     if (!objectMetadata) {
-      throw new Error('Object does not exist');
+      throw new NotFoundException('Object does not exist');
     }
 
     const fieldAlreadyExists = await this.fieldMetadataRepository.findOne({

diff --git a/packages/twenty-server/src/metadata/metadata.module-factory.ts b/packages/twenty-server/src/metadata/metadata.module-factory.ts
@@ -24,9 +24,9 @@ export const metadataModuleFactory = async (
           error.originalError,
           exceptionHandlerService,
         );
-      } else {
-        return maskError(error, message, isDev);
       }
+
+      return maskError(error, message, isDev);
     },
   },
 });
diff --git a/packages/twenty-server/src/metadata/metadata.module.ts b/packages/twenty-server/src/metadata/metadata.module.ts
@@ -6,6 +6,7 @@ import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
 import { WorkspaceMigrationRunnerModule } from 'src/workspace/workspace-migration-runner/workspace-migration-runner.module';
 import { WorkspaceMigrationModule } from 'src/metadata/workspace-migration/workspace-migration.module';
 import { metadataModuleFactory } from 'src/metadata/metadata.module-factory';
+import { ExceptionHandlerService } from 'src/integrations/exception-handler/exception-handler.service';
 
 import { DataSourceModule } from './data-source/data-source.module';
 import { FieldMetadataModule } from './field-metadata/field-metadata.module';
@@ -15,7 +16,7 @@ import { RelationMetadataModule } from './relation-metadata/relation-metadata.mo
   imports: [
     GraphQLModule.forRootAsync<YogaDriverConfig>({
       driver: YogaDriver,
-      imports: [],
+      inject: [ExceptionHandlerService],
       useFactory: metadataModuleFactory,
     }),
     DataSourceModule,

diff --git a/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/metadata/object-metadata/object-metadata.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';
@@ -59,7 +59,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
       objectMetadataInput.nameSingular.toLowerCase() ===
       objectMetadataInput.namePlural.toLowerCase()
     ) {
-      throw new Error(
+      throw new BadRequestException(
         'The singular and plural name cannot be the same for an object',
       );
     }