@solidstarters/solid-core 1.2.95 → 1.2.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.95",
+  "version": "1.2.96",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dtos/create-saved-filters.dto.ts

@@ -1,12 +1,12 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsString } from 'class-validator';
-import { IsOptional, IsNotEmpty, IsBoolean, IsInt } from 'class-validator';
+import { IsOptional, IsNotEmpty, IsBoolean, IsInt, IsJSON } from 'class-validator';
 
 export class CreateSavedFiltersDto {
     @IsOptional()
-    @IsString()
+    @IsJSON()
     @ApiProperty()
-    filterQueryJson: string;
+    filterQueryJson: any;
     @IsNotEmpty()
     @IsString()
     @ApiProperty()

package/src/dtos/update-saved-filters.dto.ts

@@ -1,4 +1,4 @@
-import { IsInt,IsOptional, IsString, IsNotEmpty, IsBoolean } from 'class-validator';
+import { IsInt,IsOptional, IsString, IsNotEmpty, IsBoolean, IsJSON } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class UpdateSavedFiltersDto {
@@ -6,9 +6,9 @@ export class UpdateSavedFiltersDto {
     @IsInt()
     id: number;
     @IsOptional()
-    @IsString()
+    @IsJSON()
     @ApiProperty()
-    filterQueryJson: string;
+    filterQueryJson: any;
     @IsNotEmpty()
     @IsOptional()
     @IsString()

package/src/entities/saved-filters.entity.ts

@@ -7,7 +7,7 @@ import { ViewMetadata } from 'src/entities/view-metadata.entity'
 @Entity("ss_saved_fitlers")
 export class SavedFilters extends CommonEntity {
     @Column({ type: "text", nullable: true })
-    filterQueryJson: string;
+    filterQueryJson: any;
     @Column({ type: "varchar" })
     name: string;
     @Column({ type: "boolean", nullable: true, default: false })

package/src/seeders/seed-data/solid-core-metadata.json

@@ -2536,7 +2536,7 @@
           {
             "name": "filterQueryJson",
             "displayName": "Filter Query Json",
-            "type": "longText",
+            "type": "json",
             "ormType": "text",
             "required": false,
             "unique": false,
@@ -4886,13 +4886,6 @@
               "name": "view",
               "isSearchable": true
             }
-          },
-          {
-            "type": "field",
-            "attrs": {
-              "name": "filterQueryJson",
-              "isSearchable": true
-            }
           }
         ]
       }

package/src/services/crud-helper.service.ts

@@ -53,7 +53,7 @@ export class CrudHelperService {
                 }
                 else { // Recursively call the applyFilters method to handle nested conditions
                     const joinField = `${alias}.${key}`;
-                        if (!this.isRelationJoined(selectQb, joinField)) selectQb.leftJoin(joinField, key);
+                    if (!this.isRelationJoined(selectQb, joinField)) selectQb.leftJoin(joinField, key);
                     this.applyFilters(qb, primaryFilterObj, key, selectQb);
                 }
             });
@@ -280,7 +280,7 @@ export class CrudHelperService {
             else {
                 // Since in populate, we are create a unique alias based on the relation path
                 //If the join is already present, it is probably because of the relation being passed in the where filter i.e applyFilters method
-                qb.addSelect(`${part}`); 
+                qb.addSelect(`${part}`);
             }
             parentAlias = part; // Update the parent alias for the next iteration
         });
@@ -350,6 +350,31 @@ export class CrudHelperService {
         };
     }
 
+    async countGroupedRecords(qb: SelectQueryBuilder<any>, basicFilterDto: BasicFilterDto, entityAlias: string) { //TODO : Check how to pass a type to SelectQueryBuilder instead of any
+        const { limit, offset, ...rest } = basicFilterDto;
+
+        const filteredDto = { ...rest, limit: undefined, offset: undefined };
+
+        const filteredQB = this.buildFilterQuery(qb, filteredDto as BasicFilterDto, entityAlias);
+
+        // Select only the group field and count distinct rows
+        const groupByField = filteredDto.groupBy;
+
+        if (!groupByField || (Array.isArray(groupByField) && groupByField.length !== 1)) {
+            throw new Error('Exactly one groupBy field is required to count grouped records.');
+        }
+
+         const field = Array.isArray(groupByField) ? groupByField[0] : groupByField;
+          const rawResults = await filteredQB
+        .select([]) // Remove prior select fields
+        .addSelect(`${entityAlias}.${field}`, 'groupField')
+        .groupBy(`${entityAlias}.${field}`)
+        .limit(undefined) // Important: prevent LIMIT 1 from propagating
+        .offset(undefined)
+        .getRawMany();
+
+        return rawResults.length;
+    }
 
     hasReadPermissionOnModel = (activeUser: ActiveUserData, modelName: string) => {
         const permissionNames = [`${classify(modelName)}Controller.findOne`, `${classify(modelName)}Controller.findMany`];

package/src/services/crud.service.ts

@@ -425,12 +425,19 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
 
         // Create above query on pincode table using query builder
         var qb: SelectQueryBuilder<T> = this.repo.createQueryBuilder(alias)
-        qb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias, internationalisation, draftPublishWorkflow);
+        qb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
+
 
         if (basicFilterDto.groupBy) {
             // Get the records and the count
             const { groupMeta, groupRecords } = await this.handleGroupFind(qb, groupFilter, populateGroup, alias, populateMedia, internationalisation, draftPublishWorkflow);
+            const totalGroups = await this.crudHelperService.countGroupedRecords(qb, basicFilterDto, alias);
+            qb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias, internationalisation, draftPublishWorkflow);
+
             return {
+                meta: {
+                    "totalRecords": totalGroups
+                },
                 groupMeta,
                 groupRecords,
             }