@solidstarters/solid-core 1.2.200 → 1.2.202

package/docs/grouping-enhancements.md

@@ -0,0 +1,89 @@
+# Grouping & Aggregation Enhancements (Code Review Summary)
+
+This document explains the recent changes to grouping/aggregation in the CRUD helper/service, why they were made, and how to use them (with examples on `PincodeMaster`).
+
+## What Changed and Why
+- **Dedicated grouping pipeline**: Grouping no longer reuses the record-level query (which had `SELECT entity.*`, pagination, and default order). A separate path builds clean group queries to avoid SQL errors and ensure correct counts.
+- **Multiple group-by fields**: The one-field limit was removed. You can now group on multiple fields (including relations) in the requested order.
+- **Relation-safe grouping**: Group-by fields can traverse many-to-one relations (e.g., `state.name`, `city.name`). The helper reuses existing joins (from filters) or adds the necessary joins and aliases.
+- **Date granularity**: Grouping supports `day`, `week`, `month`, `year` granularities in a DB-aware way (Postgres, MySQL/MariaDB, SQL Server).
+- **Aggregates**: Supports a core, DB-agnostic set: `count`, `count_distinct`, `sum`, `avg`, `min`, `max`. If `aggregates` is omitted, it defaults to `count(*)`.
+- **Group sorting/pagination**: Sorting and pagination are applied to group rows (not entity rows). Record pagination is kept separate for non-grouped queries.
+- **Ordered group names**: Group names follow the order of `groupBy` fields. Relation values and date/grouped values are included in sequence.
+- **Formatted date group labels**: You can add an optional format specifier to a date groupBy field: `field:granularity:format`. Supported formats: `MMM`, `MMMM`, `YYYY`, `YYYY-MM`, `YYYY-MM-DD` (defaults to the raw value if omitted).
+- **Count of groups**: Group counts are computed without pagination interference, so `meta.totalRecords` reflects total groups.
+- **DTO update**: `BasicFilterDto` now includes optional `aggregates?: string[]`.
+
+## Caveats
+- `populateGroup` is **not** supported when grouping on relation fields (e.g., `state.name`, `city.name`). Use it for scalar group-by fields only; otherwise fetch group metadata and then retrieve records in a separate call with the group key.
+- Sorting works for group keys without extra colons (e.g., `state.name`) and for aggregate aliases (e.g., `id_max`). For date bucket group keys with granularity/format (`createdAt:month:YYYY`), the sort parser treats the last segment as the order; results may vary by driver and may not sort as expected in all cases.
+
+## Usage Examples (PincodeMaster)
+Assume `PincodeMaster` has many-to-one `state` and `city` relations and a `createdAt` timestamp.
+
+### 1) Group by State and City
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=state.name&groupBy[1]=city.name
+```
+Returns groups for every state/city combination with default `count(*)` aggregate.
+
+### 2) Group by Relation + Filter on Relation
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=state.name&filters[state][name][$eq]=Maharashtra
+```
+Groups by state name but only for rows where state is Maharashtra.
+
+### 3) Multiple Group Fields (Relation + Scalar)
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=state.name&groupBy[1]=city.name&groupBy[2]=pincode
+```
+Group names are ordered: state → city → pincode.
+
+### 4) Group by Date with Granularity (Month)
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=createdAt:month
+```
+Groups by month (driver-aware), default group labels are raw date buckets.
+
+### 5) Date Granularity with Formatting
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=createdAt:month:MMM
+```
+Group labels use short month names (Jan, Feb, …). For full names: `createdAt:month:MMMM`. Other formats: `YYYY`, `YYYY-MM`, `YYYY-MM-DD`.
+
+### 6) Aggregates (Count Distinct)
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=state.name&aggregates[0]=pincode:count_distinct
+```
+Shows distinct pincodes per state.
+
+### 7) Aggregates (Multiple)
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=state.name&groupBy[1]=city.name&aggregates[0]=id:count&aggregates[1]=id:count_distinct
+```
+Returns both total rows and distinct IDs per state/city group.
+
+### 8) Date Granularity + Relations + Aggregates
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=createdAt:year&groupBy[1]=state.name&aggregates[0]=pincode:count_distinct
+```
+Distinct pincodes per state, per year.
+
+### 9) Filters with Grouping (Many-to-One)
+```
+GET /api/pincode-master?offset=0&limit=200&groupBy[0]=state.name&groupBy[1]=city.name&filters[state][name][$eq]=Nagaland
+```
+Groups only rows where state.name = Nagaland.
+
+### 10) Group Sorting and Pagination
+- Sorting applies to the group rows. Example:
+```
+GET /api/pincode-master?offset=0&limit=50&groupBy[0]=state.name&sort[0]=state.name:ASC
+```
+- Pagination (`offset/limit`) limits the number of groups returned; total group count remains in `meta.totalRecords`.
+
+## Notes and Behavior
+- If `aggregates` is omitted, `COUNT(*)` is added automatically.
+- Group names reflect `groupBy` order and apply formatting when specified.
+- Group queries reuse joins from filters when possible; otherwise, they create necessary joins for relation paths.
+- Non-grouped find behavior remains unchanged.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.200",
+  "version": "1.2.202",
   "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/commands/fixtures/fixtures-setup.command.ts

