@wmfs/tymly-schedule-plugin 1.3.1 → 1.5.0

package/.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
           TZ: "Europe/London"
           PG_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/circle_test
           TIMEOUT: 15000
-      - image: cimg/postgres:13.4-postgis
+      - image: cimg/postgres:15.1-postgis
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

package/.version

@@ -1 +1 @@
-VERSION=1.3.1
+VERSION=1.5.0

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+# [1.5.0](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.4.0...v1.5.0) (2023-02-17)
+
+
+### 🛠 Builds
+
+* **deps-dev:** update dependency mocha to v10.2.0 ([d7d7747](https://github.com/wmfs/tymly-schedule-plugin/commit/d7d77477e929b95cade480db82d37454517122d1))
+* **deps-dev:** update dependency semantic-release to v20 ([dd51685](https://github.com/wmfs/tymly-schedule-plugin/commit/dd51685b8ba3a42146c9feec11b7b83ea6097f4c))
+* **deps-dev:** update dependency semantic-release to v20.0.1 ([36ed615](https://github.com/wmfs/tymly-schedule-plugin/commit/36ed6153d3b8b43d56c4beef50a0e86e9f5dc8fd))
+* **deps-dev:** update dependency semantic-release to v20.0.2 ([272c053](https://github.com/wmfs/tymly-schedule-plugin/commit/272c053596098645f47aefab2efddc59546bab2c))
+* **deps-dev:** update dependency semantic-release to v20.0.3 ([2f96e3c](https://github.com/wmfs/tymly-schedule-plugin/commit/2f96e3cac10e8c69c52ec8ad8b52db7dadd59d92))
+* **deps-dev:** update dependency semantic-release to v20.0.4 ([15597ed](https://github.com/wmfs/tymly-schedule-plugin/commit/15597edd8483cff4118fadc50529a8b7d0a28540))
+* **deps-dev:** update dependency semantic-release to v20.1.0 ([6b744c4](https://github.com/wmfs/tymly-schedule-plugin/commit/6b744c4cce7dc2fb8df1c724c3fe789e2c3f69b1))
+* **deps:** update dependency node-schedule to v2.1.1 ([cf7f73f](https://github.com/wmfs/tymly-schedule-plugin/commit/cf7f73f00566666bc99d151115eadb6ec408879d))
+
+
+### ⚙️ Continuous Integrations
+
+* **circle:** CircleCI update PostgreSQL image to 15 0 [sc-18659] ([f9d9bd9](https://github.com/wmfs/tymly-schedule-plugin/commit/f9d9bd9d9a5edcfc8311be7561f5ba48ca051974))
+* **circle:** update postgres to 15.1-postgis ([dc635d7](https://github.com/wmfs/tymly-schedule-plugin/commit/dc635d78b81fdb17f63f23d7164a643c0f70591e))
+
+# [1.4.0](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.3.1...v1.4.0) (2022-12-06)
+
+
+### ✨ Features
+
+* commiting progress ([26d8ed1](https://github.com/wmfs/tymly-schedule-plugin/commit/26d8ed1b5fdbbb0a8a85e0a40308e9c8fb8d4339))
+
+
+### 🐛 Bug Fixes
+
+* issues with conflict ([37af828](https://github.com/wmfs/tymly-schedule-plugin/commit/37af82807d1b4b20c57f9a5ebc8396394790b2d9))
+
+
+### 🛠 Builds
+
+* **deps-dev:** update dependency [@semantic-release](https://github.com/semantic-release)/changelog to v6.0.2 ([908350d](https://github.com/wmfs/tymly-schedule-plugin/commit/908350d9c5d5a28848018e49504d8d0efb8f2fc2))
+* **deps-dev:** update dependency [@wmfs](https://github.com/wmfs)/tymly-pg-plugin to v1.276.0 ([c1d33c2](https://github.com/wmfs/tymly-schedule-plugin/commit/c1d33c24891d1bdea789bb7ebc362fd46c2c288b))
+* **deps-dev:** update dependency [@wmfs](https://github.com/wmfs)/tymly-test-helpers to v1.22.2 ([7ce3a0d](https://github.com/wmfs/tymly-schedule-plugin/commit/7ce3a0d358b642dd9b3b48aa1458459e4b266dc7))
+* **deps-dev:** update dependency chai to v4.3.7 ([0ba95fa](https://github.com/wmfs/tymly-schedule-plugin/commit/0ba95fa34087c7efafe4d5da6f3f709c9d014a5d))
+
 ## [1.3.1](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.3.0...v1.3.1) (2022-11-29)
 
 

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

@@ -1,14 +1,16 @@
+const moment = require('moment')
+
 module.exports = function (datetime) {
   if (!(datetime instanceof Date)) {
     datetime = new Date()
   }
 
   return {
-    year: datetime.getFullYear(),
-    month: datetime.getMonth(),
-    date: datetime.getDate(),
-    hour: datetime.getHours(),
-    minute: datetime.getMinutes(),
-    second: datetime.getSeconds()
+    year: moment(datetime).year(),
+    month: moment(datetime).month(),
+    date: moment(datetime).date(),
+    hour: moment(datetime).hour(),
+    minute: moment(datetime).minute(),
+    second: moment(datetime).second()
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wmfs/tymly-schedule-plugin",
-  "version": "1.3.1",
+  "version": "1.5.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,25 +22,25 @@
   },
   "main": "./lib/index.js",
   "dependencies": {
-    "node-schedule": "2.1.0",
+    "node-schedule": "2.1.1",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "6.0.1",
+    "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@wmfs/tymly": "1.242.0",
-    "@wmfs/tymly-pg-plugin": "1.269.0",
-    "@wmfs/tymly-test-helpers": "1.22.1",
-    "chai": "4.3.6",
+    "@wmfs/tymly-pg-plugin": "1.276.0",
+    "@wmfs/tymly-test-helpers": "1.22.2",
+    "chai": "4.3.7",
     "codecov": "3.8.3",
     "conventional-changelog-metahub": "4.0.1",
     "cz-conventional-changelog": "3.3.0",
     "dirty-chai": "2.0.1",
-    "mocha": "10.1.0",
+    "mocha": "10.2.0",
     "moment": "2.29.4",
     "nyc": "15.1.0",
-    "semantic-release": "19.0.5",
+    "semantic-release": "20.1.0",
     "standard": "17.0.0"
   },
   "scripts": {

package/plugin.json

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

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

@@ -2,6 +2,7 @@
 
 const expect = require('chai').expect
 
+const moment = require('moment')
 const ruleToDatetime = require('../lib/components/services/schedule/utils/rule-to-datetime')
 const datetimeToRule = require('../lib/components/services/schedule/utils/datetime-to-rule')
 
@@ -75,29 +76,58 @@ describe('Rule to datetime tests', function () {
 
 describe('Datetime to rule tests', function () {
   it('No options, should default to now', () => {
-    const now = new Date()
+    const now = moment()
     const rule = datetimeToRule()
 
-    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.minute).to.eql(now.getMinutes())
-    expect(rule.second).to.eql(now.getSeconds())
+    expect(rule.year).to.eql(now.year())
+    expect(rule.month).to.eql(now.month())
+    expect(rule.date).to.eql(now.date())
+    expect(rule.hour).to.eql(now.hour())
+    expect(rule.minute).to.eql(now.minute())
+    expect(rule.second).to.eql(now.second())
   })
 
   it('Specific year, the rest should default to now', () => {
-    const datetime = new Date()
+    let datetime = new Date()
     const year = datetime.getFullYear() + 2
     datetime.setFullYear(year)
 
     const rule = datetimeToRule(datetime)
+    datetime = moment(datetime)
 
     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.minute).to.eql(datetime.getMinutes())
-    expect(rule.second).to.eql(datetime.getSeconds())
+    expect(rule.month).to.eql(datetime.month())
+    expect(rule.date).to.eql(datetime.date())
+    expect(rule.hour).to.eql(datetime.hour())
+    expect(rule.minute).to.eql(datetime.minute())
+    expect(rule.second).to.eql(datetime.second())
+  })
+
+  it('DST test, should change time by +1 hour', () => {
+    const currentDateTime = new Date('Sunday March 27 2022 00:59:00')
+
+    // 2022-03-27T02:00:00+01:00
+    const startDSTDateTime = moment(currentDateTime).add(1, 'minutes')
+
+    // adding 1 min and setting as Date object
+    const rule = datetimeToRule(new Date(currentDateTime.getTime() + (60 * 1000)))
+
+    expect(rule.date).to.eql(startDSTDateTime.date())
+    expect(rule.hour).to.eql(startDSTDateTime.hour())
+    expect(rule.minute).to.eql(startDSTDateTime.minute())
+  })
+
+  it('DST test, should change time by -1 hour', () => {
+    const currentDateTime = new Date('Sunday October 30 2022 01:59:00')
+
+    // 2022-10-30T01:00:00+00:00
+    const endDSTDateTime = moment(currentDateTime).add(1, 'minutes')
+
+    // adding 1 min and setting as Date object
+    const rule = datetimeToRule(new Date(currentDateTime.getTime() + (60 * 1000)))
+
+    expect(rule.date).to.eql(endDSTDateTime.date())
+    expect(rule.hour).to.eql(endDSTDateTime.hour())
+    expect(rule.minute).to.eql(endDSTDateTime.minute())
   })
 })