@wmfs/tymly-schedule-plugin 1.1.0 → 1.2.0

package/.version

@@ -1 +1 @@
-VERSION=1.1.0
+VERSION=1.2.0

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+# [1.2.0](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.1.0...v1.2.0) (2022-07-28)
+
+
+### ✨ Features
+
+* updates for scheduled sending [sc-14535] ([8703224](https://github.com/wmfs/tymly-schedule-plugin/commit/8703224e3c1cf8a0ba93be3027eafa64841cfc4f))
+
+
+### 🐛 Bug Fixes
+
+* update unit tests for datetime [sc-14535] ([155d3a5](https://github.com/wmfs/tymly-schedule-plugin/commit/155d3a544f6dcb9cf22c95713b5bd62a6a2d45c9))
+
+
+### 🛠 Builds
+
+* **deps-dev:** update dependency [@wmfs](https://github.com/wmfs)/tymly-pg-plugin to v1.268.1 ([0bd7069](https://github.com/wmfs/tymly-schedule-plugin/commit/0bd7069404eadf1d08e3824ed1ce9d1ff6816cfc))
+* **deps-dev:** update dependency [@wmfs](https://github.com/wmfs)/tymly-test-helpers to v1.17.0 ([e9202a6](https://github.com/wmfs/tymly-schedule-plugin/commit/e9202a6cd86dc8429dfa1d077bccdef985231d85))
+
+
+### ♻️ Chores
+
+* enable tymly sync ([58ce844](https://github.com/wmfs/tymly-schedule-plugin/commit/58ce844d32d72c4be3c7cd19d230a99b6b53db6f))
+
 # [1.1.0](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.0.1...v1.1.0) (2022-03-16)
 
 

package/lib/components/services/schedule/index.js

@@ -3,6 +3,7 @@ const INSTIGATING_CLIENT_DOMAIN = 'tymly-schedule-plugin'
 const nodeSchedule = require('node-schedule')
 const ruleToDatetime = require('./utils/rule-to-datetime')
 const datetimeToRule = require('./utils/datetime-to-rule')
+const { v4: uuidv4 } = require('uuid')
 
 class CronService {
   async boot (options) {
@@ -54,7 +55,6 @@ class CronService {
     }
 
     // todo: allow window for start/end datetimes
-
     task.job = nodeSchedule.scheduleJob(
       jobOptions,
       () => {
@@ -264,6 +264,10 @@ class CronService {
   } // findScheduledExecutions
 
   createScheduledTask (key, config = {}) {
+    if (key === null) {
+      console.log('no key, generating...')
+      key = uuidv4()
+    }
     this.scheduledTasks[key] = config
     return this.persistTask(key, config)
   } // createScheduledTask

package/lib/components/services/schedule/utils/datetime-to-rule.js

@@ -7,7 +7,7 @@ module.exports = function (datetime) {
     year: datetime.getFullYear(),
     month: datetime.getMonth(),
     date: datetime.getDate(),
-    hour: datetime.getHours(),
+    hour: datetime.getHours() - 1,
     minute: datetime.getMinutes(),
     second: datetime.getSeconds()
   }

package/lib/components/state-resources/create-scheduled-task/index.js

@@ -48,8 +48,7 @@ class CreateScheduledTask {
     await this.services.schedule.createScheduledTask(key, config)
     // await this.services.schedule.stopAndUpdateTaskSchedule(key, rule)
     // await this.services.schedule.stopAndUpdateStateMachineConfig(key, stateMachineName, input)
-
-    return context.sendTaskSuccess()
+    return context.sendTaskSuccess(key)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wmfs/tymly-schedule-plugin",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Provides state machine scheduling for the Tymly framework",
   "homepage": "https://github.com/wmfs/tymly-schedule-plugin#readme",
   "author": "West Midlands Fire Service",
@@ -22,15 +22,16 @@
   },
   "main": "./lib/index.js",
   "dependencies": {
-    "node-schedule": "2.1.0"
+    "node-schedule": "2.1.0",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@wmfs/tymly": "1.235.1",
-    "@wmfs/tymly-pg-plugin": "1.268.0",
-    "@wmfs/tymly-test-helpers": "1.16.0",
+    "@wmfs/tymly-pg-plugin": "1.268.1",
+    "@wmfs/tymly-test-helpers": "1.17.0",
     "chai": "4.3.6",
     "codecov": "3.8.3",
     "conventional-changelog-metahub": "4.0.1",
@@ -51,9 +52,6 @@
   "config": {
     "commitizen": {
       "path": "cz-conventional-changelog"
-    },
-    "tymly": {
-      "sync": false
     }
   },
   "publishConfig": {

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "schedule-plugin",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "label": "Tymly Schedule Plugin",
   "author": "WMFS",
   "organisation": "West Midlands Fire Service",

package/test/rule-to-datetime-tests.js

@@ -81,7 +81,7 @@ describe('Datetime to rule tests', function () {
     expect(rule.year).to.eql(now.getFullYear())
     expect(rule.month).to.eql(now.getMonth())
     expect(rule.date).to.eql(now.getDate())
-    expect(rule.hour).to.eql(now.getHours())
+    expect(rule.hour).to.eql(now.getHours() - 1)
     expect(rule.minute).to.eql(now.getMinutes())
     expect(rule.second).to.eql(now.getSeconds())
   })
@@ -96,7 +96,7 @@ describe('Datetime to rule tests', function () {
     expect(rule.year).to.eql(year)
     expect(rule.month).to.eql(datetime.getMonth())
     expect(rule.date).to.eql(datetime.getDate())
-    expect(rule.hour).to.eql(datetime.getHours())
+    expect(rule.hour).to.eql(datetime.getHours() - 1)
     expect(rule.minute).to.eql(datetime.getMinutes())
     expect(rule.second).to.eql(datetime.getSeconds())
   })