Merge branch 'feature/override-typeorm-crud-service-set-join-get-sele…

…ct' of https://github.com/kauandotnet/rockets into feature/kauan-crud-override
conceptadev · Oct 25, 2023 · 8ba47cf · 8ba47cf
2 parents eb0f5ea + 28a46e4
commit 8ba47cf
Showing 1 changed file with 73 additions and 2 deletions.
diff --git a/packages/nestjs-crud/src/services/typeorm-crud.service.ts b/packages/nestjs-crud/src/services/typeorm-crud.service.ts
@@ -1,6 +1,6 @@
-import { ObjectLiteral, Repository } from 'typeorm';
+import { ObjectLiteral, Repository, SelectQueryBuilder } from 'typeorm';
 import { Injectable } from '@nestjs/common';
-import { CrudRequest } from '@nestjsx/crud';
+import { CrudRequest, JoinOptions, QueryOptions } from '@nestjsx/crud';
 import { TypeOrmCrudService as xTypeOrmCrudService } from '@nestjsx/crud-typeorm';
 import {
   SafeTransactionOptionsInterface,
@@ -11,6 +11,7 @@ import { CrudQueryHelper } from '../util/crud-query.helper';
 import { CrudQueryOptionsInterface } from '../interfaces/crud-query-options.interface';
 import { CrudResultPaginatedInterface } from '../interfaces/crud-result-paginated.interface';
 import { CrudQueryException } from '../exceptions/crud-query.exception';
+import { ParsedRequestParams, QueryJoin } from '@nestjsx/crud-request';
 
 @Injectable()
 export class TypeOrmCrudService<
@@ -157,4 +158,74 @@ export class TypeOrmCrudService<
   transaction(options?: SafeTransactionOptionsInterface): TransactionProxy {
     return new TransactionProxy(this.repo.manager, options);
   }
+
+  protected setJoin(
+    cond: QueryJoin,
+    joinOptions: JoinOptions,
+    builder: SelectQueryBuilder<T>,
+  ): ReturnType<xTypeOrmCrudService<T>['setJoin']> {
+    const options = joinOptions[cond.field];
+
+    if (!options) {
+      return true;
+    }
+
+    const allowedRelation = this.getRelationMetadata(cond.field, options);
+
+    if (!allowedRelation) {
+      return true;
+    }
+
+    const relationType = options.required ? 'innerJoin' : 'leftJoin';
+    const alias = options.alias ? options.alias : allowedRelation.name;
+
+    builder[relationType](allowedRelation.path, alias);
+
+    if (options.select !== false) {
+      const columns =
+        Array.isArray(cond.select) && cond.select?.length
+          ? cond.select.filter((column) =>
+              allowedRelation.allowedColumns.some(
+                (allowed) => allowed === column,
+              ),
+            )
+          : allowedRelation.allowedColumns;
+
+      const select = new Set(
+        [
+          ...allowedRelation.primaryColumns,
+          ...(Array.isArray(options.persist) && options.persist?.length
+            ? options.persist
+            : []),
+          ...columns,
+        ].map((col) => `${alias}.${col}`),
+      );
+
+      builder.addSelect(Array.from(select));
+    }
+
+    return true;
+  }
+
+  protected getSelect(
+    query: ParsedRequestParams,
+    options: QueryOptions,
+  ): string[] {
+    const allowed = this.getAllowedColumns(this.entityColumns, options);
+
+    const columns =
+      query.fields && query.fields.length
+        ? query.fields.filter((field) => allowed.some((col) => field === col))
+        : allowed;
+
+    const select = new Set(
+      [
+        ...(options.persist && options.persist.length ? options.persist : []),
+        ...columns,
+        ...this.entityPrimaryColumns,
+      ].map((col) => `${this.alias}.${col}`),
+    );
+
+    return Array.from(select);
+  }
 }