Fixed circular dependency problem

twentyhq · Nov 28, 2024 · 61ed304 · 61ed304
1 parent 1247412
commit 61ed304
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/...e/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts b/...e/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts
@@ -1,28 +1,30 @@
 import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import {
   ValidationArguments,
   ValidatorConstraint,
   ValidatorConstraintInterface,
 } from 'class-validator';
+import { Repository } from 'typeorm';
 
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 
-import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
+import { LoggerService } from 'src/engine/core-modules/logger/logger.service';
 import {
   FieldMetadataEntity,
   FieldMetadataType,
 } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { validateDefaultValueForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util';
-import { LoggerService } from 'src/engine/core-modules/logger/logger.service';
 
 @Injectable()
 @ValidatorConstraint({ name: 'isFieldMetadataDefaultValue', async: true })
 export class IsFieldMetadataDefaultValue
   implements ValidatorConstraintInterface
 {
   constructor(
-    private readonly fieldMetadataService: FieldMetadataService,
+    @InjectRepository(FieldMetadataEntity, 'metadata')
+    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
     private readonly loggerService: LoggerService,
   ) {}
 
@@ -44,7 +46,11 @@ export class IsFieldMetadataDefaultValue
       let fieldMetadata: FieldMetadataEntity;
 
       try {
-        fieldMetadata = await this.fieldMetadataService.findOneOrFail(id);
+        fieldMetadata = await this.fieldMetadataRepository.findOneOrFail({
+          where: {
+            id,
+          },
+        });
       } catch {
         return false;
       }

diff --git a/.../engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts b/.../engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import { ValidationArguments, ValidatorConstraint } from 'class-validator';
+import { Repository } from 'typeorm';
 
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 
-import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import {
   FieldMetadataEntity,
   FieldMetadataType,
@@ -16,7 +17,10 @@ import { validateOptionsForType } from 'src/engine/metadata-modules/field-metada
 export class IsFieldMetadataOptions {
   private validationErrors: string[] = [];
 
-  constructor(private readonly fieldMetadataService: FieldMetadataService) {}
+  constructor(
+    @InjectRepository(FieldMetadataEntity, 'metadata')
+    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
+  ) {}
 
   async validate(
     value: FieldMetadataOptions,
@@ -36,7 +40,9 @@ export class IsFieldMetadataOptions {
       let fieldMetadata: FieldMetadataEntity;
 
       try {
-        fieldMetadata = await this.fieldMetadataService.findOneOrFail(id);
+        fieldMetadata = await this.fieldMetadataRepository.findOneOrFail({
+          where: { id },
+        });
       } catch {
         return false;
       }

diff --git a/...er/src/engine/metadata-modules/relation-metadata/hooks/before-delete-one-relation.hook.ts b/...er/src/engine/metadata-modules/relation-metadata/hooks/before-delete-one-relation.hook.ts
@@ -3,17 +3,22 @@ import {
   Injectable,
   UnauthorizedException,
 } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import {
   BeforeDeleteOneHook,
   DeleteOneInputType,
 } from '@ptc-org/nestjs-query-graphql';
+import { Repository } from 'typeorm';
 
-import { RelationMetadataService } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.service';
+import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 @Injectable()
 export class BeforeDeleteOneRelation implements BeforeDeleteOneHook {
-  constructor(readonly relationMetadataService: RelationMetadataService) {}
+  constructor(
+    @InjectRepository(RelationMetadataEntity, 'metadata')
+    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
+  ) {}
 
   async run(
     instance: DeleteOneInputType,
@@ -25,12 +30,12 @@ export class BeforeDeleteOneRelation implements BeforeDeleteOneHook {
       throw new UnauthorizedException();
     }
 
-    const relationMetadata =
-      await this.relationMetadataService.findOneWithinWorkspace(workspaceId, {
-        where: {
-          id: instance.id.toString(),
-        },
-      });
+    const relationMetadata = await this.relationMetadataRepository.findOne({
+      where: {
+        workspaceId,
+        id: instance.id.toString(),
+      },
+    });
 
     if (!relationMetadata) {
       throw new BadRequestException('Relation does not exist');