@solidxai/core 0.1.6-beta.6 → 0.1.6-beta.9

package/dist/controllers/scheduled-job.controller.d.ts

@@ -39,5 +39,6 @@ export declare class ScheduledJobController {
     findOne(id: string, query: any): Promise<import("..").ScheduledJob>;
     deleteMany(ids: number[]): Promise<any>;
     delete(id: number): Promise<import("..").ScheduledJob>;
+    triggerRun(id: string): Promise<import("..").ScheduledJob>;
 }
 //# sourceMappingURL=scheduled-job.controller.d.ts.map

package/dist/controllers/scheduled-job.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.controller.d.ts","sourceRoot":"","sources":["../../src/controllers/scheduled-job.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAOzE,qBAEa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,mBAAmB;IAKzD,MAAM,CAAS,SAAS,EAAE,qBAAqB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAOnG,UAAU,CAAS,UAAU,EAAE,qBAAqB,EAAE,EAAmB,UAAU,GAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAO;IAQjH,MAAM,CAAc,EAAE,EAAE,MAAM,EAAU,SAAS,EAAE,qBAAqB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAO5H,aAAa,CAAc,EAAE,EAAE,MAAM,EAAU,SAAS,EAAE,qBAAqB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAM7H,WAAW,CAAS,GAAG,EAAE,MAAM,EAAE;;;;IAMjC,OAAO,CAAc,EAAE,EAAE,MAAM;;;;IAe/B,QAAQ,CAAU,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;IAM5B,OAAO,CAAc,EAAE,EAAE,MAAM,EAAW,KAAK,EAAE,GAAG;IAMpD,UAAU,CAAS,GAAG,EAAE,MAAM,EAAE;IAMhC,MAAM,CAAc,EAAE,EAAE,MAAM;CAKrC"}
+{"version":3,"file":"scheduled-job.controller.d.ts","sourceRoot":"","sources":["../../src/controllers/scheduled-job.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAOzE,qBAEa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,mBAAmB;IAKzD,MAAM,CAAS,SAAS,EAAE,qBAAqB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAOnG,UAAU,CAAS,UAAU,EAAE,qBAAqB,EAAE,EAAmB,UAAU,GAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAO;IAQjH,MAAM,CAAc,EAAE,EAAE,MAAM,EAAU,SAAS,EAAE,qBAAqB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAO5H,aAAa,CAAc,EAAE,EAAE,MAAM,EAAU,SAAS,EAAE,qBAAqB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAM7H,WAAW,CAAS,GAAG,EAAE,MAAM,EAAE;;;;IAMjC,OAAO,CAAc,EAAE,EAAE,MAAM;;;;IAe/B,QAAQ,CAAU,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;IAM5B,OAAO,CAAc,EAAE,EAAE,MAAM,EAAW,KAAK,EAAE,GAAG;IAMpD,UAAU,CAAS,GAAG,EAAE,MAAM,EAAE;IAMhC,MAAM,CAAc,EAAE,EAAE,MAAM;IAM9B,UAAU,CAAc,EAAE,EAAE,MAAM;CAKzC"}

package/dist/controllers/scheduled-job.controller.js

@@ -59,6 +59,9 @@ let ScheduledJobController = class ScheduledJobController {
     async delete(id) {
         return this.service.delete(id);
     }
+    async triggerRun(id) {
+        return this.service.triggerRun(+id);
+    }
 };
 exports.ScheduledJobController = ScheduledJobController;
 __decorate([
@@ -171,6 +174,15 @@ __decorate([
     __metadata("design:paramtypes", [Number]),
     __metadata("design:returntype", Promise)
 ], ScheduledJobController.prototype, "delete", null);
+__decorate([
+    (0, swagger_1.ApiBearerAuth)("jwt"),
+    (0, common_1.Post)(':id/trigger'),
+    openapi.ApiResponse({ status: 201, type: require("../entities/scheduled-job.entity").ScheduledJob }),
+    __param(0, (0, common_1.Param)('id')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], ScheduledJobController.prototype, "triggerRun", null);
 exports.ScheduledJobController = ScheduledJobController = __decorate([
     (0, swagger_1.ApiTags)('Solid Core'),
     (0, common_1.Controller)('scheduled-job'),

package/dist/controllers/scheduled-job.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.controller.js","sourceRoot":"","sources":["../../src/controllers/scheduled-job.controller.ts"],"names":[],"mappings":"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","sourcesContent":["import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';\nimport { AnyFilesInterceptor } from \"@nestjs/platform-express\";\nimport { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';\nimport { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';\nimport { UpdateScheduledJobDto } from 'src/dtos/update-scheduled-job.dto';\nimport { ScheduledJobService } from 'src/services/scheduled-job.service';\n\nenum ShowSoftDeleted {\n  INCLUSIVE = \"inclusive\",\n  EXCLUSIVE = \"exclusive\",\n}\n\n@ApiTags('Solid Core')\n@Controller('scheduled-job')\nexport class ScheduledJobController {\n  constructor(private readonly service: ScheduledJobService) { }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post()\n  @UseInterceptors(AnyFilesInterceptor())\n  create(@Body() createDto: CreateScheduledJobDto, @UploadedFiles() files: Array<Express.Multer.File>) {\n    return this.service.create(createDto, files);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post('/bulk')\n  @UseInterceptors(AnyFilesInterceptor())\n  insertMany(@Body() createDtos: CreateScheduledJobDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {\n    return this.service.insertMany(createDtos, filesArray);\n  }\n\n\n  @ApiBearerAuth(\"jwt\")\n  @Put(':id')\n  @UseInterceptors(AnyFilesInterceptor())\n  update(@Param('id') id: number, @Body() updateDto: UpdateScheduledJobDto, @UploadedFiles() files: Array<Express.Multer.File>) {\n    return this.service.update(id, updateDto, files);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Patch(':id')\n  @UseInterceptors(AnyFilesInterceptor())\n  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateScheduledJobDto, @UploadedFiles() files: Array<Express.Multer.File>) {\n    return this.service.update(id, updateDto, files, true);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post('/bulk-recover')\n  async recoverMany(@Body() ids: number[]) {\n    return this.service.recoverMany(ids);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Get('/recover/:id')\n  async recover(@Param('id') id: number) {\n    return this.service.recover(id);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })\n  @ApiQuery({ name: 'limit', required: false, type: Number })\n  @ApiQuery({ name: 'offset', required: false, type: Number })\n  @ApiQuery({ name: 'fields', required: false, type: Array })\n  @ApiQuery({ name: 'sort', required: false, type: Array })\n  @ApiQuery({ name: 'groupBy', required: false, type: Array })\n  @ApiQuery({ name: 'populate', required: false, type: Array })\n  @ApiQuery({ name: 'populateMedia', required: false, type: Array })\n  @ApiQuery({ name: 'filters', required: false, type: Array })\n  @Get()\n  async findMany(@Query() query: any) {\n    return this.service.find(query);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Get(':id')\n  async findOne(@Param('id') id: string, @Query() query: any) {\n    return this.service.findOne(+id, query);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Delete('/bulk')\n  async deleteMany(@Body() ids: number[]) {\n    return this.service.deleteMany(ids);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Delete(':id')\n  async delete(@Param('id') id: number) {\n    return this.service.delete(id);\n  }\n\n\n}\n"]}
+{"version":3,"file":"scheduled-job.controller.js","sourceRoot":"","sources":["../../src/controllers/scheduled-job.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA+H;AAC/H,+DAA+D;AAC/D,6CAAmE;AACnE,+EAA0E;AAC1E,+EAA0E;AAC1E,6EAAyE;AAEzE,IAAK,eAGJ;AAHD,WAAK,eAAe;IAClB,0CAAuB,CAAA;IACvB,0CAAuB,CAAA;AACzB,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAIM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAA6B,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;IAAI,CAAC;IAK9D,MAAM,CAAS,SAAgC,EAAmB,KAAiC;QACjG,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAKD,UAAU,CAAS,UAAmC,EAAmB,aAAsC,EAAE;QAC/G,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;IAMD,MAAM,CAAc,EAAU,EAAU,SAAgC,EAAmB,KAAiC;QAC1H,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;IAKD,aAAa,CAAc,EAAU,EAAU,SAAgC,EAAmB,KAAiC;QACjI,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAIK,AAAN,KAAK,CAAC,WAAW,CAAS,GAAa;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAIK,AAAN,KAAK,CAAC,OAAO,CAAc,EAAU;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAaK,AAAN,KAAK,CAAC,QAAQ,CAAU,KAAU;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAIK,AAAN,KAAK,CAAC,OAAO,CAAc,EAAU,EAAW,KAAU;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CAAS,GAAa;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CAAc,EAAU;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CAAc,EAAU;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;CAGF,CAAA;AApFY,wDAAsB;AAMjC;IAHC,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,aAAI,GAAE;IACN,IAAA,wBAAe,EAAC,IAAA,sCAAmB,GAAE,CAAC;;IAC/B,WAAA,IAAA,aAAI,GAAE,CAAA;IAAoC,WAAA,IAAA,sBAAa,GAAE,CAAA;;qCAAvC,gDAAqB,EAA0B,KAAK;;oDAE7E;AAKD;IAHC,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,aAAI,EAAC,OAAO,CAAC;IACb,IAAA,wBAAe,EAAC,IAAA,sCAAmB,GAAE,CAAC;;IAC3B,WAAA,IAAA,aAAI,GAAE,CAAA;IAAuC,WAAA,IAAA,sBAAa,GAAE,CAAA;;;;wDAEvE;AAMD;IAHC,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,wBAAe,EAAC,IAAA,sCAAmB,GAAE,CAAC;;IAC/B,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,aAAI,GAAE,CAAA;IAAoC,WAAA,IAAA,sBAAa,GAAE,CAAA;;6CAAvC,gDAAqB,EAA0B,KAAK;;oDAEtG;AAKD;IAHC,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,cAAK,EAAC,KAAK,CAAC;IACZ,IAAA,wBAAe,EAAC,IAAA,sCAAmB,GAAE,CAAC;;IACxB,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,aAAI,GAAE,CAAA;IAAoC,WAAA,IAAA,sBAAa,GAAE,CAAA;;6CAAvC,gDAAqB,EAA0B,KAAK;;2DAE7G;AAIK;IAFL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,aAAI,EAAC,eAAe,CAAC;;IACH,WAAA,IAAA,aAAI,GAAE,CAAA;;;;yDAExB;AAIK;IAFL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,YAAG,EAAC,cAAc,CAAC;;IACL,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;qDAEzB;AAaK;IAXL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;IAC7E,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1D,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC3D,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC1D,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACxD,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC3D,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC5D,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACjE,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC3D,IAAA,YAAG,GAAE;;IACU,WAAA,IAAA,cAAK,GAAE,CAAA;;;;sDAEtB;AAIK;IAFL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,YAAG,EAAC,KAAK,CAAC;;IACI,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,cAAK,GAAE,CAAA;;;;qDAE9C;AAIK;IAFL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,eAAM,EAAC,OAAO,CAAC;;IACE,WAAA,IAAA,aAAI,GAAE,CAAA;;;;wDAEvB;AAIK;IAFL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,eAAM,EAAC,KAAK,CAAC;;IACA,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;oDAExB;AAIK;IAFL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,aAAI,EAAC,aAAa,CAAC;;IACF,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;wDAE5B;iCAjFU,sBAAsB;IAFlC,IAAA,iBAAO,EAAC,YAAY,CAAC;IACrB,IAAA,mBAAU,EAAC,eAAe,CAAC;qCAEY,2CAAmB;GAD9C,sBAAsB,CAoFlC","sourcesContent":["import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';\nimport { AnyFilesInterceptor } from \"@nestjs/platform-express\";\nimport { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';\nimport { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';\nimport { UpdateScheduledJobDto } from 'src/dtos/update-scheduled-job.dto';\nimport { ScheduledJobService } from 'src/services/scheduled-job.service';\n\nenum ShowSoftDeleted {\n  INCLUSIVE = \"inclusive\",\n  EXCLUSIVE = \"exclusive\",\n}\n\n@ApiTags('Solid Core')\n@Controller('scheduled-job')\nexport class ScheduledJobController {\n  constructor(private readonly service: ScheduledJobService) { }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post()\n  @UseInterceptors(AnyFilesInterceptor())\n  create(@Body() createDto: CreateScheduledJobDto, @UploadedFiles() files: Array<Express.Multer.File>) {\n    return this.service.create(createDto, files);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post('/bulk')\n  @UseInterceptors(AnyFilesInterceptor())\n  insertMany(@Body() createDtos: CreateScheduledJobDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {\n    return this.service.insertMany(createDtos, filesArray);\n  }\n\n\n  @ApiBearerAuth(\"jwt\")\n  @Put(':id')\n  @UseInterceptors(AnyFilesInterceptor())\n  update(@Param('id') id: number, @Body() updateDto: UpdateScheduledJobDto, @UploadedFiles() files: Array<Express.Multer.File>) {\n    return this.service.update(id, updateDto, files);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Patch(':id')\n  @UseInterceptors(AnyFilesInterceptor())\n  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateScheduledJobDto, @UploadedFiles() files: Array<Express.Multer.File>) {\n    return this.service.update(id, updateDto, files, true);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post('/bulk-recover')\n  async recoverMany(@Body() ids: number[]) {\n    return this.service.recoverMany(ids);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Get('/recover/:id')\n  async recover(@Param('id') id: number) {\n    return this.service.recover(id);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })\n  @ApiQuery({ name: 'limit', required: false, type: Number })\n  @ApiQuery({ name: 'offset', required: false, type: Number })\n  @ApiQuery({ name: 'fields', required: false, type: Array })\n  @ApiQuery({ name: 'sort', required: false, type: Array })\n  @ApiQuery({ name: 'groupBy', required: false, type: Array })\n  @ApiQuery({ name: 'populate', required: false, type: Array })\n  @ApiQuery({ name: 'populateMedia', required: false, type: Array })\n  @ApiQuery({ name: 'filters', required: false, type: Array })\n  @Get()\n  async findMany(@Query() query: any) {\n    return this.service.find(query);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Get(':id')\n  async findOne(@Param('id') id: string, @Query() query: any) {\n    return this.service.findOne(+id, query);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Delete('/bulk')\n  async deleteMany(@Body() ids: number[]) {\n    return this.service.deleteMany(ids);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Delete(':id')\n  async delete(@Param('id') id: number) {\n    return this.service.delete(id);\n  }\n\n  @ApiBearerAuth(\"jwt\")\n  @Post(':id/trigger')\n  async triggerRun(@Param('id') id: string) {\n    return this.service.triggerRun(+id);\n  }\n\n\n}\n"]}

package/dist/services/scheduled-job.service.d.ts

@@ -1,13 +1,18 @@
 import { ModuleRef } from "@nestjs/core";
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
+import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { EntityManager } from 'typeorm';
 import { CRUDService } from './crud.service';
+import { SchedulerServiceImpl } from './scheduled-jobs/scheduler.service';
 export declare class ScheduledJobService extends CRUDService<ScheduledJob> {
     readonly entityManager: EntityManager;
     readonly repo: ScheduledJobRepository;
     readonly moduleRef: ModuleRef;
+    private readonly solidRegistry;
+    private readonly schedulerService;
     private readonly logger;
-    constructor(entityManager: EntityManager, repo: ScheduledJobRepository, moduleRef: ModuleRef);
+    constructor(entityManager: EntityManager, repo: ScheduledJobRepository, moduleRef: ModuleRef, solidRegistry: SolidRegistry, schedulerService: SchedulerServiceImpl);
+    triggerRun(id: number): Promise<ScheduledJob>;
 }
 //# sourceMappingURL=scheduled-job.service.d.ts.map

package/dist/services/scheduled-job.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.service.d.ts","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAK9D,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAR/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAIpD,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAC5B,SAAS,EAAE,SAAS;CAKhC"}
+{"version":3,"file":"scheduled-job.service.d.ts","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAK9D,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAVnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAIpD,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAC5B,SAAS,EAAE,SAAS,EACZ,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,oBAAoB;IAMnD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAwBpD"}

package/dist/services/scheduled-job.service.js

@@ -17,17 +17,39 @@ exports.ScheduledJobService = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const typeorm_1 = require("@nestjs/typeorm");
+const solid_registry_1 = require("../helpers/solid-registry");
 const scheduled_job_repository_1 = require("../repository/scheduled-job.repository");
 const typeorm_2 = require("typeorm");
 const crud_service_1 = require("./crud.service");
+const scheduler_service_1 = require("./scheduled-jobs/scheduler.service");
 let ScheduledJobService = ScheduledJobService_1 = class ScheduledJobService extends crud_service_1.CRUDService {
-    constructor(entityManager, repo, moduleRef) {
+    constructor(entityManager, repo, moduleRef, solidRegistry, schedulerService) {
         super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);
         this.entityManager = entityManager;
         this.repo = repo;
         this.moduleRef = moduleRef;
+        this.solidRegistry = solidRegistry;
+        this.schedulerService = schedulerService;
         this.logger = new common_1.Logger(ScheduledJobService_1.name);
     }
+    async triggerRun(id) {
+        const job = await this.repo.findOne({ where: { id } });
+        if (!job) {
+            throw new common_1.NotFoundException(`Scheduled job with id ${id} not found`);
+        }
+        const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
+        if (!handler) {
+            throw new common_1.BadRequestException(`Scheduled job handler not found: ${job.job}`);
+        }
+        this.logger.log(`Manually triggering scheduled job id=${job.id}, job=${job.job}`);
+        await handler.execute(job);
+        const finishedAt = new Date();
+        job.lastRunAt = finishedAt;
+        job.nextRunAt = this.schedulerService.computeNextRunAt(job, finishedAt);
+        await this.repo.save(job);
+        this.logger.log(`Completed manual trigger for scheduled job id=${job.id}, nextRunAt=${job.nextRunAt?.toISOString?.()}`);
+        return job;
+    }
 };
 exports.ScheduledJobService = ScheduledJobService;
 exports.ScheduledJobService = ScheduledJobService = ScheduledJobService_1 = __decorate([
@@ -35,6 +57,8 @@ exports.ScheduledJobService = ScheduledJobService = ScheduledJobService_1 = __de
     __param(0, (0, typeorm_1.InjectEntityManager)()),
     __metadata("design:paramtypes", [typeorm_2.EntityManager,
         scheduled_job_repository_1.ScheduledJobRepository,
-        core_1.ModuleRef])
+        core_1.ModuleRef,
+        solid_registry_1.SolidRegistry,
+        scheduler_service_1.SchedulerServiceImpl])
 ], ScheduledJobService);
 //# sourceMappingURL=scheduled-job.service.js.map

package/dist/services/scheduled-job.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.service.js","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,uCAAyC;AACzC,6CAAsD;AAEtD,qFAAiF;AACjF,qCAAwC;AACxC,iDAA6C;AAGtC,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAGhE,YAEE,aAAqC,EAG5B,IAA4B,EAC5B,SAAoB;QAG7B,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAP3D,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAAwB;QAC5B,cAAS,GAAT,SAAS,CAAW;QARd,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAY/D,CAAC;CACF,CAAA;AAdY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCACE,uBAAa;QAGtB,iDAAsB;QACjB,gBAAS;GATpB,mBAAmB,CAc/B","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { EntityManager } from 'typeorm';\nimport { CRUDService } from './crud.service';\n\n@Injectable()\nexport class ScheduledJobService extends CRUDService<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobService.name);\n\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(ScheduledJob)\n    // readonly repo: Repository<ScheduledJob>,\n    readonly repo: ScheduledJobRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);\n  }\n}\n"]}
+{"version":3,"file":"scheduled-job.service.js","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4F;AAC5F,uCAAyC;AACzC,6CAAsD;AAEtD,8DAA2D;AAC3D,qFAAiF;AACjF,qCAAwC;AACxC,iDAA6C;AAC7C,0EAA0E;AAGnE,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAGhE,YAEE,aAAqC,EAG5B,IAA4B,EAC5B,SAAoB,EACZ,aAA4B,EAC5B,gBAAsC;QAGvD,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAT3D,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAAwB;QAC5B,cAAS,GAAT,SAAS,CAAW;QACZ,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAsB;QAVxC,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAc/D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,0BAAiB,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,+BAA+B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,4BAAmB,CAAC,oCAAoC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAElF,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC;QAC3B,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iDAAiD,GAAG,CAAC,EAAE,eAAe,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAExH,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAA;AAzCY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCACE,uBAAa;QAGtB,iDAAsB;QACjB,gBAAS;QACG,8BAAa;QACV,wCAAoB;GAX9C,mBAAmB,CAyC/B","sourcesContent":["import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { EntityManager } from 'typeorm';\nimport { CRUDService } from './crud.service';\nimport { SchedulerServiceImpl } from './scheduled-jobs/scheduler.service';\n\n@Injectable()\nexport class ScheduledJobService extends CRUDService<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobService.name);\n\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(ScheduledJob)\n    // readonly repo: Repository<ScheduledJob>,\n    readonly repo: ScheduledJobRepository,\n    readonly moduleRef: ModuleRef,\n    private readonly solidRegistry: SolidRegistry,\n    private readonly schedulerService: SchedulerServiceImpl,\n\n  ) {\n    super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);\n  }\n\n  async triggerRun(id: number): Promise<ScheduledJob> {\n    const job = await this.repo.findOne({ where: { id } });\n    if (!job) {\n      throw new NotFoundException(`Scheduled job with id ${id} not found`);\n    }\n\n    const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);\n    if (!handler) {\n      throw new BadRequestException(`Scheduled job handler not found: ${job.job}`);\n    }\n\n    this.logger.log(`Manually triggering scheduled job id=${job.id}, job=${job.job}`);\n\n    await handler.execute(job);\n\n    const finishedAt = new Date();\n    job.lastRunAt = finishedAt;\n    job.nextRunAt = this.schedulerService.computeNextRunAt(job, finishedAt);\n    await this.repo.save(job);\n\n    this.logger.log(`Completed manual trigger for scheduled job id=${job.id}, nextRunAt=${job.nextRunAt?.toISOString?.()}`);\n\n    return job;\n  }\n}\n"]}

package/dist/services/scheduled-jobs/scheduler.interface.d.ts

@@ -1,4 +1,6 @@
+import { ScheduledJob } from "src/entities/scheduled-job.entity";
 export interface ISchedulerService {
     runScheduledJobs(): Promise<void>;
+    computeNextRunAt(job: ScheduledJob, from: Date): Date;
 }
 //# sourceMappingURL=scheduler.interface.d.ts.map

package/dist/services/scheduled-jobs/scheduler.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.interface.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC"}
+{"version":3,"file":"scheduler.interface.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACzD"}

package/dist/services/scheduled-jobs/scheduler.interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.interface.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"","sourcesContent":["export interface ISchedulerService {\n    runScheduledJobs(): Promise<void>;\n}"]}
+{"version":3,"file":"scheduler.interface.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"","sourcesContent":["import { ScheduledJob } from \"src/entities/scheduled-job.entity\";\n\nexport interface ISchedulerService {\n    runScheduledJobs(): Promise<void>;\n    computeNextRunAt(job: ScheduledJob, from: Date): Date;\n}\n"]}

package/dist/services/scheduled-jobs/scheduler.service.d.ts

@@ -1,3 +1,4 @@
+import { ScheduledJob } from 'src/entities/scheduled-job.entity';
 import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { ISchedulerService } from './scheduler.interface';
@@ -9,7 +10,10 @@ export declare class SchedulerServiceImpl implements ISchedulerService {
     constructor(scheduledJobRepo: ScheduledJobRepository, solidRegistry: SolidRegistry);
     runScheduledJobs(): Promise<void>;
     private shouldRunNow;
-    private computeNextRunForCustomCron;
-    private computeNextRunAt;
+    private parseDayOfWeek;
+    private toDateOnly;
+    private toHHMM;
+    computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date;
+    computeNextRunAt(job: ScheduledJob, from: Date): Date;
 }
 //# sourceMappingURL=scheduler.service.d.ts.map

package/dist/services/scheduled-jobs/scheduler.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,oBAAqB,YAAW,iBAAiB;IAOtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;gBAK5B,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwEvC,OAAO,CAAC,YAAY;IA0CpB,OAAO,CAAC,2BAA2B;IA8BnC,OAAO,CAAC,gBAAgB;CAwB3B"}
+{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,oBAAqB,YAAW,iBAAiB;IAOtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;gBAK5B,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwEvC,OAAO,CAAC,YAAY;IAwCpB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,MAAM;IAoBP,2BAA2B,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IA8BhE,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;CAwB/D"}

package/dist/services/scheduled-jobs/scheduler.service.js

@@ -82,28 +82,27 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
         }
     }
     shouldRunNow(job, now) {
-        const today = now.toISOString().split('T')[0];
-        const timeNow = now.toTimeString().slice(0, 5);
-        if (job.startDate && new Date(today) < new Date(job.startDate))
+        const today = new Date(now);
+        today.setHours(0, 0, 0, 0);
+        const timeNow = this.toHHMM(now);
+        const startDate = this.toDateOnly(job.startDate);
+        const endDate = this.toDateOnly(job.endDate);
+        if (startDate && today < startDate)
             return false;
-        if (job.endDate && new Date(today) > new Date(job.endDate))
+        if (endDate && today > endDate)
+            return false;
+        const jobStart = this.toHHMM(job.startTime);
+        const jobEnd = this.toHHMM(job.endTime);
+        if (jobStart && timeNow < jobStart)
+            return false;
+        if (jobEnd && timeNow > jobEnd)
             return false;
-        if (job.startTime) {
-            const jobStart = job.startTime.toTimeString().slice(0, 5);
-            if (timeNow < jobStart)
-                return false;
-        }
-        if (job.endTime) {
-            const jobEnd = job.endTime.toTimeString().slice(0, 5);
-            if (timeNow > jobEnd)
-                return false;
-        }
         if (job.frequency.toLowerCase() === 'custom') {
             return true;
         }
         if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {
             const todayName = now.toLocaleString('en-US', { weekday: 'long' });
-            const days = JSON.parse(job.dayOfWeek);
+            const days = this.parseDayOfWeek(job.dayOfWeek);
             if (!days.includes(todayName))
                 return false;
         }
@@ -114,6 +113,47 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
         }
         return true;
     }
+    parseDayOfWeek(dayOfWeek) {
+        try {
+            const parsed = JSON.parse(dayOfWeek);
+            return Array.isArray(parsed) ? parsed : [];
+        }
+        catch (error) {
+            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error);
+            return [];
+        }
+    }
+    toDateOnly(value) {
+        if (!value)
+            return null;
+        if (value instanceof Date) {
+            const d = new Date(value);
+            d.setHours(0, 0, 0, 0);
+            return d;
+        }
+        const parsed = new Date(value);
+        if (Number.isNaN(parsed.getTime()))
+            return null;
+        parsed.setHours(0, 0, 0, 0);
+        return parsed;
+    }
+    toHHMM(value) {
+        if (!value)
+            return null;
+        if (value instanceof Date) {
+            return value.toTimeString().slice(0, 5);
+        }
+        if (typeof value === 'string') {
+            const match = value.match(/^(\d{2}):(\d{2})/);
+            if (match)
+                return `${match[1]}:${match[2]}`;
+            const parsed = new Date(value);
+            if (!Number.isNaN(parsed.getTime())) {
+                return parsed.toTimeString().slice(0, 5);
+            }
+        }
+        return null;
+    }
     computeNextRunForCustomCron(job, from) {
         const base = new Date(from);
         if (!job.cronExpression) {

package/dist/services/scheduled-jobs/scheduler.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { IsNull, LessThanOrEqual } from 'typeorm';\n\nimport { Cron, CronExpression } from '@nestjs/schedule';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { ISchedulerService } from './scheduler.interface';\nimport { CronExpressionParser } from 'cron-parser';\n\n@Injectable()\nexport class SchedulerServiceImpl implements ISchedulerService {\n    private readonly logger = new Logger(SchedulerServiceImpl.name);\n    private readonly runningJobs = new Set<string>();\n\n    constructor(\n        // @InjectRepository(ScheduledJob)\n        // private readonly scheduledJobRepo: Repository<ScheduledJob>,\n        private readonly scheduledJobRepo: ScheduledJobRepository,\n        private readonly solidRegistry: SolidRegistry,\n    ) { }\n\n    @Cron(CronExpression.EVERY_MINUTE)\n    async runScheduledJobs(): Promise<void> {\n        const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || \"true\";\n        if (solidSchedulerEnabled.toLowerCase() !== \"true\") {\n            // this.logger.debug('Solid scheduler is disabled via environment variable');\n            return;\n        }\n        const solidCliRunning = process.env.SOLID_CLI_RUNNING || \"false\";\n        if (solidCliRunning === \"true\") {\n            return;\n        }\n\n        const now = new Date();\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service started run...`);\n        const dueJobs = await this.scheduledJobRepo.find({\n            where: [\n                {\n                    isActive: true,\n                    nextRunAt: LessThanOrEqual(now),\n                },\n                // Newly created jobs are also picked for examination \n                {\n                    isActive: true,\n                    nextRunAt: IsNull(),\n                },\n            ],\n        });\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service identified ${dueJobs.length} jobs to run...`);\n\n        for (const job of dueJobs) {\n            const jobKey = String(job.id ?? job.scheduleName ?? job.job);\n\n            if (this.runningJobs.has(jobKey)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);\n                continue;\n            }\n\n            if (!this.shouldRunNow(job, now)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);\n                continue;\n            }\n\n            const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);\n            if (!handler) {\n                this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);\n                continue;\n            }\n\n            this.runningJobs.add(jobKey);\n            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);\n            try {\n                // this.logger.log(`[${now.getTime()}]: scheduler service about to run job ${job.job}`);\n                await handler.execute(job);\n                // this.logger.log(`[${now.getTime()}]: scheduler service finished running job ${job.job}`);\n\n                job.isActive = true;\n                const finishedAt = new Date();\n                job.lastRunAt = finishedAt;\n                job.nextRunAt = this.computeNextRunAt(job, finishedAt);\n                this.logger.log(`[${now.getTime()}]: scheduler service coomputed next run for ${job.job} as ${job.nextRunAt}`);\n\n                await this.scheduledJobRepo.save(job);\n                this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);\n            } catch (err) {\n                this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);\n            } finally {\n                this.runningJobs.delete(jobKey);\n            }\n        }\n    }\n\n    private shouldRunNow(job: ScheduledJob, now: Date): boolean {\n        const today = now.toISOString().split('T')[0]; // yyyy-mm-dd\n        const timeNow = now.toTimeString().slice(0, 5); // hh:mm\n\n        // 1. Check startDate / endDate\n        if (job.startDate && new Date(today) < new Date(job.startDate)) return false;\n        if (job.endDate && new Date(today) > new Date(job.endDate)) return false;\n\n        // 2. Check startTime / endTime\n        if (job.startTime) {\n            const jobStart = job.startTime.toTimeString().slice(0, 5);\n            if (timeNow < jobStart) return false;\n        }\n        if (job.endTime) {\n            const jobEnd = job.endTime.toTimeString().slice(0, 5);\n            if (timeNow > jobEnd) return false;\n        }\n\n        // 3. Check custom frequency\n        if (job.frequency.toLowerCase() === 'custom') {\n            // Custom cron expressions handle their own scheduling logic\n            // Just check if nextRunAt is due, which was already checked in the query\n            return true;\n        }\n\n        // 3. Check dayOfWeek (for weekly)\n        if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {\n            const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., \"Monday\"\n            // const days = job.dayOfWeek.split(',').map(d => d.trim());\n            const days = JSON.parse(job.dayOfWeek) as string[];\n            if (!days.includes(todayName)) return false;\n        }\n\n        // 4. Check dayOfMonth (for monthly)\n        if (job.frequency.toLowerCase() === 'monthly' && job.dayOfMonth) {\n            const dom = now.getDate();\n            if (dom !== job.dayOfMonth) return false;\n        }\n\n        return true;\n    }\n\n    private computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        if (!job.cronExpression) {\n            this.logger.error(`Custom frequency requires cronExpression for job ${job.scheduleName}`);\n            // Fallback to daily if cron expression is missing\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n\n        try {\n            const interval = CronExpressionParser.parse(job.cronExpression, {\n                currentDate: from,\n                tz: 'UTC'\n            });\n            const nextRun = interval.next().toDate();\n\n            // Validate minimum 1 minute interval\n            if (nextRun.getTime() - from.getTime() < 60000) {\n                throw new Error('Cron expression interval must be at least 1 minute');\n            }\n            \n            this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);\n            return nextRun;\n        } catch (error) {\n            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}`, error);\n            // Fallback to daily if cron parsing fails\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n\n    private computeNextRunAt(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        switch (job.frequency.toLowerCase()) {\n            // case 'once':\n            //     return null; // don't reschedule\n            case 'every minute':\n                return new Date(base.getTime() + 1 * 60 * 1000);\n            case 'hourly':\n                return new Date(base.getTime() + 60 * 60 * 1000);\n            case 'daily':\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n            case 'weekly':\n                return new Date(base.getTime() + 7 * 24 * 60 * 60 * 1000);\n            case 'monthly':\n                const next = new Date(base);\n                next.setMonth(base.getMonth() + 1);\n                return next;\n            case 'custom':\n                return this.computeNextRunForCustomCron(job, from);\n            default:\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n}\n"]}
+{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { IsNull, LessThanOrEqual } from 'typeorm';\n\nimport { Cron, CronExpression } from '@nestjs/schedule';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { ISchedulerService } from './scheduler.interface';\nimport { CronExpressionParser } from 'cron-parser';\n\n@Injectable()\nexport class SchedulerServiceImpl implements ISchedulerService {\n    private readonly logger = new Logger(SchedulerServiceImpl.name);\n    private readonly runningJobs = new Set<string>();\n\n    constructor(\n        // @InjectRepository(ScheduledJob)\n        // private readonly scheduledJobRepo: Repository<ScheduledJob>,\n        private readonly scheduledJobRepo: ScheduledJobRepository,\n        private readonly solidRegistry: SolidRegistry,\n    ) { }\n\n    @Cron(CronExpression.EVERY_MINUTE)\n    async runScheduledJobs(): Promise<void> {\n        const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || \"true\";\n        if (solidSchedulerEnabled.toLowerCase() !== \"true\") {\n            // this.logger.debug('Solid scheduler is disabled via environment variable');\n            return;\n        }\n        const solidCliRunning = process.env.SOLID_CLI_RUNNING || \"false\";\n        if (solidCliRunning === \"true\") {\n            return;\n        }\n\n        const now = new Date();\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service started run...`);\n        const dueJobs = await this.scheduledJobRepo.find({\n            where: [\n                {\n                    isActive: true,\n                    nextRunAt: LessThanOrEqual(now),\n                },\n                // Newly created jobs are also picked for examination \n                {\n                    isActive: true,\n                    nextRunAt: IsNull(),\n                },\n            ],\n        });\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service identified ${dueJobs.length} jobs to run...`);\n\n        for (const job of dueJobs) {\n            const jobKey = String(job.id ?? job.scheduleName ?? job.job);\n\n            if (this.runningJobs.has(jobKey)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);\n                continue;\n            }\n\n            if (!this.shouldRunNow(job, now)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);\n                continue;\n            }\n\n            const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);\n            if (!handler) {\n                this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);\n                continue;\n            }\n\n            this.runningJobs.add(jobKey);\n            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);\n            try {\n                // this.logger.log(`[${now.getTime()}]: scheduler service about to run job ${job.job}`);\n                await handler.execute(job);\n                // this.logger.log(`[${now.getTime()}]: scheduler service finished running job ${job.job}`);\n\n                job.isActive = true;\n                const finishedAt = new Date();\n                job.lastRunAt = finishedAt;\n                job.nextRunAt = this.computeNextRunAt(job, finishedAt);\n                this.logger.log(`[${now.getTime()}]: scheduler service coomputed next run for ${job.job} as ${job.nextRunAt}`);\n\n                await this.scheduledJobRepo.save(job);\n                this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);\n            } catch (err) {\n                this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);\n            } finally {\n                this.runningJobs.delete(jobKey);\n            }\n        }\n    }\n\n    private shouldRunNow(job: ScheduledJob, now: Date): boolean {\n        const today = new Date(now);\n        today.setHours(0, 0, 0, 0);\n        const timeNow = this.toHHMM(now); // hh:mm\n\n        // 1. Check startDate / endDate\n        const startDate = this.toDateOnly(job.startDate as unknown as Date | string | null);\n        const endDate = this.toDateOnly(job.endDate as unknown as Date | string | null);\n        if (startDate && today < startDate) return false;\n        if (endDate && today > endDate) return false;\n\n        // 2. Check startTime / endTime\n        const jobStart = this.toHHMM(job.startTime as unknown as Date | string | null);\n        const jobEnd = this.toHHMM(job.endTime as unknown as Date | string | null);\n        if (jobStart && timeNow < jobStart) return false;\n        if (jobEnd && timeNow > jobEnd) return false;\n\n        // 3. Check custom frequency\n        if (job.frequency.toLowerCase() === 'custom') {\n            // Custom cron expressions handle their own scheduling logic\n            // Just check if nextRunAt is due, which was already checked in the query\n            return true;\n        }\n\n        // 3. Check dayOfWeek (for weekly)\n        if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {\n            const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., \"Monday\"\n            const days = this.parseDayOfWeek(job.dayOfWeek);\n            if (!days.includes(todayName)) return false;\n        }\n\n        // 4. Check dayOfMonth (for monthly)\n        if (job.frequency.toLowerCase() === 'monthly' && job.dayOfMonth) {\n            const dom = now.getDate();\n            if (dom !== job.dayOfMonth) return false;\n        }\n\n        return true;\n    }\n\n    private parseDayOfWeek(dayOfWeek: string): string[] {\n        try {\n            const parsed = JSON.parse(dayOfWeek);\n            return Array.isArray(parsed) ? parsed : [];\n        } catch (error) {\n            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error as any);\n            return [];\n        }\n    }\n\n    private toDateOnly(value: Date | string | null | undefined): Date | null {\n        if (!value) return null;\n\n        if (value instanceof Date) {\n            const d = new Date(value);\n            d.setHours(0, 0, 0, 0);\n            return d;\n        }\n\n        const parsed = new Date(value);\n        if (Number.isNaN(parsed.getTime())) return null;\n\n        parsed.setHours(0, 0, 0, 0);\n        return parsed;\n    }\n\n    private toHHMM(value: Date | string | null | undefined): string | null {\n        if (!value) return null;\n\n        if (value instanceof Date) {\n            return value.toTimeString().slice(0, 5);\n        }\n\n        if (typeof value === 'string') {\n            const match = value.match(/^(\\d{2}):(\\d{2})/);\n            if (match) return `${match[1]}:${match[2]}`;\n\n            const parsed = new Date(value);\n            if (!Number.isNaN(parsed.getTime())) {\n                return parsed.toTimeString().slice(0, 5);\n            }\n        }\n\n        return null;\n    }\n\n    public computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        if (!job.cronExpression) {\n            this.logger.error(`Custom frequency requires cronExpression for job ${job.scheduleName}`);\n            // Fallback to daily if cron expression is missing\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n\n        try {\n            const interval = CronExpressionParser.parse(job.cronExpression, {\n                currentDate: from,\n                tz: 'UTC'\n            });\n            const nextRun = interval.next().toDate();\n\n            // Validate minimum 1 minute interval\n            if (nextRun.getTime() - from.getTime() < 60000) {\n                throw new Error('Cron expression interval must be at least 1 minute');\n            }\n            \n            this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);\n            return nextRun;\n        } catch (error) {\n            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}`, error);\n            // Fallback to daily if cron parsing fails\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n\n    public computeNextRunAt(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        switch (job.frequency.toLowerCase()) {\n            // case 'once':\n            //     return null; // don't reschedule\n            case 'every minute':\n                return new Date(base.getTime() + 1 * 60 * 1000);\n            case 'hourly':\n                return new Date(base.getTime() + 60 * 60 * 1000);\n            case 'daily':\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n            case 'weekly':\n                return new Date(base.getTime() + 7 * 24 * 60 * 60 * 1000);\n            case 'monthly':\n                const next = new Date(base);\n                next.setMonth(base.getMonth() + 1);\n                return next;\n            case 'custom':\n                return this.computeNextRunForCustomCron(job, from);\n            default:\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n}\n"]}

package/dist-tests/api/authenticate.spec.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_1 = require("@playwright/test");
+const env_1 = require("../helpers/env");
+const baseURL = process.env.API_BASE_URL ?? "http://localhost:3000";
+const TEST_USER_EMAIL = (0, env_1.getRequiredEnv)("TEST_USER_EMAIL");
+const TEST_USER_PASSWORD = (0, env_1.getRequiredEnv)("TEST_USER_PASSWORD");
+function base64UrlDecode(input) {
+    const normalized = input.replace(/-/g, "+").replace(/_/g, "/");
+    const padded = normalized.length % 4 === 0
+        ? normalized
+        : normalized.padEnd(normalized.length + (4 - (normalized.length % 4)), "=");
+    return Buffer.from(padded, "base64").toString("utf-8");
+}
+function validateJwt(token) {
+    const parts = token.split(".");
+    if (parts.length !== 3) {
+        throw new Error("JWT must have three dot-separated parts.");
+    }
+    const headerJson = JSON.parse(base64UrlDecode(parts[0]));
+    const payloadJson = JSON.parse(base64UrlDecode(parts[1]));
+    if (!headerJson || typeof headerJson !== "object") {
+        throw new Error("JWT header must be a JSON object.");
+    }
+    if (!payloadJson || typeof payloadJson !== "object") {
+        throw new Error("JWT payload must be a JSON object.");
+    }
+    if (typeof payloadJson.exp !== "number") {
+        throw new Error("JWT payload.exp must be a number.");
+    }
+    return payloadJson;
+}
+(0, test_1.test)("API: authenticate succeeds with valid credentials", async () => {
+    const api = await test_1.request.newContext({
+        baseURL,
+        extraHTTPHeaders: {
+            accept: "*/*",
+            "content-type": "application/json",
+        },
+    });
+    try {
+        const res = await api.post("/api/iam/authenticate", {
+            data: {
+                email: TEST_USER_EMAIL,
+                username: "",
+                password: TEST_USER_PASSWORD,
+            },
+        });
+        (0, test_1.expect)(res.status()).toBe(200);
+        const json = await res.json();
+        (0, test_1.expect)(json.statusCode).toBe(200);
+        (0, test_1.expect)(Array.isArray(json.message)).toBe(true);
+        (0, test_1.expect)(json.message.length).toBe(0);
+        (0, test_1.expect)(json.error).toBe("");
+        const user = json.data?.user;
+        (0, test_1.expect)(user, "Expected data.user to be an object.").toBeTruthy();
+        (0, test_1.expect)(typeof user).toBe("object");
+        const email = user?.email;
+        (0, test_1.expect)(typeof email).toBe("string");
+        if (email === TEST_USER_EMAIL) {
+            (0, test_1.expect)(email).toBe(TEST_USER_EMAIL);
+        }
+        else {
+            (0, test_1.expect)(email.length).toBeGreaterThan(0);
+        }
+        (0, test_1.expect)(typeof user?.mobile).toBe("string");
+        (0, test_1.expect)(typeof user?.username).toBe("string");
+        (0, test_1.expect)(typeof user?.forcePasswordChange).toBe("boolean");
+        (0, test_1.expect)(typeof user?.id).toBe("number");
+        const roles = user?.roles;
+        (0, test_1.expect)(Array.isArray(roles)).toBe(true);
+        if (Array.isArray(roles)) {
+            (0, test_1.expect)(roles.every((role) => typeof role === "string")).toBe(true);
+            (0, test_1.expect)(roles).toContain("Admin");
+        }
+        const accessToken = json.data?.accessToken;
+        const refreshToken = json.data?.refreshToken;
+        (0, test_1.expect)(typeof accessToken).toBe("string");
+        (0, test_1.expect)(typeof refreshToken).toBe("string");
+        const accessPayload = validateJwt(accessToken);
+        const refreshPayload = validateJwt(refreshToken);
+        (0, test_1.expect)(typeof accessPayload.exp).toBe("number");
+        (0, test_1.expect)(typeof refreshPayload.exp).toBe("number");
+    }
+    finally {
+        await api.dispose();
+    }
+});
+(0, test_1.test)("API: authenticate fails with wrong password", async () => {
+    const api = await test_1.request.newContext({
+        baseURL,
+        extraHTTPHeaders: {
+            accept: "*/*",
+            "content-type": "application/json",
+        },
+    });
+    try {
+        const res = await api.post("/api/iam/authenticate", {
+            data: {
+                email: TEST_USER_EMAIL,
+                username: "",
+                password: `${TEST_USER_PASSWORD}__wrong`,
+            },
+        });
+        (0, test_1.expect)(res.status()).toBe(401);
+        const json = await res.json();
+        (0, test_1.expect)(json.statusCode).toBe(401);
+        (0, test_1.expect)(json.statusCodeMessage).toBe("Unauthorized");
+        (0, test_1.expect)(json.message).toBe("Invalid credentials");
+        (0, test_1.expect)(json.error).toBe("Invalid credentials");
+        (0, test_1.expect)(json.data?.statusCode).toBe(401);
+        (0, test_1.expect)(json.data?.error).toBe("Unauthorized");
+        (0, test_1.expect)(json.data?.message).toBe("Invalid credentials");
+    }
+    finally {
+        await api.dispose();
+    }
+});
+//# sourceMappingURL=authenticate.spec.js.map

package/dist-tests/api/authenticate.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authenticate.spec.js","sourceRoot":"","sources":["../../tests/api/authenticate.spec.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect, request, test } from \"@playwright/test\";\nimport { getRequiredEnv } from \"../helpers/env\";\n\ntype JwtPayload = {\n  exp?: number;\n  [key: string]: unknown;\n};\n\nconst baseURL = process.env.API_BASE_URL ?? \"http://localhost:3000\";\nconst TEST_USER_EMAIL = getRequiredEnv(\"TEST_USER_EMAIL\");\nconst TEST_USER_PASSWORD = getRequiredEnv(\"TEST_USER_PASSWORD\");\n\nfunction base64UrlDecode(input: string): string {\n  const normalized = input.replace(/-/g, \"+\").replace(/_/g, \"/\");\n  const padded =\n    normalized.length % 4 === 0\n      ? normalized\n      : normalized.padEnd(\n        normalized.length + (4 - (normalized.length % 4)),\n        \"=\"\n      );\n  return Buffer.from(padded, \"base64\").toString(\"utf-8\");\n}\n\nfunction validateJwt(token: string): JwtPayload {\n  const parts = token.split(\".\");\n  if (parts.length !== 3) {\n    throw new Error(\"JWT must have three dot-separated parts.\");\n  }\n\n  const headerJson = JSON.parse(base64UrlDecode(parts[0]));\n  const payloadJson = JSON.parse(base64UrlDecode(parts[1]));\n\n  if (!headerJson || typeof headerJson !== \"object\") {\n    throw new Error(\"JWT header must be a JSON object.\");\n  }\n\n  if (!payloadJson || typeof payloadJson !== \"object\") {\n    throw new Error(\"JWT payload must be a JSON object.\");\n  }\n\n  if (typeof payloadJson.exp !== \"number\") {\n    throw new Error(\"JWT payload.exp must be a number.\");\n  }\n\n  return payloadJson as JwtPayload;\n}\n\ntest(\"API: authenticate succeeds with valid credentials\", async () => {\n  const api = await request.newContext({\n    baseURL,\n    extraHTTPHeaders: {\n      accept: \"*/*\",\n      \"content-type\": \"application/json\",\n    },\n  });\n\n  try {\n    const res = await api.post(\"/api/iam/authenticate\", {\n      data: {\n        email: TEST_USER_EMAIL,\n        username: \"\",\n        password: TEST_USER_PASSWORD,\n      },\n    });\n\n    expect(res.status()).toBe(200);\n    const json = await res.json();\n\n    expect(json.statusCode).toBe(200);\n    expect(Array.isArray(json.message)).toBe(true);\n    expect(json.message.length).toBe(0);\n    expect(json.error).toBe(\"\");\n\n    const user = json.data?.user as Record<string, unknown> | undefined;\n    expect(user, \"Expected data.user to be an object.\").toBeTruthy();\n    expect(typeof user).toBe(\"object\");\n\n    const email = user?.email;\n    expect(typeof email).toBe(\"string\");\n    if (email === TEST_USER_EMAIL) {\n      expect(email).toBe(TEST_USER_EMAIL);\n    } else {\n      // If your API returns a fixed system email, replace this with an exact match.\n      expect((email as string).length).toBeGreaterThan(0);\n    }\n\n    expect(typeof user?.mobile).toBe(\"string\");\n    expect(typeof user?.username).toBe(\"string\");\n    expect(typeof user?.forcePasswordChange).toBe(\"boolean\");\n    expect(typeof user?.id).toBe(\"number\");\n\n    const roles = user?.roles;\n    expect(Array.isArray(roles)).toBe(true);\n    if (Array.isArray(roles)) {\n      expect(roles.every((role) => typeof role === \"string\")).toBe(true);\n      expect(roles).toContain(\"Admin\");\n    }\n\n    const accessToken = json.data?.accessToken;\n    const refreshToken = json.data?.refreshToken;\n    expect(typeof accessToken).toBe(\"string\");\n    expect(typeof refreshToken).toBe(\"string\");\n\n    const accessPayload = validateJwt(accessToken as string);\n    const refreshPayload = validateJwt(refreshToken as string);\n\n    expect(typeof accessPayload.exp).toBe(\"number\");\n    expect(typeof refreshPayload.exp).toBe(\"number\");\n  } finally {\n    await api.dispose();\n  }\n});\n\ntest(\"API: authenticate fails with wrong password\", async () => {\n  const api = await request.newContext({\n    baseURL,\n    extraHTTPHeaders: {\n      accept: \"*/*\",\n      \"content-type\": \"application/json\",\n    },\n  });\n\n  try {\n    const res = await api.post(\"/api/iam/authenticate\", {\n      data: {\n        email: TEST_USER_EMAIL,\n        username: \"\",\n        password: `${TEST_USER_PASSWORD}__wrong`,\n      },\n    });\n\n    expect(res.status()).toBe(401);\n    const json = await res.json();\n\n    expect(json.statusCode).toBe(401);\n    expect(json.statusCodeMessage).toBe(\"Unauthorized\");\n    expect(json.message).toBe(\"Invalid credentials\");\n    expect(json.error).toBe(\"Invalid credentials\");\n    expect(json.data?.statusCode).toBe(401);\n    expect(json.data?.error).toBe(\"Unauthorized\");\n    expect(json.data?.message).toBe(\"Invalid credentials\");\n  } finally {\n    await api.dispose();\n  }\n});\n"]}

package/dist-tests/api/crud-service.findOne.cityMaster.spec.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_1 = require("@playwright/test");
+const auth_1 = require("../helpers/auth");
+const baseURL = process.env.API_BASE_URL ?? "http://localhost:3000";
+async function getCityByName(name) {
+    const api = await test_1.request.newContext({
+        baseURL,
+        extraHTTPHeaders: await (0, auth_1.getAuthHeaders)(baseURL),
+    });
+    try {
+        const res = await api.get(`/api/city-master?filters[name][$eq]=${encodeURIComponent(name)}&limit=1&offset=0`);
+        (0, test_1.expect)(res.status()).toBe(200);
+        const json = await res.json();
+        const record = json?.data?.records?.[0];
+        (0, test_1.expect)(record, `Expected city '${name}' in testData`).toBeTruthy();
+        (0, test_1.expect)(record.id, "Expected record to have id").toBeTruthy();
+        return record;
+    }
+    finally {
+        await api.dispose();
+    }
+}
+test_1.test.describe("CRUDService.findOne (cityMaster)", () => {
+    (0, test_1.test)("returns a city by id", async () => {
+        const city = await getCityByName("Mumbai");
+        const api = await test_1.request.newContext({
+            baseURL,
+            extraHTTPHeaders: await (0, auth_1.getAuthHeaders)(baseURL),
+        });
+        try {
+            const res = await api.get(`/api/city-master/${city.id}`);
+            (0, test_1.expect)(res.status()).toBe(200);
+            const json = await res.json();
+            (0, test_1.expect)(json?.data?.id).toBe(city.id);
+            (0, test_1.expect)(json?.data?.name).toBe("Mumbai");
+            (0, test_1.expect)(json?.data?.description).toBe("Mumbai city");
+        }
+        finally {
+            await api.dispose();
+        }
+    });
+    (0, test_1.test)("supports fields[] selection", async () => {
+        const city = await getCityByName("Pune");
+        const api = await test_1.request.newContext({
+            baseURL,
+            extraHTTPHeaders: await (0, auth_1.getAuthHeaders)(baseURL),
+        });
+        try {
+            const res = await api.get(`/api/city-master/${city.id}?fields[]=id&fields[]=name`);
+            (0, test_1.expect)(res.status()).toBe(200);
+            const json = await res.json();
+            (0, test_1.expect)(json?.data?.id).toBe(city.id);
+            (0, test_1.expect)(json?.data?.name).toBe("Pune");
+            (0, test_1.expect)(json?.data?.description).toBeUndefined();
+            (0, test_1.expect)(json?.data?.state).toBeUndefined();
+        }
+        finally {
+            await api.dispose();
+        }
+    });
+    (0, test_1.test)("supports populate=state", async () => {
+        const city = await getCityByName("Bengaluru");
+        const api = await test_1.request.newContext({
+            baseURL,
+            extraHTTPHeaders: await (0, auth_1.getAuthHeaders)(baseURL),
+        });
+        try {
+            const res = await api.get(`/api/city-master/${city.id}?populate=state`);
+            (0, test_1.expect)(res.status()).toBe(200);
+            const json = await res.json();
+            (0, test_1.expect)(json?.data?.name).toBe("Bengaluru");
+            (0, test_1.expect)(json?.data?.state).toBeTruthy();
+            (0, test_1.expect)(json?.data?.state?.name).toBe("Karnataka");
+        }
+        finally {
+            await api.dispose();
+        }
+    });
+    (0, test_1.test)("returns 404 for missing id", async () => {
+        const api = await test_1.request.newContext({
+            baseURL,
+            extraHTTPHeaders: await (0, auth_1.getAuthHeaders)(baseURL),
+        });
+        try {
+            const res = await api.get(`/api/city-master/99999999`);
+            (0, test_1.expect)(res.status()).toBe(404);
+            const json = await res.json();
+            (0, test_1.expect)(String(json?.message)).toContain("cityMaster");
+            (0, test_1.expect)(String(json?.message)).toContain("not found");
+        }
+        finally {
+            await api.dispose();
+        }
+    });
+});
+//# sourceMappingURL=crud-service.findOne.cityMaster.spec.js.map

package/dist-tests/api/crud-service.findOne.cityMaster.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crud-service.findOne.cityMaster.spec.js","sourceRoot":"","sources":["../../tests/api/crud-service.findOne.cityMaster.spec.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect, request, test } from \"@playwright/test\";\nimport { getAuthHeaders } from \"../helpers/auth\";\n\nconst baseURL = process.env.API_BASE_URL ?? \"http://localhost:3000\";\n\nasync function getCityByName(name: string) {\n  const api = await request.newContext({\n    baseURL,\n    extraHTTPHeaders: await getAuthHeaders(baseURL),\n  });\n  try {\n    const res = await api.get(\n      `/api/city-master?filters[name][$eq]=${encodeURIComponent(name)}&limit=1&offset=0`\n    );\n    expect(res.status()).toBe(200);\n    const json = await res.json();\n\n    const record = json?.data?.records?.[0];\n    expect(record, `Expected city '${name}' in testData`).toBeTruthy();\n    expect(record.id, \"Expected record to have id\").toBeTruthy();\n\n    return record;\n  } finally {\n    await api.dispose();\n  }\n}\n\ntest.describe(\"CRUDService.findOne (cityMaster)\", () => {\n  test(\"returns a city by id\", async () => {\n    const city = await getCityByName(\"Mumbai\");\n\n    const api = await request.newContext({\n      baseURL,\n      extraHTTPHeaders: await getAuthHeaders(baseURL),\n    });\n    try {\n      const res = await api.get(`/api/city-master/${city.id}`);\n      expect(res.status()).toBe(200);\n\n      const json = await res.json();\n      expect(json?.data?.id).toBe(city.id);\n      expect(json?.data?.name).toBe(\"Mumbai\");\n      expect(json?.data?.description).toBe(\"Mumbai city\");\n    } finally {\n      await api.dispose();\n    }\n  });\n\n  test(\"supports fields[] selection\", async () => {\n    const city = await getCityByName(\"Pune\");\n\n    const api = await request.newContext({\n      baseURL,\n      extraHTTPHeaders: await getAuthHeaders(baseURL),\n    });\n    try {\n      const res = await api.get(\n        `/api/city-master/${city.id}?fields[]=id&fields[]=name`\n      );\n      expect(res.status()).toBe(200);\n\n      const json = await res.json();\n      expect(json?.data?.id).toBe(city.id);\n      expect(json?.data?.name).toBe(\"Pune\");\n      expect(json?.data?.description).toBeUndefined();\n      expect(json?.data?.state).toBeUndefined();\n    } finally {\n      await api.dispose();\n    }\n  });\n\n  test(\"supports populate=state\", async () => {\n    const city = await getCityByName(\"Bengaluru\");\n\n    const api = await request.newContext({\n      baseURL,\n      extraHTTPHeaders: await getAuthHeaders(baseURL),\n    });\n    try {\n      const res = await api.get(`/api/city-master/${city.id}?populate=state`);\n      expect(res.status()).toBe(200);\n\n      const json = await res.json();\n      expect(json?.data?.name).toBe(\"Bengaluru\");\n      expect(json?.data?.state).toBeTruthy();\n      expect(json?.data?.state?.name).toBe(\"Karnataka\");\n    } finally {\n      await api.dispose();\n    }\n  });\n\n  test(\"returns 404 for missing id\", async () => {\n    const api = await request.newContext({\n      baseURL,\n      extraHTTPHeaders: await getAuthHeaders(baseURL),\n    });\n    try {\n      const res = await api.get(`/api/city-master/99999999`);\n      expect(res.status()).toBe(404);\n\n      const json = await res.json();\n      expect(String(json?.message)).toContain(\"cityMaster\");\n      expect(String(json?.message)).toContain(\"not found\");\n    } finally {\n      await api.dispose();\n    }\n  });\n});\n"]}

package/dist-tests/api/ping.spec.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_1 = require("@playwright/test");
+(0, test_1.test)("GET /api/ping returns pong", async () => {
+    const baseURL = process.env.BASE_URL || "http://localhost:3000";
+    if (!baseURL) {
+        throw new Error("baseURL is not configured. Set API_BASE_URL or use the default.");
+    }
+    const api = await test_1.request.newContext({ baseURL });
+    const res = await api.get("/api/ping");
+    (0, test_1.expect)(res.status()).toBe(200);
+    const body = await res.json();
+    (0, test_1.expect)(body).toEqual({
+        statusCode: 200,
+        message: [],
+        error: "",
+        data: { pong: "v1.0.2" },
+    });
+    await api.dispose();
+});
+//# sourceMappingURL=ping.spec.js.map

package/dist-tests/api/ping.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ping.spec.js","sourceRoot":"","sources":["../../tests/api/ping.spec.ts"],"names":[],"mappings":";;AAAA,2CAAyD;AAEzD,IAAA,WAAI,EAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,uBAAuB,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,cAAO,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAElD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEvC,IAAA,aAAM,EAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE/B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QACnB,UAAU,EAAE,GAAG;QACf,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;AACtB,CAAC,CAAC,CAAC","sourcesContent":["import { expect, request, test } from \"@playwright/test\";\n\ntest(\"GET /api/ping returns pong\", async () => {\n  const baseURL = process.env.BASE_URL || \"http://localhost:3000\";\n  if (!baseURL) {\n    throw new Error(\"baseURL is not configured. Set API_BASE_URL or use the default.\");\n  }\n  const api = await request.newContext({ baseURL });\n\n  const res = await api.get(\"/api/ping\");\n\n  expect(res.status()).toBe(200);\n\n  const body = await res.json();\n  expect(body).toEqual({\n    statusCode: 200,\n    message: [],\n    error: \"\",\n    data: { pong: \"v1.0.2\" },\n  });\n\n  await api.dispose();\n});\n"]}