@@ -0,0 +1,44 @@
+import { Command, CommandRunner, Option } from 'nest-commander';
+import { FixturesService } from 'src/services/fixtures.service';
+
+interface CommandOptions {
+  scenario: string;
+  module: string;
+}
+
+@Command({
+  name: 'fixtures setup',
+  description: 'Handles setup and tear down of fixtures for the SolidX application',
+})
+export class FixturesSetupCommand extends CommandRunner {
+  constructor(
+    private readonly fixturesService: FixturesService,
+  ) {
+    super();
+  }
+
+  async run(_passedParam: string[], options?: CommandOptions): Promise<void> {
+    await this.fixturesService.setupFixtures(options.module, options.scenario);
+  }
+
+  // Accept the task name i.e setup/tear-down for the fixtures command
+  @Option({
+    flags: '-s, --scenario [scenario name]',
+    description: 'Setup scenario name for the fixtures command',
+    required: true,
+  })
+  parseScenario(val: string): string {
+    return val;
+  }
+
+  // Accept the module name as an argument
+  @Option({
+    flags: '-m, --module-name [module name]',
+    description: 'Module Name from the ss_model_metadata table',
+    required: true,
+  })
+  parseModule(val: string): string {
+    return val;
+  }
+
+}

package/src/commands/fixtures/fixtures-tear-down.command.ts

@@ -0,0 +1,45 @@
+import { Logger } from '@nestjs/common';
+import { Command, CommandRunner, Option } from 'nest-commander';
+import { SolidIntrospectService } from 'src/services/solid-introspect.service';
+
+interface CommandOptions {
+  scenario: string;
+  module: string;
+}
+
+@Command({
+  name: 'fixtures tear-down',
+  description: 'Handles setup and tear down of fixtures for the SolidX application',
+})
+export class FixturesTearDownCommand extends CommandRunner {
+  constructor(
+    private readonly introspectService: SolidIntrospectService,
+  ) {
+    super();
+  }
+  private readonly logger = new Logger(this.constructor.name);
+
+  async run(_passedParam: string[], options?: CommandOptions): Promise<void> {
+  }
+
+  // Accept the task name i.e setup/tear-down for the fixtures command
+  @Option({
+    flags: '-s, --scenario [scenario name]',
+    description: 'Setup scenario name for the fixtures command',
+    required: true,
+  })
+  parseScenario(val: string): string {
+    return val;
+  }
+
+  // Accept the module name as an argument
+  @Option({
+    flags: '-m, --module [module name]',
+    description: 'Module Name from the ss_model_metadata table',
+    required: true,
+  })
+  parseModule(val: string): string {
+    return val;
+  }
+
+}

package/src/commands/refresh-model.command.ts

