@solidxai/core 0.1.9 → 0.1.10-beta.2

package/src/controllers/user.controller.ts

@@ -20,37 +20,37 @@ export class UserController {
   @ApiBearerAuth("jwt")
   @Post()
   @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateUserDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.create(createDto, files,solidRequestContext);
+  create(@Body() createDto: CreateUserDto, @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: CreateUserDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [],@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.insertMany(createDtos, filesArray,solidRequestContext);
+  insertMany(@Body() createDtos: CreateUserDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = [], @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.insertMany(createDtos, filesArray, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Put(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @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: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.update(id, updateDto, files, false, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Patch(':id/update-user-and-roles')
-  updateUser(@Param('id') id: number,@Body() updateDto: any, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
-    return this.service.updateUser(id, updateDto, files,solidRequestContext);
+  updateUser(@Param('id') id: number, @Body() updateDto: any, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
+    return this.service.updateUser(id, updateDto, files, solidRequestContext);
   }
 
 
   @ApiBearerAuth("jwt")
   @Patch(':id')
   @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File>,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateUserDto, @UploadedFiles() files: Array<Express.Multer.File>, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
     return this.service.update(id, updateDto, files, true, solidRequestContext);
   }
 
@@ -67,8 +67,8 @@ export class UserController {
   @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")
@@ -81,18 +81,18 @@ export class UserController {
 
   @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) {
+  async delete(@Param('id') id: number, @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto) {
     return this.service.delete(id, solidRequestContext);
   }
 

package/src/services/crud.service.ts

@@ -920,7 +920,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             );
 
             return { message: SUCCESS_MESSAGES.RECORD_RECOVERED, data: softDeletedRows };
-        } catch (error) {
+        } catch (error: any) {
             if (error instanceof QueryFailedError) {
                 if ((error as any).code === '23505') {
                     throw new Error(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);
@@ -966,7 +966,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             );
 
             return { message: SUCCESS_MESSAGES.SELECTED_RECORDS_RECOVERED, recoveredIds: ids };
-        } catch (error) {
+        } catch (error: any) {
             if (error instanceof QueryFailedError) {
                 if ((error as any).code === "23505") {
                     throw new Error(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);

package/src/services/field-metadata.service.ts

@@ -745,6 +745,8 @@ export class FieldMetadataService implements OnApplicationBootstrap {
                     "type",
                     "ormType",
                     "isSystem",
+                    "regexPattern",
+                    "regexPatternNotMatchingErrorMsg",
                     "defaultValue",
                     "min",
                     "max",
@@ -772,8 +774,6 @@ export class FieldMetadataService implements OnApplicationBootstrap {
                     "regexPattern",
                     "regexPatternNotMatchingErrorMsg",
                     "defaultValue",
-                    "min",
-                    "max",
                     "required",
                     "unique",
                     "index",

package/src/services/queues/database-subscriber.service.ts

@@ -16,9 +16,9 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
         protected readonly mqMessageQueueService: MqMessageQueueService,
         protected readonly poller: PollerService,
     ) {
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
-        if (!this.serviceRole) {
-            this.logger.debug('Queue service Role is not defined in the environment variables');
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting DatabaseSubscriber service role to "both".');
         }
         // this.logger.debug(`DatabaseSubscriber instance created with options: ${JSON.stringify(this.options())}`);
     }
@@ -60,7 +60,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
 
             await this.processMessage(message);
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(`Error processing message: ${error.message}`);
 
             // if an error occurs then if retryCount is set we start retrying. 
@@ -152,7 +152,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
     private async retryMessage(message: QueueMessage<T>) {
         try {
             await this.processMessage(message);
-        } catch (error) {
+        } catch (error: any) {
             if (message.currentRetry < message.retryCount) {
                 await this.updateStatusInDatabase('retrying', message);
 
@@ -203,7 +203,7 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
                 this.logger.debug(`Message status updated to ${stage} for messageId: ${mqMessage.id}`);
             }
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(error.message, error.stack);
         }
     }

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -31,12 +31,12 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
 
     constructor(protected readonly mqMessageService: MqMessageService, protected readonly mqMessageQueueService: MqMessageQueueService) {
         this.url = process.env.QUEUES_RABBIT_MQ_URL;
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
         if (!this.url) {
             this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');
         }
-        if (!this.serviceRole) {
-            this.logger.debug('Queue service Role is not defined in the environment variables');
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting RabbitMqSubscriber service role to "both".');
         }
         // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
@@ -85,7 +85,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
     async onModuleInit(): Promise<void> {
         // Not using SettingService here as that will necessitate all implementors of RabbitMqSubscriber to also inject SettingService which is not ideal. 
         // Instead we directly read the environment variables here.
-        const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'rabbitmq';
+        const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'database';
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         const queueNameRegex = (process.env.QUEUES_QUEUE_NAME_REGEX_TO_ENABLE || '').trim();
         const roleAllowed = ['both', 'subscriber'].includes(this.serviceRole);
@@ -407,7 +407,7 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
                 await this.mqMessageService.repo.update(mqMessage.id, updatedFields);
             }
         }
-        catch (error) {
+        catch (error: any) {
             this.logger.error(error.message, error.stack);
         }
 

package/src/services/queues/redis-subscriber.service.ts

@@ -17,7 +17,10 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,
     ) {
-        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE || 'both';
+        if (!process.env.QUEUES_SERVICE_ROLE) {
+            this.logger.debug('QUEUES_SERVICE_ROLE is not defined. Defaulting RedisSubscriber service role to "both".');
+        }
         if (!process.env.QUEUES_REDIS_URL) {
             this.logger.debug('RedisSubscriber: QUEUES_REDIS_URL is not defined in the environment variables');
         }
@@ -201,7 +204,7 @@ export abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestro
                 if (stage === 'failed') updatedFields['error'] = error;
                 await this.mqMessageService.repo.update(mqMessage.id, updatedFields);
             }
-        } catch (err) {
+        } catch (err: any) {
             this.logger.error(err.message, err.stack);
         }
     }

package/src/solid-core.module.ts

@@ -1,3 +1,4 @@
+import 'multer';
 import { Global, MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import * as express from 'express';
 import { ConfigModule, ConfigService } from '@nestjs/config';

package/src/testing/reporter/webhook-reporter.ts

@@ -0,0 +1,116 @@
+import { ConsoleReporter } from "./console-reporter";
+import type { OpStep, ScenarioSpec } from "../contracts/testing-metadata.types";
+import type { StepPhase } from "../contracts/runtime-context.types";
+
+interface TestStepResult {
+  phase: string;
+  operation: string;
+  name?: string;
+  ok: boolean;
+  durationMs: number;
+  error?: string;
+}
+
+interface TestScenarioResult {
+  id: string;
+  name?: string;
+  ok: boolean;
+  durationMs: number;
+  error?: string;
+  steps: TestStepResult[];
+}
+
+export interface TestRunPayload {
+  runName: string;
+  startedAt: string;
+  completedAt: string;
+  durationMs: number;
+  exitCode: number;
+  total: number;
+  passed: number;
+  failed: number;
+  scenarios: TestScenarioResult[];
+}
+
+function formatError(err: unknown): string {
+  if (!err) return "";
+  if (err instanceof Error) return err.stack || err.message;
+  return String(err);
+}
+
+export class WebhookReporter extends ConsoleReporter {
+  private readonly startedAt = new Date();
+  private readonly accumulated: TestScenarioResult[] = [];
+  private currentSteps: TestStepResult[] = [];
+
+  constructor(
+    private readonly webhookUrl: string,
+    private readonly runName: string,
+  ) {
+    super();
+  }
+
+  override onStepEnd(args: {
+    scenarioId: string;
+    phase: StepPhase;
+    step: OpStep;
+    ok: boolean;
+    error?: unknown;
+    durationMs: number;
+  }): void {
+    super.onStepEnd(args);
+    this.currentSteps.push({
+      phase: String(args.phase),
+      operation: args.step.op,
+      name: args.step.name,
+      ok: args.ok,
+      durationMs: args.durationMs,
+      error: args.error ? formatError(args.error) : undefined,
+    });
+  }
+
+  override onScenarioEnd(
+    scenario: ScenarioSpec,
+    result: { ok: boolean; error?: unknown; durationMs: number },
+  ): void {
+    super.onScenarioEnd(scenario, result);
+    this.accumulated.push({
+      id: scenario.id,
+      name: scenario.name,
+      ok: result.ok,
+      durationMs: result.durationMs,
+      error: result.error ? formatError(result.error) : undefined,
+      steps: [...this.currentSteps],
+    });
+    this.currentSteps = [];
+  }
+
+  async flush(exitCode: number): Promise<void> {
+    const completedAt = new Date();
+    const payload: TestRunPayload = {
+      runName: this.runName,
+      startedAt: this.startedAt.toISOString(),
+      completedAt: completedAt.toISOString(),
+      durationMs: completedAt.getTime() - this.startedAt.getTime(),
+      exitCode,
+      total: this.accumulated.length,
+      passed: this.accumulated.filter((s) => s.ok).length,
+      failed: this.accumulated.filter((s) => !s.ok).length,
+      scenarios: this.accumulated,
+    };
+
+    try {
+      const response = await fetch(this.webhookUrl, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(payload),
+        signal: AbortSignal.timeout(10_000),
+      });
+      if (!response.ok) {
+        console.warn(`[WebhookReporter] Webhook returned ${response.status}`);
+      }
+    } catch (err) {
+      console.warn(`[WebhookReporter] Failed to deliver test results: ${err}`);
+    }
+  }
+}