package/dist-tests/helpers/auth.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAccessToken = getAccessToken;
+exports.getAuthHeaders = getAuthHeaders;
+const test_1 = require("@playwright/test");
+const env_1 = require("./env");
+async function getAccessToken(baseURL) {
+    const TEST_USER_EMAIL = (0, env_1.getRequiredEnv)("TEST_USER_EMAIL");
+    const TEST_USER_PASSWORD = (0, env_1.getRequiredEnv)("TEST_USER_PASSWORD");
+    const api = await test_1.request.newContext({
+        baseURL,
+        extraHTTPHeaders: {
+            accept: "*/*",
+            "content-type": "application/json",
+        },
+    });
+    try {
+        const res = await api.post("/api/iam/authenticate", {
+            data: {
+                email: TEST_USER_EMAIL,
+                username: "",
+                password: TEST_USER_PASSWORD,
+            },
+        });
+        (0, test_1.expect)(res.status()).toBe(200);
+        const json = await res.json();
+        const token = json?.data?.accessToken;
+        (0, test_1.expect)(token, "Expected access token from authenticate endpoint.").toBeTruthy();
+        return token;
+    }
+    finally {
+        await api.dispose();
+    }
+}
+async function getAuthHeaders(baseURL) {
+    const token = await getAccessToken(baseURL);
+    return {
+        authorization: `Bearer ${token}`,
+    };
+}
+//# sourceMappingURL=auth.js.map