@@ -1,7 +1,8 @@
-import { BadRequestException, Logger } from '@nestjs/common';
+import { BadRequestException, forwardRef, Inject, Logger } from '@nestjs/common';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { CommandError } from './helper';
+import { In } from 'typeorm';
 
 interface CommandOptions {
   name?: string;
@@ -17,6 +18,7 @@ interface CommandOptions {
 })
 export class RefreshModelCommand extends CommandRunner {
   constructor(
+    @Inject(forwardRef(() => ModelMetadataService))
     private readonly modelMetadataService: ModelMetadataService,
   ) {
     super();

package/src/config/cache.options.ts

@@ -3,15 +3,19 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { redisStore } from 'cache-manager-redis-store';
 import { isRedisConfigured } from 'src/helpers/environment.helper';
 
-export const RedisOptions: CacheModuleAsyncOptions = {
+export const CacheManagerOptions: CacheModuleAsyncOptions = {
     isGlobal: true,
     imports: [ConfigModule],
     useFactory: async (configService: ConfigService) => {
+
+        // This defaults to in-memory cache
         if (!isRedisConfigured(configService)) {
             return {
                 ttl: 0
-            } // This defaults to in-memory cache
+            }
         }
+
+        // If redis is configured we use that...
         const store = await createRedisStore(configService);
         return {
             store: () => store,
@@ -28,4 +32,3 @@ async function createRedisStore(configService: ConfigService<Record<string, unkn
         },
     });
 }
-

package/src/config/iam.config.ts

@@ -26,6 +26,7 @@ export const iamConfig = registerAs('iam', () => {
         iamAutoGeneratedPassword:process.env.IAM_AUTOGENERATED_PASSWORD || true,
         passwordPepper: process.env.IAM_PASSWORD_PEPPER || '', // Adding a pepper to the password hashing process for extra security,
         showNameFieldsForRegistration:process.env.IAM_SHOW_NAME_FIELDS_FOR_REGISTRATION === 'true' ? true : false,
+        sendWelcomeEmailOnSignup: (process.env.IAM_SEND_WELCOME_EMAIL_ON_SIGNUP ?? 'false').toLowerCase() === 'true',
+        sendWelcomeSmsOnSignup: (process.env.IAM_SEND_WELCOME_SMS_ON_SIGNUP ?? 'false').toLowerCase() === 'true',
     };
 })
-

package/src/constants/error-messages.ts

@@ -84,7 +84,7 @@ export const ERROR_MESSAGES = {
     FIELD_NOT_FOUND: (id: number | string) => `No field with id #${id} exists`,
     PROVIDER_NOT_FOUND: (provider: string) => `Field incorrectly configured. No provider with name ${provider} registered in backend.`,
     FILE_WRITE_FAILED: 'File creation failed, rolling back transaction',
-
+    FILE_DELETE_FAILED: 'File deletion failed, rolling back transaction',
     // file service errors
     FILE_NOT_FOUND: 'File not found',
     FILE_COPY_ERROR: 'Error copying file',
@@ -123,4 +123,10 @@ export const ERROR_MESSAGES = {
     UNABLE_TO_RESOLVE_MCP_HANDLER: 'Unable to resolve a mcp tool handler.',
 
     DEFAULT_REGEX_PATTERN_NOT_MATCHING_ERROR_MSG: 'Invalid regex pattern.',
+
+    PERMISSION_MESSAGES: {
+    insertMany: (model?: string) =>
+      `You do not have permission to import ${model ?? 'these'} records.`,
+    } as Record<string, (model?: string) => string>,
+
 };

package/src/controllers/model-metadata.controller.ts

@@ -5,6 +5,7 @@ import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { UpdateModelMetaDataDto } from '../dtos/update-model-metadata.dto';
 import { ModelMetadataService } from '../services/model-metadata.service';
+import { NavigationDto } from 'src/dtos/navigation.dto';
 
 @Controller('model-metadata')
 @ApiTags("Solid Core")
@@ -43,13 +44,31 @@ export class ModelMetadataController {
             offset: 0,
             filters: [],
             groupBy: [],
-            populate: [],   
+            populate: [],
             populateMedia: [],
             sort: []
         }
         return this.modelMetadataService.findMany(basicFilterDto);
     }
 
+    @ApiBearerAuth("jwt")
+    @ApiQuery({ name: 'modelName', required: true, type: String })
+    @ApiQuery({ name: 'recordId', required: true, type: Number })
+    @ApiQuery({ name: 'limit', required: false, type: Number })
+    @ApiQuery({ name: 'offset', required: false, type: Number })
+    @ApiQuery({ name: 'fields', required: false, type: Array })
+    @ApiQuery({ name: 'sort', required: false, type: Array })
+    @ApiQuery({ name: 'groupBy', required: false, type: Array })
+    @ApiQuery({ name: 'populate', required: false, type: Array })
+    @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+    @ApiQuery({ name: 'filters', required: false, type: Array })
+    @Get("/navigation")
+    async navigation(
+        @Query() navigationDto: NavigationDto
+    ) {
+        return this.modelMetadataService.navigation(navigationDto);
+    }
+
     @ApiBearerAuth("jwt")
     @Get(':id')
     findOne(@Param('id', ParseIntPipe) id: number, @Query() query: any) {
@@ -94,4 +113,5 @@ export class ModelMetadataController {
         return this.modelMetadataService.remove(id);
     }
 
+
 }

package/src/controllers/model-sequence.controller.ts

@@ -0,0 +1,93 @@
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { ModelSequenceService } from '../services/model-sequence.service';
+import { CreateModelSequenceDto } from '../dtos/create-model-sequence.dto';
+import { UpdateModelSequenceDto } from '../dtos/update-model-sequence.dto';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('model-sequence')
+export class ModelSequenceController {
+  constructor(private readonly service: ModelSequenceService) {}
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateModelSequenceDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateModelSequenceDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateModelSequenceDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateModelSequenceDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-recover')
+  async recoverMany(@Body() ids: number[]) {
+    return this.service.recoverMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+    
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array }) 
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  async findMany(@Query() query: any) { 
+    return this.service.find(query);  
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete('/bulk')
+  async deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete(':id')
+  async delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+
+
+}

package/src/controllers/setting.controller.ts

@@ -8,117 +8,125 @@ import { CreateSettingDto } from '../dtos/create-setting.dto';
 import { UpdateSettingDto } from '../dtos/update-setting.dto';
 import { SettingService } from '../services/setting.service';
 
-@ApiTags('Solid Core') 
+@ApiTags('Solid Core')
 @Controller('setting') //FIXME: Change this to the model plural name 
 export class SettingController {
-  constructor(private readonly service: SettingService) {}
+  constructor(private readonly service: SettingService) { }
 
   @ApiBearerAuth("jwt")
   @Post()
   @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.create(createDto, files,solidRequestContext);
+  create(@Body() createDto: CreateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.create(createDto, files, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Post('/bulk')
   @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateSettingDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.insertMany(createDtos, filesArray,solidRequestContext);
+  insertMany(@Body() createDtos: CreateSettingDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.insertMany(createDtos, filesArray, solidRequestContext);
   }
 
+  /**
+   * Important to keep this method just above the @Put(':id') definition that follows as otherwise it will conflict. 
+   * 
+   * @param body 
+   * @param files 
+   * @returns 
+   */
+  @ApiBearerAuth("jwt")
+  @Put('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  async updateSettings(@Body() body: any, @UploadedFiles() files: Array<Express.Multer.File>) {
+    let settings: CreateSettingDto[] = [];
+
+    try {
+      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
+    } catch (e) {
+      throw new BadRequestException('Invalid settings payload');
+    }
+    return this.service.updateSettings(settings, files);
+  }
 
   @ApiBearerAuth("jwt")
   @Put(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.update(id, updateDto, files,false,solidRequestContext);
+  update(@Param('id') id: number, @Body() updateDto: UpdateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.update(id, updateDto, files, false, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Patch(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.update(id, updateDto, files, true,solidRequestContext);
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateSettingDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.update(id, updateDto, files, true, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Get('/wrapped')
   @Public()
   async wrapSettings() {
-      return this.service.wrapSettings();
+    return this.service.wrapSettings();
   }
 
   @Get()
   async getAllSettings() {
     return this.service.getAllSettings();
   }
-    
+
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showHeader', required: false, type: String })
+  @ApiQuery({ name: 'inListView', required: false, type: String })
+  @Get('/get-mcp-url')
+  getMcpUrl(@Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.getMcpUrl(query, solidRequestContext);
+
+  }
+
   @ApiBearerAuth("jwt")
   @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
   @ApiQuery({ name: 'showOnlySoftDeleted', required: false, type: Boolean })
   @ApiQuery({ name: 'limit', required: false, type: Number })
   @ApiQuery({ name: 'offset', required: false, type: Number })
   @ApiQuery({ name: 'fields', required: false, type: Array })
-  @ApiQuery({ name: 'sort', required: false, type: Array }) 
+  @ApiQuery({ name: 'sort', required: false, type: Array })
   @ApiQuery({ name: 'groupBy', required: false, type: Array })
   @ApiQuery({ name: 'populate', required: false, type: Array })
   @ApiQuery({ name: 'populateMedia', required: false, type: Array })
   @ApiQuery({ name: 'filters', required: false, type: Array })
   @Get()
-  async findMany(@Query() query: any,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) { 
-    return this.service.find(query,solidRequestContext);  
+  async findMany(@Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.find(query, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Get(':id')
-  async findOne(@Param('id') id: string, @Query() query: any,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.findOne(+id, query,solidRequestContext);
+  async findOne(@Param('id') id: string, @Query() query: any, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.findOne(+id, query, solidRequestContext);
   }
 
   @Delete('/bulk')
-  async deleteMany(@Body() ids: number[],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.deleteMany(ids,solidRequestContext);
+  async deleteMany(@Body() ids: number[], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.deleteMany(ids, solidRequestContext);
   }
 
   @ApiBearerAuth("jwt")
   @Delete(':id')
-  async delete(@Param('id') id: number,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.delete(id,solidRequestContext);
+  async delete(@Param('id') id: number, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.delete(id, solidRequestContext);
   }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk-update')
-  @UseInterceptors(AnyFilesInterceptor())
-  async updateSettings(
-    @Body() body: any,
-    @UploadedFiles() files: Array<Express.Multer.File>
-  ) {
-    let settings: CreateSettingDto[] = [];
+  // @ApiBearerAuth("jwt")
+  // @Post('/bulk/user')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // async updateUserSettings(@Body() body: any, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   let settings: CreateSettingDto[] = [];
+  //   try {
+  //     settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
+  //   } catch (e) {
+  //     throw new BadRequestException('Invalid settings payload');
+  //   }
+  //   return this.service.updateSettings(settings, files);
+  // }
 
-    try {
-      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
-    } catch (e) {
-      throw new BadRequestException('Invalid settings payload');
-    }
-    return this.service.updateSettings(settings, files);
-  }
-
-
-  @ApiBearerAuth("jwt")
-  @Post('/bulk/user')
-  @UseInterceptors(AnyFilesInterceptor())
-  async updateUserSettings(
-    @Body() body: any,
-    @UploadedFiles() files: Array<Express.Multer.File>
-  ) {
-    let settings: CreateSettingDto[] = [];
-
-    try {
-      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
-    } catch (e) {
-      throw new BadRequestException('Invalid settings payload');
-    }
-    return this.service.updateSettings(settings, files);
-  }
 }

package/src/decorators/sms-provider.decorator.ts

@@ -0,0 +1,7 @@
+export const IS_SMS_PROVIDER = 'IS_SMS_PROVIDER';
+
+export const SmsProvider = () => {
+    return (target: Function) => {
+        Reflect.defineMetadata(IS_SMS_PROVIDER, true, target);
+    };
+};

package/src/dtos/basic-filters.dto.ts

@@ -3,6 +3,7 @@ import { ApiProperty } from "@nestjs/swagger";
 import { IsEnum, IsOptional } from "class-validator";
 import { PaginationQueryDto } from "./pagination-query.dto";
 import { Timestamp } from "typeorm";
+import { BasicGroupFilterDto } from "./basic-group-filters.dto";
 
 export enum SoftDeleteFilter {
     INCLUSIVE = "inclusive",
@@ -23,6 +24,10 @@ export class BasicFilterDto extends PaginationQueryDto {
     @ApiProperty({ description: "groupBy" })
     readonly groupBy?: string[];
 
+    @IsOptional()
+    @ApiProperty({ description: "aggregates" })
+    readonly aggregates?: string[];
+
 
     @IsOptional()
     @ApiProperty({ description: "populate" })
@@ -51,7 +56,7 @@ export class BasicFilterDto extends PaginationQueryDto {
 
     @IsOptional()
     @ApiProperty({ description: "groupFilter" })
-    groupFilter?: BasicFilterDto
+    groupFilter?: BasicGroupFilterDto
 
     @IsOptional()
     @ApiProperty({ description: "locale" })

package/src/dtos/basic-group-filters.dto.ts

@@ -0,0 +1,23 @@
+import { Type } from "class-transformer";
+import { IsInt, IsPositive, Min } from "class-validator";
+
+import { ApiProperty } from "@nestjs/swagger";
+import { IsOptional } from "class-validator";
+
+
+export class BasicGroupFilterDto {
+    @IsOptional()
+    @Type(() => Number)
+    @IsPositive()
+    limit?: number = 10;
+
+    @IsOptional()
+    @Type(() => Number)
+    @IsInt()
+    @Min(0)
+    offset?: number = 0;
+
+    @IsOptional()
+    @ApiProperty({ description: "sort" })
+    sort?: string[];
+}

package/src/dtos/create-field-metadata.dto.ts

@@ -385,7 +385,7 @@ export class CreateFieldMetadataDto {
   @ApiProperty({ description: 'Static values for selection. Only for type=selectionStatic', })
   @IsArray()
   @IsString({ each: true })
-  @Matches(/^[\w\s\d-]+:[\w\s-]+$/, { each: true })
+  @Matches(/^[\w\s\d\-\/]+:[\w\s\-\/]+$/, { each: true })
   @IsOptional()
   selectionStaticValues: string[];