@punks/backend-entity-manager 0.0.235 → 0.0.237

package/dist/cjs/index.js

@@ -2932,7 +2932,7 @@ class QueryClauseBuilder {
             clauses.push(typeorm.ILike(filter.eq));
         }
         if (!backendCore.isNullOrUndefined(filter?.like)) {
-            clauses.push(typeorm.Like(filter.like.replaceAll("*", "%")));
+            clauses.push(typeorm.ILike(filter.like.replaceAll("*", "%")));
         }
         if (!backendCore.isNullOrUndefined(filter?.ne)) {
             clauses.push(typeorm.Not(typeorm.Equal(filter.ne)));
@@ -2944,7 +2944,7 @@ class QueryClauseBuilder {
             clauses.push(typeorm.Not(typeorm.In(filter.notIn)));
         }
         if (!backendCore.isNullOrUndefined(filter?.notLike)) {
-            clauses.push(typeorm.Not(typeorm.Like(filter.notLike.replaceAll("*", "%"))));
+            clauses.push(typeorm.Not(typeorm.ILike(filter.notLike.replaceAll("*", "%"))));
         }
         if (filter?.isNull === true) {
             clauses.push(typeorm.IsNull());
@@ -2968,6 +2968,12 @@ class QueryClauseBuilder {
         if (!backendCore.isNullOrUndefined(filter?.lt)) {
             clauses.push(typeorm.LessThan(filter.lt));
         }
+        if (!backendCore.isNullOrUndefined(filter?.in)) {
+            clauses.push(typeorm.In(filter.in ?? []));
+        }
+        if (!backendCore.isNullOrUndefined(filter?.eq)) {
+            clauses.push(typeorm.Equal(filter.eq));
+        }
         if (filter?.isNull === true) {
             clauses.push(typeorm.IsNull());
         }
@@ -3097,7 +3103,11 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         const queryResults = await this.countQueryResults(request, context);
         const results = await this.findPagedQueryResults(request, context);
         const facets = request.options?.includeFacets
-            ? await this.calculateFacets(request, context)
+            ? // todo: refactor avoiding to manipulate the request object
+                await this.calculateFacets({
+                    ...request,
+                    filters: request.options.facetsFilters,
+                }, context)
             : undefined;
         const childrenMap = request.options?.includeChildrenMap
             ? await this.calculateChildrenMap(results)
@@ -3177,6 +3187,15 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             return acc;
         }, {});
     }
+    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);
+    }
     async calculateFacet(field, request, context, relations) {
         let query = this.getRepository()
             .getInnerRepository()
@@ -3184,12 +3203,13 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         for (const relation of relations?.columns ?? []) {
             query = query.leftJoin(`entity.${relation}`, relation);
         }
+        const fieldName = `"${field}"`;
         const results = await query
-            .select(field, "value")
-            .addSelect(`COUNT(${field})`, "count")
+            .select(fieldName, "value")
+            .addSelect(`COUNT(${fieldName})`, "count")
             .where(this.buildWhere(request, context))
-            .addGroupBy(field)
-            .orderBy(field)
+            .addGroupBy(fieldName)
+            .orderBy(fieldName)
             .getRawMany();
         return {
             values: results.map((x) => ({
@@ -3198,15 +3218,6 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             })),
         };
     }
-    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();