Skip to content

Commit 16bcce1

Browse files
committed
Fix if seconds not passed
1 parent b0e4ae5 commit 16bcce1

File tree

3 files changed

+40
-16
lines changed

3 files changed

+40
-16
lines changed

main.js

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
11
class utils {
22
double(cronExpression) {
33
const interval = cronExpression.split(' ');
4-
4+
55
const expression = []
6-
expression["seconds"] = interval[0];
7-
expression["minutes"] = interval[1];
8-
expression["hours"] = interval[2];
9-
expression["daysOfMonth"] = interval[3];
10-
expression["months"] = interval[4];
11-
expression["daysOfWeek"] = interval[5];
12-
136
let new_expression = []
14-
new_expression["seconds"] = interval[0];
15-
new_expression["minutes"] = interval[1];
16-
new_expression["hours"] = interval[2];
17-
new_expression["daysOfMonth"] = interval[3];
18-
new_expression["months"] = interval[4];
19-
new_expression["daysOfWeek"] = interval[5];
7+
if(interval.length < 6){
8+
expression["seconds"] = "*";
9+
expression["minutes"] = interval[0];
10+
expression["hours"] = interval[1];
11+
expression["daysOfMonth"] = interval[2];
12+
expression["months"] = interval[3];
13+
expression["daysOfWeek"] = interval[4];
14+
15+
new_expression["seconds"] = expression["seconds"]
16+
new_expression["minutes"] = expression["minutes"]
17+
new_expression["hours"] = expression["hours"]
18+
new_expression["daysOfMonth"] = expression["daysOfMonth"]
19+
new_expression["months"] = expression["months"]
20+
new_expression["daysOfWeek"] = expression["daysOfWeek"]
21+
}
22+
else{
23+
expression["seconds"] = interval[0];
24+
expression["minutes"] = interval[1];
25+
expression["hours"] = interval[2];
26+
expression["daysOfMonth"] = interval[3];
27+
expression["months"] = interval[4];
28+
expression["daysOfWeek"] = interval[5];
29+
30+
new_expression["seconds"] = expression["seconds"];
31+
new_expression["minutes"] = expression["minutes"];
32+
new_expression["hours"] = expression["hours"];
33+
new_expression["daysOfMonth"] = expression["daysOfMonth"];
34+
new_expression["months"] = expression["months"];
35+
new_expression["daysOfWeek"] = expression["daysOfWeek"];
36+
}
37+
2038

2139

2240
let add_to_minutes = false;
@@ -69,9 +87,12 @@ class utils {
6987
if(add_to_minutes != false){
7088
new_expression["minutes"] = `*/${add_to_minutes}`;
7189
}
90+
else{
91+
new_expression["minutes"] = new_expression["minutes"]
92+
}
7293
}
7394
else{ // 5
74-
95+
new_expression["minutes"] = new_expression["minutes"]
7596
}
7697

7798
return `${new_expression["seconds"]} ${new_expression["minutes"]} ${new_expression["hours"]} ${new_expression["daysOfMonth"]} ${new_expression["months"]} ${new_expression["daysOfWeek"]}`;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@6degrees/node-cron-utils",
3-
"version": "0.0.3",
3+
"version": "0.0.4",
44
"description": "Utilities functions to manipulate node-cron expressions",
55
"main": "main.js",
66
"scripts": {

test/test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ test('testing 40 */40 * * * *', ()=>{
3737
expect(hi.double("40 */40 * * * *")).toBe("20 */21 * * * *") // Not sure if this is correct
3838
})
3939

40+
test('testing */5 * * * *', ()=>{
41+
expect(hi.double("*/5 * * * *")).toBe("*/2 */10 * * * *") // Not sure if this is correct
42+
})

0 commit comments

Comments
 (0)