package/dist-tests/helpers/auth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../tests/helpers/auth.ts"],"names":[],"mappings":";;AAGA,wCA6BC;AAED,wCAKC;AAvCD,2CAAmD;AACnD,+BAAuC;AAEhC,KAAK,UAAU,cAAc,CAAC,OAAe;IAClD,MAAM,eAAe,GAAG,IAAA,oBAAc,EAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,IAAA,oBAAc,EAAC,oBAAoB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,MAAM,cAAO,CAAC,UAAU,CAAC;QACnC,OAAO;QACP,gBAAgB,EAAE;YAChB,MAAM,EAAE,KAAK;YACb,cAAc,EAAE,kBAAkB;SACnC;KACF,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE;YAClD,IAAI,EAAE;gBACJ,KAAK,EAAE,eAAe;gBACtB,QAAQ,EAAE,EAAE;gBACZ,QAAQ,EAAE,kBAAkB;aAC7B;SACF,CAAC,CAAC;QAEH,IAAA,aAAM,EAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,EAAE,IAAI,EAAE,WAAiC,CAAC;QAC5D,IAAA,aAAM,EAAC,KAAK,EAAE,mDAAmD,CAAC,CAAC,UAAU,EAAE,CAAC;QAChF,OAAO,KAAe,CAAC;IACzB,CAAC;YAAS,CAAC;QACT,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAe;IAClD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO;QACL,aAAa,EAAE,UAAU,KAAK,EAAE;KACjC,CAAC;AACJ,CAAC","sourcesContent":["import { expect, request } from \"@playwright/test\";\nimport { getRequiredEnv } from \"./env\";\n\nexport async function getAccessToken(baseURL: string) {\n  const TEST_USER_EMAIL = getRequiredEnv(\"TEST_USER_EMAIL\");\n  const TEST_USER_PASSWORD = getRequiredEnv(\"TEST_USER_PASSWORD\");\n\n  const api = await request.newContext({\n    baseURL,\n    extraHTTPHeaders: {\n      accept: \"*/*\",\n      \"content-type\": \"application/json\",\n    },\n  });\n\n  try {\n    const res = await api.post(\"/api/iam/authenticate\", {\n      data: {\n        email: TEST_USER_EMAIL,\n        username: \"\",\n        password: TEST_USER_PASSWORD,\n      },\n    });\n\n    expect(res.status()).toBe(200);\n    const json = await res.json();\n    const token = json?.data?.accessToken as string | undefined;\n    expect(token, \"Expected access token from authenticate endpoint.\").toBeTruthy();\n    return token as string;\n  } finally {\n    await api.dispose();\n  }\n}\n\nexport async function getAuthHeaders(baseURL: string) {\n  const token = await getAccessToken(baseURL);\n  return {\n    authorization: `Bearer ${token}`,\n  };\n}\n"]}

