@punks/backend-entity-manager 0.0.164 → 0.0.165

package/dist/cjs/index.js

@@ -448,9 +448,8 @@ class EntitiesSearchAction {
         this.services = services;
     }
     async execute(request) {
-        const results = await this.services
-            .resolveSearchQuery()
-            .execute(request);
+        const searchQuery = this.services.resolveSearchQuery();
+        const results = await searchQuery.execute(request);
         const converter = this.services.resolveConverter();
         return {
             facets: results.facets,
@@ -1860,9 +1859,8 @@ class EntitiesSearchQuery {
     async execute(request) {
         const context = await this.getContext();
         await this.authorizeSearch(context);
-        const result = await this.services
-            .resolveQueryBuilder()
-            .search(request, context);
+        const queryBuilder = this.services.resolveQueryBuilder();
+        const result = await queryBuilder.search(request, context);
         const filteredEntities = await this.filterAllowedEntities(result.items, context);
         return {
             ...result,
@@ -22294,14 +22292,19 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             },
         });
     }
-    async calculateFacet(field, request, context) {
+    async calculateFacet(field, request, context, relations) {
         const where = {
             ...(context ? this.buildContextFilter(context) : {}),
             ...this.buildWhereClause(request),
         };
-        const results = await this.getRepository()
+        let query = this.getRepository()
             .getInnerRepository()
-            .createQueryBuilder()
+            .createQueryBuilder("entity");
+        // .leftJoin("entity.contact", "contact")
+        for (const relation of relations?.columns ?? []) {
+            query = query.leftJoin(`entity.${relation}`, relation);
+        }
+        const results = await query
             .select(field, "value")
             .addSelect(`COUNT(${field})`, "count")
             .where(where)
@@ -22315,28 +22318,15 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             })),
         };
     }
-    async calculateStringFieldFacets(field, request, context) {
-        return await this.calculateFacet(field, request, context);
-    }
-    async calculateNumericFieldFacets(field, request, context) {
-        return await this.calculateFacet(field, request, context);
-    }
-    async calculateBooleanFieldFacets(field, request, context) {
-        return await this.calculateFacet(field, request, context);
-    }
-    // protected async calculateFacet<TField extends keyof TEntity, TValue>(
-    //   field: TField,
-    //   request: TEntitySearchParameters,
-    //   context: IAuthenticationContext<TUserContext> | undefined
-    // ): Promise<Facet<TValue>> {
-    //   const values = await this.getRepository().distinct<TField, TValue>(field, {
-    //     ...(context ? this.buildContextFilter(context) : {}),
-    //     ...this.buildWhereClause(request),
-    //   } as any)
-    //   return {
-    //     values,
-    //   }
-    // }
+    async calculateStringFieldFacets(field, request, context, relations) {
+        return await this.calculateFacet(field, request, context, relations);
+    }
+    async calculateNumericFieldFacets(field, request, context, relations) {
+        return await this.calculateFacet(field, request, context, relations);
+    }
+    async calculateBooleanFieldFacets(field, request, context, relations) {
+        return await this.calculateFacet(field, request, context, relations);
+    }
     getRepository() {
         if (!this.repository) {
             this.repository = this.services.resolveRepository();