@solidstarters/solid-core 1.2.125 → 1.2.128

package/dist/validators/is-parsable-int.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-parsable-int.js","sourceRoot":"","sources":["../../src/validators/is-parsable-int.ts"],"names":[],"mappings":";;AAEA,sCAkBC;AApBD,qDAA4F;AAE5F,SAAgB,aAAa,CAAC,iBAAqC;IAC/D,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,IAAA,mCAAiB,EAAC;YACd,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,iBAAiB;YAC1B,SAAS,EAAE;gBACP,QAAQ,CAAC,KAAU,EAAE,IAAyB;oBAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACxC,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBACzC,CAAC;gBACD,cAAc;oBACV,OAAO,kCAAkC,CAAC;gBAC9C,CAAC;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"is-parsable-int.js","sourceRoot":"","sources":["../../src/validators/is-parsable-int.ts"],"names":[],"mappings":";;AAEA,sCAkBC;AApBD,qDAA4F;AAE5F,SAAgB,aAAa,CAAC,iBAAqC;IAC/D,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,IAAA,mCAAiB,EAAC;YACd,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,iBAAiB;YAC1B,SAAS,EAAE;gBACP,QAAQ,CAAC,KAAU,EAAE,IAAyB;oBAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACxC,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBACzC,CAAC;gBACD,cAAc;oBACV,OAAO,kCAAkC,CAAC;gBAC9C,CAAC;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC","sourcesContent":["import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator';\n\nexport function IsParsableInt(validationOptions?: ValidationOptions) {\n    return function (object: Object, propertyName: string) {\n        registerDecorator({\n            name: 'isParsableInt',\n            target: object.constructor,\n            propertyName: propertyName,\n            options: validationOptions,\n            validator: {\n                validate(value: any, args: ValidationArguments) {\n                    const parsedValue = parseInt(value, 10);\n                    return Number.isInteger(parsedValue);\n                },\n                defaultMessage() {\n                    return 'Value must be a parsable integer';\n                },\n            },\n        });\n    };\n}"]}