package/dist-tests/helpers/env.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequiredEnv = getRequiredEnv;
+function getRequiredEnv(name) {
+    const value = process.env[name];
+    if (!value) {
+        throw new Error(`Missing required env var: ${name}`);
+    }
+    return value;
+}
+//# sourceMappingURL=env.js.map

package/dist-tests/helpers/env.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../tests/helpers/env.ts"],"names":[],"mappings":";;AAAA,wCAMC;AAND,SAAgB,cAAc,CAAC,IAAY;IACzC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["export function getRequiredEnv(name: string): string {\n  const value = process.env[name];\n  if (!value) {\n    throw new Error(`Missing required env var: ${name}`);\n  }\n  return value;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core",
-  "version": "0.1.6-beta.6",
+  "version": "0.1.6-beta.9",
   "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/controllers/scheduled-job.controller.ts

@@ -89,5 +89,11 @@ export class ScheduledJobController {
     return this.service.delete(id);
   }
 
+  @ApiBearerAuth("jwt")
+  @Post(':id/trigger')
+  async triggerRun(@Param('id') id: string) {
+    return this.service.triggerRun(+id);
+  }
+
 
 }

package/src/services/scheduled-job.service.ts

@@ -1,10 +1,12 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
+import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { EntityManager } from 'typeorm';
 import { CRUDService } from './crud.service';
