[permissions] Implement object-records permissions in query builders (#11458)

In this PR we are

- (if permissionsV2 is enabled) executing permission checks at query
builder level. To do so we want to override the query builders methods
that are performing db calls (.execute(), .getMany(), ... etc.) For now
I have just overriden some of the query builders methods for the poc. To
do so I created custom query builder classes that extend typeorm's query
builder (selectQueryBuilder and updateQueryBuilder, for now and later I
will tackle softDeleteQueryBuilder, etc.).
- adding a notion of roles permissions version and roles permissions
object to datasources. We will now use one datasource per roleId and
rolePermissionVersion. Both rolesPermissionsVersion and rolesPermissions
objects are stored in redis and recomputed at role update or if queried
and found empty. Unlike for metadata version we don't need to store a
version in the db that stands for the source of truth. We also don't
need to destroy and recreate the datasource if the rolesPermissions
version changes, but only to update the value for rolesPermissions and
rolesPermissionsVersions on the existing datasource.

What this PR misses
- computing of roles permissions should take into account
objectPermissions table (for now it only looks at what's on the roles
table)
- pursue extension of query builder classes and overriding of their db
calling-methods
- what should the behaviour be for calls from twentyOrmGlobalManager
that don't have a roleId?

packages/twenty-server/src/engine/twenty-orm/repository/permissions.util.ts

@@ -0,0 +1,69 @@
+import { ObjectRecordsPermissions } from 'twenty-shared/types';
+import { QueryExpressionMap } from 'typeorm/query-builder/QueryExpressionMap';
+
+import {
+  PermissionsException,
+  PermissionsExceptionCode,
+  PermissionsExceptionMessage,
+} from 'src/engine/metadata-modules/permissions/permissions.exception';
+
+const getTargetEntityAndOperationType = (expressionMap: QueryExpressionMap) => {
+  const mainEntity = expressionMap.aliases[0].metadata.name;
+  const operationType = expressionMap.queryType;
+
+  return {
+    mainEntity,
+    operationType,
+  };
+};
+
+export const validateQueryIsPermittedOrThrow = (
+  expressionMap: QueryExpressionMap,
+  objectRecordsPermissions: ObjectRecordsPermissions,
+) => {
+  const { mainEntity, operationType } =
+    getTargetEntityAndOperationType(expressionMap);
+
+  const permissionsForEntity = objectRecordsPermissions[mainEntity];
+
+  switch (operationType) {
+    case 'select':
+      if (!permissionsForEntity?.canRead) {
+        throw new PermissionsException(
+          PermissionsExceptionMessage.PERMISSION_DENIED,
+          PermissionsExceptionCode.PERMISSION_DENIED,
+        );
+      }
+      break;
+    case 'insert':
+    case 'update':
+      if (!permissionsForEntity?.canUpdate) {
+        throw new PermissionsException(
+          PermissionsExceptionMessage.PERMISSION_DENIED,
+          PermissionsExceptionCode.PERMISSION_DENIED,
+        );
+      }
+      break;
+    case 'delete':
+      if (!permissionsForEntity?.canDestroy) {
+        throw new PermissionsException(
+          PermissionsExceptionMessage.PERMISSION_DENIED,
+          PermissionsExceptionCode.PERMISSION_DENIED,
+        );
+      }
+      break;
+    case 'soft-delete':
+      if (!permissionsForEntity?.canSoftDelete) {
+        throw new PermissionsException(
+          PermissionsExceptionMessage.PERMISSION_DENIED,
+          PermissionsExceptionCode.PERMISSION_DENIED,
+        );
+      }
+      break;
+    default:
+      throw new PermissionsException(
+        PermissionsExceptionMessage.UNKNOWN_OPERATION_NAME,
+        PermissionsExceptionCode.UNKNOWN_OPERATION_NAME,
+      );
+  }
+};

packages/twenty-server/src/engine/twenty-orm/repository/workspace-query-builder.ts

@@ -0,0 +1,25 @@
+import { ObjectRecordsPermissions } from 'twenty-shared/types';
+import { ObjectLiteral, SelectQueryBuilder } from 'typeorm';
+
+import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-select-query-builder';
+
+export class WorkspaceQueryBuilder<
+  T extends ObjectLiteral,
+> extends WorkspaceSelectQueryBuilder<T> {
+  constructor(
+    queryBuilder: SelectQueryBuilder<T>,
+    objectRecordsPermissions: ObjectRecordsPermissions,
+  ) {
+    super(queryBuilder, objectRecordsPermissions);
+    this.objectRecordsPermissions = objectRecordsPermissions;
+  }
+
+  override clone(): this {
+    const clonedQueryBuilder = super.clone();
+
+    return new WorkspaceQueryBuilder(
+      clonedQueryBuilder,
+      this.objectRecordsPermissions,
+    ) as this;
+  }
+}

packages/twenty-server/src/engine/twenty-orm/repository/workspace-select-query-builder.ts

@@ -0,0 +1,56 @@
+import { ObjectRecordsPermissions } from 'twenty-shared/types';
+import { ObjectLiteral, SelectQueryBuilder, UpdateQueryBuilder } from 'typeorm';
+import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
+
+import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.util';
+import { WorkspaceUpdateQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-update-query-builder';
+
+export class WorkspaceSelectQueryBuilder<
+  T extends ObjectLiteral,
+> extends SelectQueryBuilder<T> {
+  objectRecordsPermissions: ObjectRecordsPermissions;
+  constructor(
+    queryBuilder: SelectQueryBuilder<T>,
+    objectRecordsPermissions: ObjectRecordsPermissions,
+  ) {
+    super(queryBuilder);
+    this.objectRecordsPermissions = objectRecordsPermissions;
+  }
+
+  override update(): WorkspaceUpdateQueryBuilder<T>;
+
+  override update(
+    updateSet: QueryDeepPartialEntity<T>,
+  ): WorkspaceUpdateQueryBuilder<T>;
+
+  override update(
+    updateSet?: QueryDeepPartialEntity<T>,
+  ): UpdateQueryBuilder<T> {
+    const updateQueryBuilder = updateSet
+      ? super.update(updateSet)
+      : super.update();
+
+    return new WorkspaceUpdateQueryBuilder<T>(
+      updateQueryBuilder,
+      this.objectRecordsPermissions,
+    );
+  }
+
+  override execute(): Promise<T[]> {
+    validateQueryIsPermittedOrThrow(
+      this.expressionMap,
+      this.objectRecordsPermissions,
+    );
+
+    return super.execute();
+  }
+
+  override getMany(): Promise<T[]> {
+    validateQueryIsPermittedOrThrow(
+      this.expressionMap,
+      this.objectRecordsPermissions,
+    );
+
+    return super.getMany();
+  }
+}

packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts

@@ -0,0 +1,26 @@
+import { ObjectRecordsPermissions } from 'twenty-shared/types';
+import { ObjectLiteral, UpdateQueryBuilder, UpdateResult } from 'typeorm';
+
+import { validateQueryIsPermittedOrThrow } from 'src/engine/twenty-orm/repository/permissions.util';
+
+export class WorkspaceUpdateQueryBuilder<
+  Entity extends ObjectLiteral,
+> extends UpdateQueryBuilder<Entity> {
+  private objectRecordsPermissions: ObjectRecordsPermissions;
+  constructor(
+    queryBuilder: UpdateQueryBuilder<Entity>,
+    objectRecordsPermissions: ObjectRecordsPermissions,
+  ) {
+    super(queryBuilder);
+    this.objectRecordsPermissions = objectRecordsPermissions;
+  }
+
+  override execute(): Promise<UpdateResult> {
+    validateQueryIsPermittedOrThrow(
+      this.expressionMap,
+      this.objectRecordsPermissions,
+    );
+
+    return super.execute();
+  }
+}

packages/twenty-server/src/engine/twenty-orm/repository/workspace.repository.ts

@@ -1,3 +1,4 @@
+import { ObjectRecordsPermissions } from 'twenty-shared/types';
 import {
   DeepPartial,
   DeleteResult,
@@ -20,36 +21,70 @@ import { PickKeysByType } from 'typeorm/common/PickKeysByType';
 import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
 import { UpsertOptions } from 'typeorm/repository/UpsertOptions';
 
+import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
 import { WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/workspace-internal-context.interface';
 
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
 import { getObjectMetadataMapItemByNameSingular } from 'src/engine/metadata-modules/utils/get-object-metadata-map-item-by-name-singular.util';
+import { WorkspaceQueryBuilder } from 'src/engine/twenty-orm/repository/workspace-query-builder';
 import { WorkspaceEntitiesStorage } from 'src/engine/twenty-orm/storage/workspace-entities.storage';
 import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';
 import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
 
 export class WorkspaceRepository<
-  Entity extends ObjectLiteral,
-> extends Repository<Entity> {
+  T extends ObjectLiteral,
+> extends Repository<T> {
   private readonly internalContext: WorkspaceInternalContext;
+  private featureFlagMap: FeatureFlagMap;
+  private objectRecordsPermissions?: ObjectRecordsPermissions;
 
   constructor(
     internalContext: WorkspaceInternalContext,
-    target: EntityTarget<Entity>,
+    target: EntityTarget<T>,
     manager: EntityManager,
+    featureFlagMap: FeatureFlagMap,
     queryRunner?: QueryRunner,
+    objectRecordsPermissions?: ObjectRecordsPermissions,
   ) {
     super(target, manager, queryRunner);
     this.internalContext = internalContext;
+    this.featureFlagMap = featureFlagMap;
+    this.objectRecordsPermissions = objectRecordsPermissions;
+  }
+
+  override createQueryBuilder<U extends T>(
+    alias?: string,
+    queryRunner?: QueryRunner,
+  ): WorkspaceQueryBuilder<U> {
+    const queryBuilder = super.createQueryBuilder(
+      alias,
+      queryRunner,
+    ) as unknown as WorkspaceQueryBuilder<U>;
+    const isPermissionsV2Enabled =
+      this.featureFlagMap[FeatureFlagKey.IsPermissionsV2Enabled];
+
+    if (!isPermissionsV2Enabled) {
+      return queryBuilder;
+    } else {
+      if (!this.objectRecordsPermissions) {
+        throw new Error('Object records permissions are required');
+      }
+
+      return new WorkspaceQueryBuilder(
+        queryBuilder,
+        this.objectRecordsPermissions,
+      );
+    }
   }
 
   /**
    * FIND METHODS
    */
   override async find(
-    options?: FindManyOptions<Entity>,
+    options?: FindManyOptions<T>,
     entityManager?: EntityManager,
-  ): Promise<Entity[]> {
+  ): Promise<T[]> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions(options);
     const result = await manager.find(this.target, computedOptions);
@@ -59,9 +94,9 @@ export class WorkspaceRepository<
   }
 
   override async findBy(
-    where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    where: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
-  ): Promise<Entity[]> {
+  ): Promise<T[]> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions({ where });
     const result = await manager.findBy(this.target, computedOptions.where);
@@ -71,9 +106,9 @@ export class WorkspaceRepository<
   }
 
   override async findAndCount(
-    options?: FindManyOptions<Entity>,
+    options?: FindManyOptions<T>,
     entityManager?: EntityManager,
-  ): Promise<[Entity[], number]> {
+  ): Promise<[T[], number]> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions(options);
     const result = await manager.findAndCount(this.target, computedOptions);
@@ -83,9 +118,9 @@ export class WorkspaceRepository<
   }
 
   override async findAndCountBy(
-    where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    where: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
-  ): Promise<[Entity[], number]> {
+  ): Promise<[T[], number]> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions({ where });
     const result = await manager.findAndCountBy(
@@ -98,9 +133,9 @@ export class WorkspaceRepository<
   }
 
   override async findOne(
-    options: FindOneOptions<Entity>,
+    options: FindOneOptions<T>,
     entityManager?: EntityManager,
-  ): Promise<Entity | null> {
+  ): Promise<T | null> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions(options);
     const result = await manager.findOne(this.target, computedOptions);
@@ -110,9 +145,9 @@ export class WorkspaceRepository<
   }
 
   override async findOneBy(
-    where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    where: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
-  ): Promise<Entity | null> {
+  ): Promise<T | null> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions({ where });
     const result = await manager.findOneBy(this.target, computedOptions.where);
@@ -122,9 +157,9 @@ export class WorkspaceRepository<
   }
 
   override async findOneOrFail(
-    options: FindOneOptions<Entity>,
+    options: FindOneOptions<T>,
     entityManager?: EntityManager,
-  ): Promise<Entity> {
+  ): Promise<T> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions(options);
     const result = await manager.findOneOrFail(this.target, computedOptions);
@@ -134,9 +169,9 @@ export class WorkspaceRepository<
   }
 
   override async findOneByOrFail(
-    where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    where: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
-  ): Promise<Entity> {
+  ): Promise<T> {
     const manager = entityManager || this.manager;
     const computedOptions = await this.transformOptions({ where });
     const result = await manager.findOneByOrFail(
@@ -151,38 +186,38 @@ export class WorkspaceRepository<
   /**
    * SAVE METHODS
    */
-  override save<T extends DeepPartial<Entity>>(
-    entities: T[],
+  override save<U extends DeepPartial<T>>(
+    entities: U[],
     options: SaveOptions & { reload: false },
     entityManager?: EntityManager,
   ): Promise<T[]>;
 
-  override save<T extends DeepPartial<Entity>>(
-    entities: T[],
+  override save<U extends DeepPartial<T>>(
+    entities: U[],
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<(T & Entity)[]>;
+  ): Promise<(U & T)[]>;
 
-  override save<T extends DeepPartial<Entity>>(
-    entity: T,
+  override save<U extends DeepPartial<T>>(
+    entity: U,
     options: SaveOptions & { reload: false },
     entityManager?: EntityManager,
   ): Promise<T>;
 
-  override save<T extends DeepPartial<Entity>>(
-    entity: T,
+  override save<U extends DeepPartial<T>>(
+    entity: U,
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<T & Entity>;
+  ): Promise<U & T>;
 
-  override async save<T extends DeepPartial<Entity>>(
-    entityOrEntities: T | T[],
+  override async save<U extends DeepPartial<T>>(
+    entityOrEntities: U | U[],
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<T | T[]> {
+  ): Promise<U | U[]> {
     const manager = entityManager || this.manager;
     const formattedEntityOrEntities = await this.formatData(entityOrEntities);
-    let result: T | T[];
+    let result: U | U[];
 
     // Needed becasuse save method has multiple signature, otherwise we will need to do a type assertion
     if (Array.isArray(formattedEntityOrEntities)) {
@@ -208,22 +243,22 @@ export class WorkspaceRepository<
    * REMOVE METHODS
    */
   override remove(
-    entities: Entity[],
+    entities: T[],
     options?: RemoveOptions,
     entityManager?: EntityManager,
-  ): Promise<Entity[]>;
+  ): Promise<T[]>;
 
   override remove(
-    entity: Entity,
+    entity: T,
     options?: RemoveOptions,
     entityManager?: EntityManager,
-  ): Promise<Entity>;
+  ): Promise<T>;
 
   override async remove(
-    entityOrEntities: Entity | Entity[],
+    entityOrEntities: T | T[],
     options?: RemoveOptions,
     entityManager?: EntityManager,
-  ): Promise<Entity | Entity[]> {
+  ): Promise<T | T[]> {
     const manager = entityManager || this.manager;
     const formattedEntityOrEntities = await this.formatData(entityOrEntities);
     const result = await manager.remove(
@@ -247,7 +282,7 @@ export class WorkspaceRepository<
       | Date[]
       | ObjectId
       | ObjectId[]
-      | FindOptionsWhere<Entity>,
+      | FindOptionsWhere<T>,
     entityManager?: EntityManager,
   ): Promise<DeleteResult> {
     const manager = entityManager || this.manager;
@@ -259,38 +294,38 @@ export class WorkspaceRepository<
     return manager.delete(this.target, criteria);
   }
 
-  override softRemove<T extends DeepPartial<Entity>>(
-    entities: T[],
+  override softRemove<U extends DeepPartial<T>>(
+    entities: U[],
     options: SaveOptions & { reload: false },
     entityManager?: EntityManager,
   ): Promise<T[]>;
 
-  override softRemove<T extends DeepPartial<Entity>>(
-    entities: T[],
+  override softRemove<U extends DeepPartial<T>>(
+    entities: U[],
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<(T & Entity)[]>;
+  ): Promise<(U & T)[]>;
 
-  override softRemove<T extends DeepPartial<Entity>>(
-    entity: T,
+  override softRemove<U extends DeepPartial<T>>(
+    entity: U,
     options: SaveOptions & { reload: false },
     entityManager?: EntityManager,
-  ): Promise<T>;
+  ): Promise<U>;
 
-  override softRemove<T extends DeepPartial<Entity>>(
+  override softRemove<U extends DeepPartial<T>>(
     entity: T,
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<T & Entity>;
+  ): Promise<U & T>;
 
-  override async softRemove<T extends DeepPartial<Entity>>(
-    entityOrEntities: T | T[],
+  override async softRemove<U extends DeepPartial<T>>(
+    entityOrEntities: U | U[],
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<T | T[]> {
+  ): Promise<U | U[]> {
     const manager = entityManager || this.manager;
     const formattedEntityOrEntities = await this.formatData(entityOrEntities);
-    let result: T | T[];
+    let result: U | U[];
 
     // Needed becasuse save method has multiple signature, otherwise we will need to do a type assertion
     if (Array.isArray(formattedEntityOrEntities)) {
@@ -322,7 +357,7 @@ export class WorkspaceRepository<
       | Date[]
       | ObjectId
       | ObjectId[]
-      | FindOptionsWhere<Entity>,
+      | FindOptionsWhere<T>,
     entityManager?: EntityManager,
   ): Promise<UpdateResult> {
     const manager = entityManager || this.manager;
@@ -337,38 +372,38 @@ export class WorkspaceRepository<
   /**
    * RECOVERY METHODS
    */
-  override recover<T extends DeepPartial<Entity>>(
-    entities: T[],
+  override recover<U extends DeepPartial<T>>(
+    entities: U,
     options: SaveOptions & { reload: false },
     entityManager?: EntityManager,
-  ): Promise<T[]>;
+  ): Promise<U>;
 
-  override recover<T extends DeepPartial<Entity>>(
-    entities: T[],
+  override recover<U extends DeepPartial<T>>(
+    entities: U,
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<(T & Entity)[]>;
+  ): Promise<(U & T)[]>;
 
-  override recover<T extends DeepPartial<Entity>>(
-    entity: T,
+  override recover<U extends DeepPartial<T>>(
+    entity: U,
     options: SaveOptions & { reload: false },
     entityManager?: EntityManager,
-  ): Promise<T>;
+  ): Promise<U>;
 
-  override recover<T extends DeepPartial<Entity>>(
-    entity: T,
+  override recover<U extends DeepPartial<T>>(
+    entity: U,
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<T & Entity>;
+  ): Promise<U & T>;
 
-  override async recover<T extends DeepPartial<Entity>>(
-    entityOrEntities: T | T[],
+  override async recover<U extends DeepPartial<T>>(
+    entityOrEntities: U | U[],
     options?: SaveOptions,
     entityManager?: EntityManager,
-  ): Promise<T | T[]> {
+  ): Promise<U | U[]> {
     const manager = entityManager || this.manager;
     const formattedEntityOrEntities = await this.formatData(entityOrEntities);
-    let result: T | T[];
+    let result: U | U[];
 
     // Needed becasuse save method has multiple signature, otherwise we will need to do a type assertion
     if (Array.isArray(formattedEntityOrEntities)) {
@@ -400,7 +435,7 @@ export class WorkspaceRepository<
       | Date[]
       | ObjectId
       | ObjectId[]
-      | FindOptionsWhere<Entity>,
+      | FindOptionsWhere<T>,
     entityManager?: EntityManager,
   ): Promise<UpdateResult> {
     const manager = entityManager || this.manager;
@@ -416,7 +451,7 @@ export class WorkspaceRepository<
    * INSERT METHODS
    */
   override async insert(
-    entity: QueryDeepPartialEntity<Entity> | QueryDeepPartialEntity<Entity>[],
+    entity: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T>[],
     entityManager?: EntityManager,
   ): Promise<InsertResult> {
     const manager = entityManager || this.manager;
@@ -445,8 +480,8 @@ export class WorkspaceRepository<
       | Date[]
       | ObjectId
       | ObjectId[]
-      | FindOptionsWhere<Entity>,
-    partialEntity: QueryDeepPartialEntity<Entity>,
+      | FindOptionsWhere<T>,
+    partialEntity: QueryDeepPartialEntity<T>,
     entityManager?: EntityManager,
   ): Promise<UpdateResult> {
     const manager = entityManager || this.manager;
@@ -459,10 +494,8 @@ export class WorkspaceRepository<
   }
 
   override async upsert(
-    entityOrEntities:
-      | QueryDeepPartialEntity<Entity>
-      | QueryDeepPartialEntity<Entity>[],
-    conflictPathsOrOptions: string[] | UpsertOptions<Entity>,
+    entityOrEntities: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T>[],
+    conflictPathsOrOptions: string[] | UpsertOptions<T>,
     entityManager?: EntityManager,
   ): Promise<InsertResult> {
     const manager = entityManager || this.manager;
@@ -488,7 +521,7 @@ export class WorkspaceRepository<
    * EXIST METHODS
    */
   override async exists(
-    options?: FindManyOptions<Entity>,
+    options?: FindManyOptions<T>,
     entityManager?: EntityManager,
   ): Promise<boolean> {
     const manager = entityManager || this.manager;
@@ -498,7 +531,7 @@ export class WorkspaceRepository<
   }
 
   override async existsBy(
-    where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    where: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
   ): Promise<boolean> {
     const manager = entityManager || this.manager;
@@ -511,7 +544,7 @@ export class WorkspaceRepository<
    * COUNT METHODS
    */
   override async count(
-    options?: FindManyOptions<Entity>,
+    options?: FindManyOptions<T>,
     entityManager?: EntityManager,
   ): Promise<number> {
     const manager = entityManager || this.manager;
@@ -521,7 +554,7 @@ export class WorkspaceRepository<
   }
 
   override async countBy(
-    where: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    where: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
   ): Promise<number> {
     const manager = entityManager || this.manager;
@@ -534,8 +567,8 @@ export class WorkspaceRepository<
    * MATH METHODS
    */
   override async sum(
-    columnName: PickKeysByType<Entity, number>,
-    where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    columnName: PickKeysByType<T, number>,
+    where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
   ): Promise<number | null> {
     const manager = entityManager || this.manager;
@@ -545,8 +578,8 @@ export class WorkspaceRepository<
   }
 
   override async average(
-    columnName: PickKeysByType<Entity, number>,
-    where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    columnName: PickKeysByType<T, number>,
+    where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
   ): Promise<number | null> {
     const manager = entityManager || this.manager;
@@ -556,8 +589,8 @@ export class WorkspaceRepository<
   }
 
   override async minimum(
-    columnName: PickKeysByType<Entity, number>,
-    where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    columnName: PickKeysByType<T, number>,
+    where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
   ): Promise<number | null> {
     const manager = entityManager || this.manager;
@@ -567,8 +600,8 @@ export class WorkspaceRepository<
   }
 
   override async maximum(
-    columnName: PickKeysByType<Entity, number>,
-    where?: FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[],
+    columnName: PickKeysByType<T, number>,
+    where?: FindOptionsWhere<T> | FindOptionsWhere<T>[],
     entityManager?: EntityManager,
   ): Promise<number | null> {
     const manager = entityManager || this.manager;
@@ -578,7 +611,7 @@ export class WorkspaceRepository<
   }
 
   override async increment(
-    conditions: FindOptionsWhere<Entity>,
+    conditions: FindOptionsWhere<T>,
     propertyPath: string,
     value: number | string,
     entityManager?: EntityManager,
@@ -597,7 +630,7 @@ export class WorkspaceRepository<
   }
 
   override async decrement(
-    conditions: FindOptionsWhere<Entity>,
+    conditions: FindOptionsWhere<T>,
     propertyPath: string,
     value: number | string,
     entityManager?: EntityManager,
@@ -652,8 +685,8 @@ export class WorkspaceRepository<
   }
 
   private async transformOptions<
-    T extends FindManyOptions<Entity> | FindOneOptions<Entity> | undefined,
-  >(options: T): Promise<T> {
+    U extends FindManyOptions<T> | FindOneOptions<T> | undefined,
+  >(options: U): Promise<U> {
     if (!options) {
       return options;
     }