Skip to content

feat(job-scheduler): adiciona propriedade rangeExecutions #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions src/scheduler/db/scheduler.data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { Scheduler } from '../scheduler.interface';

export const schedulers: Array<Scheduler> = [
{
id: '0148093543698',
daily: {
hour: 8,
minute: 0
},
executionParameter: {
options: ['installDependencies', 'unitTest', 'lint']
},
firstExecution: '2021-11-10T17:55:00-03:00',
processID: 'process3',
rangeExecutions: {
frequency: {
type: 'hour',
value: 2
},
rangeLimit: {
hour: 18,
minute: 0
}
},
recurrent: true,
},
{
id: '0148093543699',
monthly: {
day: 2,
hour: 2,
minute: 30
},
executionParameter: {
options: ['installDependencies']
},
firstExecution: '2021-11-10T17:55:00-03:00',
processID: 'process1',
recurrent: true,
},
{
id: '0148093543697',
weekly: {
daysOfWeek: ['Sunday', 'Friday', 'Tuesday'],
hour: 18,
minute: 0
},
executionParameter: {
options: ['installDependencies']
},
firstExecution: '2021-11-10T17:55:00-03:00',
processID: 'process2',
recurrent: true,
},
];
9 changes: 9 additions & 0 deletions src/scheduler/dto/create-scheduler.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ export class CreateSchedulerDto {
@ApiPropertyOptional()
daily: { hour: number, minute: number };

@ApiPropertyOptional()
id: string;

@ApiPropertyOptional()
executionParameter: object;

Expand All @@ -23,4 +26,10 @@ export class CreateSchedulerDto {
@ApiPropertyOptional()
weekly: { daysOfWeek: Array<string>, hour: number, minute: number };

@ApiPropertyOptional()
rangeExecutions: {
frequency: { type: string, value: number },
rangeLimit: { day: number, hour: number, minute: number }
};

}
26 changes: 24 additions & 2 deletions src/scheduler/scheduler.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller, Post, Body } from '@nestjs/common';
import { ApiTags, ApiBody } from '@nestjs/swagger';
import { Controller, Post, Body, Put, Get, Param } from '@nestjs/common';
import { ApiTags, ApiBody, ApiResponse, ApiParam } from '@nestjs/swagger';

import { SchedulerService } from './scheduler.service';
import { CreateSchedulerDto } from './dto/create-scheduler.dto';
Expand All @@ -10,10 +10,32 @@ export class SchedulerController {

constructor(private schedulerService: SchedulerService) {}

@ApiResponse({ status: 201, type: CreateSchedulerDto })
@ApiBody({ type: CreateSchedulerDto })
@Post()
createScheduler(@Body() newScheduler: CreateSchedulerDto) {
this.schedulerService.createScheduler(newScheduler);
}

@ApiResponse({ status: 200, type: CreateSchedulerDto })
@Get()
get(@Param() params) {
return this.schedulerService.getScheduler(params['id']);
}

@ApiResponse({ status: 200, type: CreateSchedulerDto })
@ApiParam({ name: 'id' })
@Get(':id')
getPerson(@Param() params) {
return this.schedulerService.getScheduler(params['id']);
}

@ApiResponse({ status: 201, type: CreateSchedulerDto })
@ApiParam({ name: 'id' })
@ApiBody({ type: CreateSchedulerDto })
@Put(':id')
updateScheduler(@Body() scheduler: CreateSchedulerDto, @Param() param) {
this.schedulerService.updateScheduler(param['id'], scheduler);
}

}
4 changes: 1 addition & 3 deletions src/scheduler/scheduler.data.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { Scheduler } from './scheduler.interface';

export const schedules: Array<Scheduler> = [
export const schedules = [
{
firstExecution: '2020-02-26T09:30:00-03:00',
recurrent: false,
Expand Down
7 changes: 7 additions & 0 deletions src/scheduler/scheduler.interface.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
export interface Scheduler {

id: string;

daily?: { hour: number, minute: number };

executionParameter?: object;
Expand All @@ -14,4 +16,9 @@ export interface Scheduler {

weekly?: { daysOfWeek: Array<string>, hour: number, minute: number };

rangeExecutions?: {
frequency: { type: string, value: number },
rangeLimit: { hour: number, minute: number }
};

}
2 changes: 1 addition & 1 deletion src/scheduler/scheduler.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ProcessesController } from './process/processes.controller';
import { ProcessesService } from './process/processes.service';

@Module({
controllers: [SchedulerController, ProcessesController],
controllers: [ ProcessesController, SchedulerController ], // essa ordem é importante para o correto funcionamento da api na estrutura atual
providers: [SchedulerService, ProcessesService]
})
export class SchedulerModule {}
14 changes: 12 additions & 2 deletions src/scheduler/scheduler.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import { Injectable } from '@nestjs/common';
import { Scheduler } from './scheduler.interface';
import { schedulers } from './db/scheduler.data';

import { schedules } from './scheduler.data';
import { CreateSchedulerDto } from './dto/create-scheduler.dto';

@Injectable()
export class SchedulerService {

createScheduler(scheduler: CreateSchedulerDto) {
schedules.push(scheduler);
schedulers.push(scheduler);
}

updateScheduler(id: string, updatedScheduler: CreateSchedulerDto) {
const scheduler = this.getScheduler(id);
Object.assign(scheduler, updatedScheduler);
}

getScheduler(id: string): Scheduler {
return schedulers.find(item => item.id === id);
}

}