+import { SchedulerServiceImpl } from './scheduled-jobs/scheduler.service';
 
 @Injectable()
 export class ScheduledJobService extends CRUDService<ScheduledJob> {
@@ -16,9 +18,36 @@ export class ScheduledJobService extends CRUDService<ScheduledJob> {
     // @InjectRepository(ScheduledJob)
     // readonly repo: Repository<ScheduledJob>,
     readonly repo: ScheduledJobRepository,
-    readonly moduleRef: ModuleRef
+    readonly moduleRef: ModuleRef,
+    private readonly solidRegistry: SolidRegistry,
+    private readonly schedulerService: SchedulerServiceImpl,
 
   ) {
     super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);
   }
+
+  async triggerRun(id: number): Promise<ScheduledJob> {
+    const job = await this.repo.findOne({ where: { id } });
+    if (!job) {
+      throw new NotFoundException(`Scheduled job with id ${id} not found`);
+    }
+
+    const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
+    if (!handler) {
+      throw new BadRequestException(`Scheduled job handler not found: ${job.job}`);
+    }
+
+    this.logger.log(`Manually triggering scheduled job id=${job.id}, job=${job.job}`);
+
+    await handler.execute(job);
+
+    const finishedAt = new Date();
+    job.lastRunAt = finishedAt;
+    job.nextRunAt = this.schedulerService.computeNextRunAt(job, finishedAt);
+    await this.repo.save(job);
+
+    this.logger.log(`Completed manual trigger for scheduled job id=${job.id}, nextRunAt=${job.nextRunAt?.toISOString?.()}`);
+
+    return job;
+  }
 }