package/dist/winston.logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"winston.logger.js","sourceRoot":"","sources":["../src/winston.logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"winston.logger.js","sourceRoot":"","sources":["../src/winston.logger.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { Logger as TypeORMLogger, QueryRunner } from 'typeorm';\nimport { Logger } from 'winston';\nimport { Inject } from '@nestjs/common';\nimport { WINSTON_MODULE_PROVIDER } from 'nest-winston';\nimport * as winston from 'winston';\n\nexport const WinstonLoggerConfig = {\n    level: 'debug', // Allow all log levels for debugging\n    format: winston.format.combine(\n        winston.format.timestamp(),\n        winston.format.errors({ stack: true }),\n        winston.format.printf(({ level, message, timestamp }) => {\n            if (!message) {\n                return `[${timestamp}] ${level.toUpperCase()}: (No message provided)`;\n            }\n            return `[${timestamp}] ${level.toUpperCase()}: ${message}`;\n        }),\n    ),\n    transports: [\n        new winston.transports.Console({\n            format: winston.format.combine(\n                // winston.format.colorize(),\n                // winston.format.timestamp(),\n                winston.format.printf(({ level, message, timestamp }) => {\n                    return `[${timestamp}] ${level.toUpperCase()}: ${message}`;\n                }),\n            ),\n        }),\n        new winston.transports.File({\n            filename: 'logs/application.log',\n            // format: winston.format.json(),\n        }),\n        new winston.transports.File({\n            filename: 'logs/error.log',\n            level: 'error',\n            // format: winston.format.json(),\n        }),\n    ],\n};\n\nexport class WinstonTypeORMLogger implements TypeORMLogger {\n    constructor(@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger) { }\n\n    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        if (Boolean(process.env.DEFAULT_DATABASE_LOGGING)) {\n            this.logger.info(`Query: ${query} Parameters: ${parameters}`);\n        }\n    }\n\n    logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        this.logger.error(`Query failed: ${error} | Query: ${query} | Parameters: ${parameters}`);\n    }\n\n    logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner): void {\n        this.logger.warn(`Slow query: ${time}ms | Query: ${query} | Parameters: ${parameters}`);\n    }\n\n    logSchemaBuild(message: string, queryRunner?: QueryRunner): void {\n        this.logger.info(`Schema Build: ${message}`);\n    }\n\n    logMigration(message: string, queryRunner?: QueryRunner): void {\n        this.logger.info(`Migration: ${message}`);\n    }\n\n    log(level: 'log' | 'info' | 'warn' | 'error', message: any): void {\n        this.logger[level](message);\n    }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.125",
+  "version": "1.2.128",
   "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",
@@ -34,8 +34,10 @@
   "dependencies": {
     "@angular-devkit/core": "^18.0.3",
     "@aws-sdk/client-s3": "^3.637.0",
+    "@aws-sdk/s3-request-presigner": "^3.828.0",
     "@elasticemail/elasticemail-client": "^4.0.23",
     "@hapi/joi": "^17.1.1",
+    "@nestjs/schedule": "^6.0.0",
     "amqplib": "^0.10.4",
     "axios": "^1.7.0",
     "bcrypt": "^5.1.1",

package/src/controllers/media-storage-provider-metadata.controller.ts

@@ -1,10 +1,11 @@
-import { Body, Controller, Delete, Get, Logger, Param, ParseIntPipe, Post, Put, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Logger, Param, ParseIntPipe, Post, Put, Query, UseInterceptors } from '@nestjs/common';
 import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
 import { PaginationQueryDto } from 'src/dtos/pagination-query.dto';
 import { CreateMediaStorageProviderMetadataDto } from '../dtos/create-media-storage-provider-metadata.dto';
 import { MediaStorageProviderMetadataService } from '../services/media-storage-provider-metadata.service';
 import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { UpdateMediaStorageProviderMetadataDto } from '../dtos/update-media-storage-provider.dto';
+import { AnyFilesInterceptor } from '@nestjs/platform-express';
 
 @Controller('media-storage-provider-metadata')
 @ApiTags("App Builder")
@@ -40,12 +41,14 @@ export class MediaStorageProviderMetadataController {
 
     @ApiBearerAuth("jwt")
     @Post()
+    @UseInterceptors(AnyFilesInterceptor())
     create(@Body() createDto: CreateMediaStorageProviderMetadataDto) {
         // this.logger.log(`Creating a new model: ${JSON.stringify(createDto)}`);
         return this.mediaStorageProviderService.create(createDto);
     }
 
     @Put(':id')
+    @UseInterceptors(AnyFilesInterceptor())
     update(@Param('id') id: number, @Body() updateMediaStorageProviderMetadataDto: UpdateMediaStorageProviderMetadataDto) {
         return this.mediaStorageProviderService.update(id, updateMediaStorageProviderMetadataDto);
     }

package/src/controllers/scheduled-job.controller.ts

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

package/src/controllers/{queues-test.controller.ts → test-queue.controller.ts}

@@ -3,18 +3,18 @@ import { ApiTags } from '@nestjs/swagger';
 import { Auth } from 'src/decorators/auth.decorator';
 import { Public } from 'src/decorators/public.decorator';
 import { AuthType } from 'src/enums/auth-type.enum';
-import { TestQueuePublisher } from '../jobs/queue-test-publisher.service';
-import { TestQueueDbPublisher } from 'src/jobs/database/queue-test-db-publisher.service';
+import { PublisherFactory } from 'src/services/queues/publisher-factory.service';
 
 
 @Auth(AuthType.None)
 @Controller('queues')
 @ApiTags("Queues")
-export class QueuesTestController {
+export class TestQueueController {
 
     constructor(
-        private readonly publisherRmq: TestQueuePublisher,
-        private readonly publisherDb: TestQueueDbPublisher
+        // private readonly publisherRmq: TestQueuePublisher,
+        // private readonly publisherDb: TestQueuePublisherDatabase
+        private readonly publisherFactory: PublisherFactory<any>
     ) { }
 
     @Public()
@@ -30,12 +30,13 @@ export class QueuesTestController {
             parentEntity: 'feeType',
             parentEntityId: 23,
         };
-        if (messageBroker === 'rabbitmq') {
-            await this.publisherRmq.publish(m);
-        }
-        if (messageBroker === 'database') {
-            await this.publisherDb.publish(m);
-        }
+        // if (messageBroker === 'rabbitmq') {
+        //     await this.publisherRmq.publish(m);
+        // }
+        // if (messageBroker === 'database') {
+        //     await this.publisherDb.publish(m);
+        // }
+        await this.publisherFactory.publish(m, 'TestQueuePublisher', messageBroker);
 
         return {};
     }

package/src/decorators/scheduled-job-provider.decorator.ts

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

package/src/dtos/create-media-storage-provider-metadata.dto.ts

@@ -1,4 +1,5 @@
-import { IsBoolean, IsEnum, IsNotEmpty, IsOptional, IsString, isBoolean } from "class-validator";
+import { Transform } from "class-transformer";
+import { IsBoolean, IsEnum, IsNotEmpty, IsNumber, IsOptional, IsString, isBoolean } from "class-validator";
 export enum MediaStorageProviderType {
     Filesystem = 'filesystem',
     AwsS3 = 'aws-s3',
@@ -8,30 +9,34 @@ export class CreateMediaStorageProviderMetadataDto {
     // name
     @IsNotEmpty()
     @IsString()
-    readonly name : string;
+    readonly name: string;
 
     // type filesystem|aws-s3|azure-blob-storage
     @IsNotEmpty()
     @IsEnum(MediaStorageProviderType)
-    readonly type : MediaStorageProviderType;
+    readonly type: MediaStorageProviderType;
 
     // region
     @IsString()
     @IsOptional()
-    readonly region : string;
+    readonly region: string;
 
     // bucketName
     @IsString()
     @IsOptional()
-    readonly bucketName : string;
+    readonly bucketName: string;
 
     // isPublic
     @IsOptional()
     @IsBoolean()
-    readonly isPublic : boolean;
+    readonly isPublic: boolean;
 
     // localPath
     @IsString()
     @IsOptional()
-    readonly localPath : string;
+    readonly localPath: string;
+
+    @IsOptional()
+    @IsNumber()
+    readonly signedUrlExpiry: number; // stored in minutes
 }

package/src/dtos/create-scheduled-job.dto.ts

@@ -0,0 +1,65 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+import { IsNotEmpty, IsBoolean, IsDate, IsOptional, IsInt } from 'class-validator';
+
+export class CreateScheduledJobDto {
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    scheduleName: string;
+
+    @IsNotEmpty()
+    @IsBoolean()
+    @ApiProperty()
+    isActive: boolean = false;
+
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    frequency: string;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    startTime: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    endTime: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    startDate: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    endDate: Date;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    dayOfMonth: number;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    lastRunAt: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    nextRunAt: Date;
+
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    dayOfWeek: string;
+
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    job: string;
+}

package/src/dtos/update-scheduled-job.dto.ts

@@ -0,0 +1,72 @@
+import { IsInt, IsOptional, IsString, IsNotEmpty, IsBoolean, IsDate } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateScheduledJobDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    scheduleName: string;
+
+    @IsNotEmpty()
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isActive: boolean;
+
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    frequency: string;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    startTime: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    endTime: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    startDate: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    endDate: Date;
+
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    dayOfMonth: number;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    lastRunAt: Date;
+
+    @IsOptional()
+    @IsDate()
+    @ApiProperty()
+    nextRunAt: Date;
+
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    dayOfWeek: string;
+
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    job: string;
+}

package/src/entities/common.entity.ts

@@ -26,9 +26,9 @@ export abstract class CommonEntity {
     @Column({ type: "int", name: 'default_entity_locale_id', default: null })
     defaultEntityLocaleId: number;
 
-    @ManyToOne(() => require('./user.entity').User?.default ?? require('./user.entity').User, { nullable: true })
+    @ManyToOne(() => require('./user.entity').User?.default ?? require('./user.entity').User, { onDelete: 'SET NULL', nullable: true })
     createdBy: User;
 
-    @ManyToOne(() => require('./user.entity').User?.default ?? require('./user.entity').User, { nullable: true })
+    @ManyToOne(() => require('./user.entity').User?.default ?? require('./user.entity').User, { onDelete: 'SET NULL', nullable: true })
     updatedBy: User;    
 }

package/src/entities/media-storage-provider-metadata.entity.ts

@@ -4,7 +4,7 @@ import { Column, Entity, Index } from "typeorm";
 @Entity("ss_media_storage_provider_metadata")
 export class MediaStorageProviderMetadata extends CommonEntity {
     @Index({ unique: true })
-    @Column({ })
+    @Column({})
     name: string;
 
     @Column()
@@ -21,4 +21,8 @@ export class MediaStorageProviderMetadata extends CommonEntity {
 
     @Column({ name: "local_path", nullable: true })
     localPath: string;
+
+    // default to 1 hour
+    @Column({ name: 'signed_url_expiry', type: 'int', nullable: true, default: 60 })
+    signedUrlExpiry: number;
 }

package/src/entities/scheduled-job.entity.ts

@@ -0,0 +1,30 @@
+import { Entity, Column } from 'typeorm';
+import { CommonEntity } from './common.entity';
+
+@Entity('ss_scheduled_job')
+export class ScheduledJob extends CommonEntity {
+    @Column({ type: "varchar" })
+    scheduleName: string;
+    @Column({ type: "boolean", default: false })
+    isActive: boolean = false;
+    @Column({ type: "varchar" })
+    frequency: string;
+    @Column({ type: "time", nullable: true })
+    startTime: Date;
+    @Column({ type: "time", nullable: true })
+    endTime: Date;
+    @Column({ type: "date", nullable: true })
+    startDate: Date;
+    @Column({ type: "date", nullable: true })
+    endDate: Date;
+    @Column({ type: "integer", nullable: true })
+    dayOfMonth: number;
+    @Column({ type: "timestamp", nullable: true })
+    lastRunAt: Date;
+    @Column({ type: "timestamp", nullable: true })
+    nextRunAt: Date;
+    @Column({ type: "varchar", nullable: true })
+    dayOfWeek: string;
+    @Column({ type: "varchar" })
+    job: string;
+}

package/src/helpers/solid-registry.ts

@@ -4,7 +4,7 @@ import { ComputedFieldTriggerConfig, ComputedFieldValueType } from 'src/dtos/cre
 import { CommonEntity } from 'src/entities/common.entity';
 import { Locale } from 'src/entities/locale.entity';
 import { SecurityRule } from 'src/entities/security-rule.entity';
-import { EntityManager } from 'typeorm';
+import { IScheduledJob } from 'src/services/scheduled-jobs/scheduled-job.interface';
 import { ISelectionProvider, ISelectionProviderContext } from "../interfaces";
 
 type ControllerMetadata = {
@@ -54,6 +54,7 @@ export interface ComputedFieldMetadata<TContext = any> {
 @Injectable()
 export class SolidRegistry {
   private seeders: Set<InstanceWrapper> = new Set();
+  private scheduledJobProviders: Set<InstanceWrapper> = new Set();
   private selectionProviders: Set<InstanceWrapper> = new Set();
   private computedFieldProviders: Set<InstanceWrapper> = new Set();
   private solidDatabaseModules: Set<InstanceWrapper> = new Set();
@@ -83,6 +84,10 @@ export class SolidRegistry {
     this.computedFieldProviders.add(computedFieldProvider);
   }
 
+  registerScheduledJobProvider(scheduledJobProvider: InstanceWrapper): void {
+    this.scheduledJobProviders.add(scheduledJobProvider);
+  }
+
   registerSolidDatabaseModule(solidDatabaseModule: InstanceWrapper): void {
     this.solidDatabaseModules.add(solidDatabaseModule);
   }
@@ -118,6 +123,21 @@ export class SolidRegistry {
     return Array.from(this.computedFieldProviders);
   }
 
+  getScheduledJobProviders(): Array<InstanceWrapper> {
+    return Array.from(this.scheduledJobProviders);
+  }
+
+  getScheduledJobProviderInstance(name: string): IScheduledJob {
+    const scheduledJobProviders = this.getScheduledJobProviders();
+
+    for (let i = 0; i < scheduledJobProviders.length; i++) {
+      const scheduledJobProvider = scheduledJobProviders[i];
+      if (scheduledJobProvider.name === name) {
+        return scheduledJobProvider.instance;
+      }
+    }
+  }
+  
   getComputedFieldProvider(name: string): InstanceWrapper {
     const provider = this.getComputedFieldProviders().filter((provider) => provider.name === name).pop();
     if (!provider) {

package/src/index.ts

@@ -13,6 +13,7 @@ export * from './decorators/active-user.decorator'
 export * from './decorators/solid-request-context.decorator'
 export * from './decorators/auth.decorator'
 export * from './decorators/computed-field-provider.decorator'
+export * from './decorators/scheduled-job-provider.decorator'
 export * from './decorators/is-not-in-enum.decorator'
 export * from './decorators/protocol.decorator'
 export * from './decorators/public.decorator'
@@ -37,6 +38,7 @@ export * from './dtos/create-model-metadata.dto'
 export * from './dtos/create-module-metadata.dto'
 export * from './dtos/create-mq-message-queue.dto'
 export * from './dtos/create-mq-message.dto'
+export * from './dtos/create-scheduled-job.dto'
 export * from './dtos/create-permission-metadata.dto'
 export * from './dtos/create-role-metadata.dto'
 export * from './dtos/create-short-url.dto'
@@ -74,6 +76,7 @@ export * from './dtos/update-model-metadata.dto'
 export * from './dtos/update-module-metadata.dto'
 export * from './dtos/update-mq-message-queue.dto'
 export * from './dtos/update-mq-message.dto'
+export * from './dtos/update-scheduled-job.dto'
 export * from './dtos/update-permission-metadata.dto'
 export * from './dtos/update-role-metadata.dto'
 export * from './dtos/update-sms-template.dto'
@@ -102,6 +105,7 @@ export * from './entities/model-metadata.entity'
 export * from './entities/module-metadata.entity'
 export * from './entities/mq-message-queue.entity'
 export * from './entities/mq-message.entity'
+export * from './entities/scheduled-job.entity'
 export * from './entities/permission-metadata.entity'
 export * from './entities/role-metadata.entity'
 export * from './entities/sms-template.entity'
@@ -161,6 +165,9 @@ export * from './interceptors/wrap-response.interceptor'
 
 export * from './interfaces/active-user-data.interface'
 export * from './interfaces/mq'
+export * from './services/scheduled-jobs/scheduled-job.interface';
+export * from './services/scheduled-jobs/scheduler.interface';
+export * from './services/scheduled-jobs/scheduler.service';
 
 export * from './jobs/api-email-publisher.service'
 export * from './jobs/api-email-queue-options'
@@ -217,6 +224,7 @@ export * from './services/model-metadata.service'
 export * from './services/module-metadata.service'
 export * from './services/mq-message-queue.service'
 export * from './services/mq-message.service'
+export * from './services/scheduled-job.service'
 export * from './services/pdf.service'
 export * from './services/permission-metadata.service'
 export * from './services/queues/rabbitmq-publisher.service'

package/src/jobs/database/api-email-publisher-database.service.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+
+import mailQueueOptions from './api-email-queue-options-database';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+
+
+@Injectable()
+export class ApiEmailQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...mailQueueOptions
+        }
+    }
+}

package/src/jobs/database/api-email-queue-options-database.ts

@@ -0,0 +1,9 @@
+import { BrokerType } from "src/interfaces";
+
+const API_MAIL_QUEUE_NAME = 'api_mail_queue_database';
+
+export default {
+    name: 'apiMailInstance',
+    type: BrokerType.Database,
+    queueName: API_MAIL_QUEUE_NAME,
+};

package/src/jobs/database/api-email-subscriber-database.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import mailQueueOptions from './api-email-queue-options-database';
+import { QueueMessage } from 'src/interfaces/mq';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { ElasticEmailService } from 'src/services/mail/ElasticEmailService';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+
+@Injectable()
+export class ApiEmailQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly emailService: ElasticEmailService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...mailQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.emailService.sendEmailSynchronously(message);
+    }
+}

package/src/jobs/database/email-publisher-database.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import mailQueueOptions from './email-queue-options-database';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+
+@Injectable()
+export class EmailQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...mailQueueOptions
+        }
+    }
+}