package/src/services/scheduled-jobs/scheduler.interface.ts

@@ -1,3 +1,6 @@
+import { ScheduledJob } from "src/entities/scheduled-job.entity";
+
 export interface ISchedulerService {
     runScheduledJobs(): Promise<void>;
-}
+    computeNextRunAt(job: ScheduledJob, from: Date): Date;
+}

package/src/services/scheduled-jobs/scheduler.service.ts

@@ -94,22 +94,21 @@ export class SchedulerServiceImpl implements ISchedulerService {
     }
 
     private shouldRunNow(job: ScheduledJob, now: Date): boolean {
-        const today = now.toISOString().split('T')[0]; // yyyy-mm-dd
-        const timeNow = now.toTimeString().slice(0, 5); // hh:mm
+        const today = new Date(now);
+        today.setHours(0, 0, 0, 0);
+        const timeNow = this.toHHMM(now); // hh:mm
 
         // 1. Check startDate / endDate
-        if (job.startDate && new Date(today) < new Date(job.startDate)) return false;
-        if (job.endDate && new Date(today) > new Date(job.endDate)) return false;
+        const startDate = this.toDateOnly(job.startDate as unknown as Date | string | null);
+        const endDate = this.toDateOnly(job.endDate as unknown as Date | string | null);
+        if (startDate && today < startDate) return false;
+        if (endDate && today > endDate) return false;
 
         // 2. Check startTime / endTime
-        if (job.startTime) {
-            const jobStart = job.startTime.toTimeString().slice(0, 5);
-            if (timeNow < jobStart) return false;
-        }
-        if (job.endTime) {
-            const jobEnd = job.endTime.toTimeString().slice(0, 5);
-            if (timeNow > jobEnd) return false;
-        }
+        const jobStart = this.toHHMM(job.startTime as unknown as Date | string | null);
+        const jobEnd = this.toHHMM(job.endTime as unknown as Date | string | null);
+        if (jobStart && timeNow < jobStart) return false;
+        if (jobEnd && timeNow > jobEnd) return false;
 
         // 3. Check custom frequency
         if (job.frequency.toLowerCase() === 'custom') {
@@ -121,8 +120,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         // 3. Check dayOfWeek (for weekly)
         if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {
             const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., "Monday"
-            // const days = job.dayOfWeek.split(',').map(d => d.trim());
-            const days = JSON.parse(job.dayOfWeek) as string[];
+            const days = this.parseDayOfWeek(job.dayOfWeek);
             if (!days.includes(todayName)) return false;
         }
 
@@ -135,7 +133,53 @@ export class SchedulerServiceImpl implements ISchedulerService {
         return true;
     }
 
-    private computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {
+    private parseDayOfWeek(dayOfWeek: string): string[] {
+        try {
+            const parsed = JSON.parse(dayOfWeek);
+            return Array.isArray(parsed) ? parsed : [];
+        } catch (error) {
+            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error as any);
+            return [];
+        }
+    }
+
+    private toDateOnly(value: Date | string | null | undefined): Date | null {
+        if (!value) return null;
+
+        if (value instanceof Date) {
+            const d = new Date(value);
+            d.setHours(0, 0, 0, 0);
+            return d;
+        }
+
+        const parsed = new Date(value);
+        if (Number.isNaN(parsed.getTime())) return null;
+
+        parsed.setHours(0, 0, 0, 0);
+        return parsed;
+    }
+
+    private toHHMM(value: Date | string | null | undefined): string | null {
+        if (!value) return null;
+
+        if (value instanceof Date) {
+            return value.toTimeString().slice(0, 5);
+        }
+
+        if (typeof value === 'string') {
+            const match = value.match(/^(\d{2}):(\d{2})/);
+            if (match) return `${match[1]}:${match[2]}`;
+
+            const parsed = new Date(value);
+            if (!Number.isNaN(parsed.getTime())) {
+                return parsed.toTimeString().slice(0, 5);
+            }
+        }
+
+        return null;
+    }
+
+    public computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {
         const base = new Date(from);
 
         if (!job.cronExpression) {
@@ -165,7 +209,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         }
     }
 
-    private computeNextRunAt(job: ScheduledJob, from: Date): Date {
+    public computeNextRunAt(job: ScheduledJob, from: Date): Date {
         const base = new Date(from);
 
         switch (job.frequency.toLowerCase()) {

package/.claude/settings.local.json

@@ -1,15 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(node -e:*)",
-      "WebFetch(domain:docs.solidxai.com)",
-      "WebFetch(domain:github.com)",
-      "Read(//Users/oswald/projects/Solid_Starters/solidctl/**)",
-      "Read(//Users/oswald/projects/Solid_Starters/**)",
-      "Bash(find /Users/oswald/projects/Solid_Starters/solid-core-module -type d -name migration* -o -name *database*)"
-    ],
-    "additionalDirectories": [
-      "/Users/oswald/projects/Solid_Starters/solidctl"
-    ]
-  }
-}

package/src/services/1.js

@@ -1,6 +0,0 @@
-1. Do i need to create a storeStreams method for aws service too?
-    - Handle later
-2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
-    - startExport should either return the data or return the transaction id
-3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
-    - show the userKey