@wmfs/tymly-schedule-plugin 1.13.0 → 1.13.2

package/.circleci/config.yml

@@ -1,6 +1,6 @@
-version: 2
+version: 2.1
 jobs:
-  unit test:
+  unit-test:
     docker:
       - image: cimg/node:lts
         auth:
@@ -88,10 +88,9 @@ jobs:
             chmod +x version_plugin
             npx semantic-release
 workflows:
-  version: 2
   test_and_release:
     jobs:
-      - unit test:
+      - unit-test:
           context:
             - docker-hub-creds
             - build-env-vars
@@ -104,7 +103,7 @@ workflows:
             - docker-hub-creds
             - build-env-vars
           requires:
-            - unit test
+            - unit-test
             - lint
           filters:
             branches:

package/.version

@@ -1 +1 @@
-VERSION=1.13.0
+VERSION=1.13.2

package/CHANGELOG.md

@@ -1,3 +1,59 @@
+## [1.13.2](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.13.1...v1.13.2) (2026-08-13)
+
+## [1.13.1](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.13.0...v1.13.1) (2026-03-17)
+
+### Bug Fix(es) :bug:
+
+* [sc-32407] Investigate why EPM Notifications are not being received when raising a statutory notice in ridge ([8d68a91](https://github.com/wmfs/tymly-schedule-plugin/commit/8d68a91cc31a61ee98185de37d418e8c1ecb6588))
+
+### Build system dependencies :hammer:
+
+* **deps-dev:** update dependency @semantic-release/exec to v7.1.0 ([#154](https://github.com/wmfs/tymly-schedule-plugin/issues/154)) ([8cd09d0](https://github.com/wmfs/tymly-schedule-plugin/commit/8cd09d0255baf75df189e17423936b6cf91e42dd))
+* **deps-dev:** update dependency @semantic-release/release-notes-generator to v14.1.0 ([#179](https://github.com/wmfs/tymly-schedule-plugin/issues/179)) ([1e4f92d](https://github.com/wmfs/tymly-schedule-plugin/commit/1e4f92df3a5db14828b8effb4f9efdec28a0d3fe))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.313.0 ([#147](https://github.com/wmfs/tymly-schedule-plugin/issues/147)) ([09af57f](https://github.com/wmfs/tymly-schedule-plugin/commit/09af57f34e4d07753091256ca64ff9afd0a22e77))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.315.0 ([#148](https://github.com/wmfs/tymly-schedule-plugin/issues/148)) ([58f776d](https://github.com/wmfs/tymly-schedule-plugin/commit/58f776d35796a8c1f51ec96cad96e116971ebfa0))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.317.0 ([#149](https://github.com/wmfs/tymly-schedule-plugin/issues/149)) ([b318d92](https://github.com/wmfs/tymly-schedule-plugin/commit/b318d92c15db26009b38ea218a790c19a7b36074))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.319.0 ([#150](https://github.com/wmfs/tymly-schedule-plugin/issues/150)) ([fa7efcf](https://github.com/wmfs/tymly-schedule-plugin/commit/fa7efcfc426bacc25710be60195bc6999b44b67c))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.323.0 ([#151](https://github.com/wmfs/tymly-schedule-plugin/issues/151)) ([a457f21](https://github.com/wmfs/tymly-schedule-plugin/commit/a457f21ae2f5322a062d28f6b6ace74135ea6a92))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.327.0 ([#152](https://github.com/wmfs/tymly-schedule-plugin/issues/152)) ([591b57c](https://github.com/wmfs/tymly-schedule-plugin/commit/591b57c22a132cfb7c6983a79e4f5cf009e0c254))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.332.0 ([#155](https://github.com/wmfs/tymly-schedule-plugin/issues/155)) ([6be937a](https://github.com/wmfs/tymly-schedule-plugin/commit/6be937a3e7f74c673eab512a73b0e2b65fcd0628))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.333.0 ([#162](https://github.com/wmfs/tymly-schedule-plugin/issues/162)) ([d691f37](https://github.com/wmfs/tymly-schedule-plugin/commit/d691f374a857599ccdbe51cd5af21f873f216c83))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.334.0 ([#163](https://github.com/wmfs/tymly-schedule-plugin/issues/163)) ([705a365](https://github.com/wmfs/tymly-schedule-plugin/commit/705a365d46ac4b2cdf36616490325633fadff713))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.335.0 ([#165](https://github.com/wmfs/tymly-schedule-plugin/issues/165)) ([b395f76](https://github.com/wmfs/tymly-schedule-plugin/commit/b395f76ac3861697c4791f3693e668eaa516dca0))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.337.0 ([#167](https://github.com/wmfs/tymly-schedule-plugin/issues/167)) ([d657fec](https://github.com/wmfs/tymly-schedule-plugin/commit/d657fecee8b55702f21861a7643f20f33fc79cde))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.338.0 ([#170](https://github.com/wmfs/tymly-schedule-plugin/issues/170)) ([5eee342](https://github.com/wmfs/tymly-schedule-plugin/commit/5eee342fea042fb93b48cedc86df6f9aa9b3fa62))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.339.0 ([#171](https://github.com/wmfs/tymly-schedule-plugin/issues/171)) ([5a2737f](https://github.com/wmfs/tymly-schedule-plugin/commit/5a2737f79e8477771ee9de81252d17a57b33de7a))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.340.0 ([#172](https://github.com/wmfs/tymly-schedule-plugin/issues/172)) ([d43ceb2](https://github.com/wmfs/tymly-schedule-plugin/commit/d43ceb2848f1ac80ae9def8612fc67cba97628a5))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.341.0 ([#174](https://github.com/wmfs/tymly-schedule-plugin/issues/174)) ([2e39a80](https://github.com/wmfs/tymly-schedule-plugin/commit/2e39a8005fce21d23f545c39be6a5316e8b47661))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.346.0 ([#189](https://github.com/wmfs/tymly-schedule-plugin/issues/189)) ([81bb753](https://github.com/wmfs/tymly-schedule-plugin/commit/81bb75349d881d82e4f28cb4b24358deceaeee8d))
+* **deps-dev:** update dependency @wmfs/tymly-pg-plugin to v1.348.0 ([#190](https://github.com/wmfs/tymly-schedule-plugin/issues/190)) ([c595d4a](https://github.com/wmfs/tymly-schedule-plugin/commit/c595d4ac6d908d0f782024468f6c63c618517b1e))
+* **deps-dev:** update dependency conventional-changelog-conventionalcommits to v9 ([#159](https://github.com/wmfs/tymly-schedule-plugin/issues/159)) ([0fe5244](https://github.com/wmfs/tymly-schedule-plugin/commit/0fe52440e6afd12c6eded392bee057fb8d173f8e))
+* **deps-dev:** update dependency conventional-changelog-conventionalcommits to v9.1.0 ([#173](https://github.com/wmfs/tymly-schedule-plugin/issues/173)) ([4be4be3](https://github.com/wmfs/tymly-schedule-plugin/commit/4be4be3425a7674cf0f921b812b4a1b9e20d20b9))
+* **deps-dev:** update dependency conventional-changelog-conventionalcommits to v9.2.0 ([#195](https://github.com/wmfs/tymly-schedule-plugin/issues/195)) ([aa671ee](https://github.com/wmfs/tymly-schedule-plugin/commit/aa671ee65cd3afec56174bead43c4e46c726894b))
+* **deps-dev:** update dependency conventional-changelog-conventionalcommits to v9.3.0 ([#196](https://github.com/wmfs/tymly-schedule-plugin/issues/196)) ([02381ee](https://github.com/wmfs/tymly-schedule-plugin/commit/02381eeae36e74f888432bf7f6de60b2b2c93f57))
+* **deps-dev:** update dependency mocha to v11.2.2 ([#153](https://github.com/wmfs/tymly-schedule-plugin/issues/153)) ([996ad74](https://github.com/wmfs/tymly-schedule-plugin/commit/996ad74bf7e8a02c5e38dc4b9288be80fe8638c9))
+* **deps-dev:** update dependency mocha to v11.3.0 ([#156](https://github.com/wmfs/tymly-schedule-plugin/issues/156)) ([f2e4d01](https://github.com/wmfs/tymly-schedule-plugin/commit/f2e4d01e1ce1b0861c9e49e1ace225fa7425bed8))
+* **deps-dev:** update dependency mocha to v11.4.0 ([#158](https://github.com/wmfs/tymly-schedule-plugin/issues/158)) ([7424a2f](https://github.com/wmfs/tymly-schedule-plugin/commit/7424a2fc45aac5b19875b3ebb5193ff36326d47d))
+* **deps-dev:** update dependency mocha to v11.5.0 ([#161](https://github.com/wmfs/tymly-schedule-plugin/issues/161)) ([16158be](https://github.com/wmfs/tymly-schedule-plugin/commit/16158bee0c9cc8e782250e3d921185ee877e24cd))
+* **deps-dev:** update dependency mocha to v11.6.0 ([#164](https://github.com/wmfs/tymly-schedule-plugin/issues/164)) ([7a5ce1c](https://github.com/wmfs/tymly-schedule-plugin/commit/7a5ce1c59a70b4da726fc092c4957ba7b771034b))
+* **deps-dev:** update dependency mocha to v11.7.0 ([#166](https://github.com/wmfs/tymly-schedule-plugin/issues/166)) ([0617ab0](https://github.com/wmfs/tymly-schedule-plugin/commit/0617ab0dafff31cefee164405d3dccc5b5adf760))
+* **deps-dev:** update dependency mocha to v11.7.1 ([#168](https://github.com/wmfs/tymly-schedule-plugin/issues/168)) ([9f7a7c0](https://github.com/wmfs/tymly-schedule-plugin/commit/9f7a7c0453788e03a2ebfc99de960488d3ddb4fb))
+* **deps-dev:** update dependency mocha to v11.7.2 ([#177](https://github.com/wmfs/tymly-schedule-plugin/issues/177)) ([fe8c84e](https://github.com/wmfs/tymly-schedule-plugin/commit/fe8c84ea4a6fd089951713e6f3bd3c1c5803ba43))
+* **deps-dev:** update dependency mocha to v11.7.3 ([#183](https://github.com/wmfs/tymly-schedule-plugin/issues/183)) ([ac21e65](https://github.com/wmfs/tymly-schedule-plugin/commit/ac21e65d76765ae70d70e1799bbe7ab59f5fcf34))
+* **deps-dev:** update dependency mocha to v11.7.4 ([#184](https://github.com/wmfs/tymly-schedule-plugin/issues/184)) ([30c25f0](https://github.com/wmfs/tymly-schedule-plugin/commit/30c25f07da16a04deba8fd13812959acb951305f))
+* **deps-dev:** update dependency mocha to v11.7.5 ([#187](https://github.com/wmfs/tymly-schedule-plugin/issues/187)) ([2ca8154](https://github.com/wmfs/tymly-schedule-plugin/commit/2ca815449ce94f7ca92dab843a5632419d9054f8))
+* **deps-dev:** update dependency nyc to v18 ([#194](https://github.com/wmfs/tymly-schedule-plugin/issues/194)) ([3fd7ef7](https://github.com/wmfs/tymly-schedule-plugin/commit/3fd7ef7e10558e34ff20f235fc05eb0673d0ad55))
+* **deps-dev:** update dependency semantic-release to v24.2.4 ([#157](https://github.com/wmfs/tymly-schedule-plugin/issues/157)) ([ef7f707](https://github.com/wmfs/tymly-schedule-plugin/commit/ef7f707efebf178b7cfdb615c1d2d7a381bc78b7))
+* **deps-dev:** update dependency semantic-release to v24.2.5 ([#160](https://github.com/wmfs/tymly-schedule-plugin/issues/160)) ([ba72f2f](https://github.com/wmfs/tymly-schedule-plugin/commit/ba72f2ff59ab132f3b537f28035a44c38e27a950))
+* **deps-dev:** update dependency semantic-release to v24.2.6 ([#169](https://github.com/wmfs/tymly-schedule-plugin/issues/169)) ([4a2be7e](https://github.com/wmfs/tymly-schedule-plugin/commit/4a2be7eb75a5d30caf25f65f8e135a187de27173))
+* **deps-dev:** update dependency semantic-release to v24.2.7 ([#175](https://github.com/wmfs/tymly-schedule-plugin/issues/175)) ([5665eb0](https://github.com/wmfs/tymly-schedule-plugin/commit/5665eb0b9352588812ff9413e54e1cecdc358d13))
+* **deps-dev:** update dependency semantic-release to v24.2.8 ([#181](https://github.com/wmfs/tymly-schedule-plugin/issues/181)) ([47843f1](https://github.com/wmfs/tymly-schedule-plugin/commit/47843f128c54d9c3945b615a025471986de3260c))
+* **deps-dev:** update dependency semantic-release to v24.2.9 ([#182](https://github.com/wmfs/tymly-schedule-plugin/issues/182)) ([9112a32](https://github.com/wmfs/tymly-schedule-plugin/commit/9112a32737928906267775d6cc193fa8e7cbd014))
+* **deps-dev:** update dependency semantic-release to v25 ([#185](https://github.com/wmfs/tymly-schedule-plugin/issues/185)) ([c962b5e](https://github.com/wmfs/tymly-schedule-plugin/commit/c962b5efb5549522eb2da1df57650fa0f7739487))
+* **deps-dev:** update dependency semantic-release to v25.0.1 ([#186](https://github.com/wmfs/tymly-schedule-plugin/issues/186)) ([421f697](https://github.com/wmfs/tymly-schedule-plugin/commit/421f69738f87e6cc5d013d91f804d21ca6bfa68c))
+* **deps-dev:** update dependency semantic-release to v25.0.2 ([#188](https://github.com/wmfs/tymly-schedule-plugin/issues/188)) ([547f483](https://github.com/wmfs/tymly-schedule-plugin/commit/547f4833d3c90d2acd848a555c85df2b314b1b77))
+* **deps-dev:** update dependency semantic-release to v25.0.3 ([#192](https://github.com/wmfs/tymly-schedule-plugin/issues/192)) ([e32d34d](https://github.com/wmfs/tymly-schedule-plugin/commit/e32d34dfd5ffe83d4307ff38453db46d8d9ad489))
+
 ## [1.13.0](https://github.com/wmfs/tymly-schedule-plugin/compare/v1.12.0...v1.13.0) (2025-02-20)
 
 ### Build system dependencies :hammer:

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

@@ -8,6 +8,7 @@ const { v4: uuidv4 } = require('uuid')
 class CronService {
   async boot (options) {
     this.statebox = options.bootedServices.statebox
+    this.userInfo = options.bootedServices.userInfo
     this.taskModel = options.bootedServices.storage.models.schedule_task
     this.executionModel = options.bootedServices.storage.models.tymly_execution
 
@@ -21,7 +22,7 @@ class CronService {
     }
   } // boot
 
-  startTask (key) {
+  async startTask (key) {
     const task = this.scheduledTasks[key]
 
     if (!task) {
@@ -35,7 +36,9 @@ class CronService {
       datetime,
       stateMachineName,
       sendResponse,
-      input
+      input,
+      createdBy,
+      modifiedBy
     } = task
 
     const jobOptions = {
@@ -54,6 +57,9 @@ class CronService {
         })
     }
 
+    const email = modifiedBy ?? createdBy
+    const userId = email ? await this.userInfo.userIdFromEmail(email) : null
+
     // todo: allow window for start/end datetimes
     task.job = nodeSchedule.scheduleJob(
       jobOptions,
@@ -67,6 +73,9 @@ class CronService {
           },
           sendResponse
         }
+        if (userId) {
+          executionOptions.userId = userId
+        }
         const cb = async (err, executionDescription) => {
           if (err) {
             console.log(`There was an error on execution of scheduled state machine ${stateMachineName}`)
@@ -162,7 +171,7 @@ class CronService {
   } // findTasks
 
   persistTask (key, config) {
-    return this.taskModel.create({
+    const task = {
       key,
       stateMachineName: config.stateMachineName,
       input: config.input,
@@ -172,7 +181,13 @@ class CronService {
       datetime: config.datetime,
       startOnBoot: config.startOnBoot,
       status: null
-    })
+    }
+
+    if (config.createdBy) {
+      task.createdBy = config.createdBy
+    }
+
+    return this.taskModel.create(task)
   } // persistTask
 
   checkIfStateMachineExists (stateMachineName) {
@@ -265,7 +280,6 @@ class CronService {
 
   createScheduledTask (key, config = {}) {
     if (key === null) {
-      console.log('no key, generating...')
       key = uuidv4()
     }
     this.scheduledTasks[key] = config
@@ -279,5 +293,5 @@ class CronService {
 
 module.exports = {
   serviceClass: CronService,
-  bootAfter: ['statebox']
+  bootAfter: ['statebox', 'userInfo']
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wmfs/tymly-schedule-plugin",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Provides state machine scheduling for the Tymly framework",
   "homepage": "https://github.com/wmfs/tymly-schedule-plugin#readme",
   "author": "West Midlands Fire Service",
@@ -27,21 +27,21 @@
     "moment": "2.30.1"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "6.0.3",
-    "@semantic-release/release-notes-generator": "14.0.3",
-    "@semantic-release/exec": "7.0.3",
-    "@semantic-release/git": "10.0.1",
+    "@semantic-release/changelog": "7.0.0",
+    "@semantic-release/release-notes-generator": "14.1.1",
+    "@semantic-release/exec": "7.1.0",
+    "@semantic-release/git": "11.0.1",
     "@wmfs/tymly": "1.242.0",
-    "@wmfs/tymly-pg-plugin": "1.310.0",
+    "@wmfs/tymly-pg-plugin": "1.348.0",
     "@wmfs/tymly-test-helpers": "1.24.0",
     "chai": "4.5.0",
     "codecov": "3.8.3",
-    "conventional-changelog-conventionalcommits": "8.0.0",
+    "conventional-changelog-conventionalcommits": "10.3.0",
     "cz-conventional-changelog": "3.3.0",
     "dirty-chai": "2.0.1",
-    "mocha": "11.1.0",
-    "nyc": "17.1.0",
-    "semantic-release": "24.2.3",
+    "mocha": "11.8.0",
+    "nyc": "18.0.0",
+    "semantic-release": "25.0.9",
     "standard": "17.1.2"
   },
   "scripts": {

package/plugin.json

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

package/test/schedule-tests.js

@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect
 const tymly = require('@wmfs/tymly')
-const path = require('path')
+const path = require('node:path')
 const moment = require('moment')
 
 const scheduleKey = 'tymlyTest_twoSecondCatUpdates'
@@ -34,7 +34,8 @@ describe('Tymly schedule tests', function () {
         pluginPaths: [
           path.resolve(__dirname, '..'),
           require.resolve('@wmfs/tymly-pg-plugin'),
-          require.resolve('@wmfs/tymly-test-helpers/plugins/mock-users-plugin')
+          require.resolve('@wmfs/tymly-test-helpers/plugins/mock-users-plugin'),
+          require.resolve('@wmfs/tymly-test-helpers/plugins/mock-user-info-plugin')
         ]
       }
     )
@@ -152,6 +153,54 @@ describe('Tymly schedule tests', function () {
     expect(catStats.length).to.eql(lastRunCount)
   })
 
+  it('set scheduled task createdBy column', async () => {
+    await client.query(`UPDATE schedule.task SET _created_by = 'tymly.test@wmfs.net' where key='${scheduleKey}';`)
+  })
+
+  it('check the task update has persisted to the database', async () => {
+    const tasks = await taskModel.find({})
+    expect(tasks.length).to.eql(1)
+    expect(tasks[0].createdBy).to.eql('tymly.test@wmfs.net')
+  })
+
+  it('update task to specific date/time (again)', async () => {
+    const datetime = moment().utc().add(10, 'seconds').toDate()
+    console.log(`scheduled: ${datetime}`)
+
+    await scheduleService.stopAndUpdateTaskSchedule(
+      scheduleKey,
+      {
+        year: datetime.getFullYear(),
+        month: datetime.getMonth(),
+        date: datetime.getDate(),
+        hour: datetime.getHours(),
+        minute: datetime.getMinutes(),
+        second: datetime.getSeconds()
+      }
+    )
+
+    await scheduleService.startTask(scheduleKey)
+  })
+
+  it('wait 15 seconds', done => setTimeout(done, 15000))
+
+  it('check the state machine has run once more', async () => {
+    lastRunCount++
+
+    const tasks = await taskModel.find({})
+    expect(tasks.length).to.eql(1)
+    expect(tasks[0].interval).to.eql(null)
+    expect(tasks[0].datetime).to.not.eql(null)
+    expect(tasks[0].scheduleType).to.eql('datetime')
+    expect(tasks[0].status).to.eql('STARTED')
+
+    const executions = await scheduleService.findScheduledExecutions(scheduleKey)
+    expect(executions.length).to.eql(lastRunCount)
+
+    const catStats = await catStatsModel.find({})
+    expect(catStats.length).to.eql(lastRunCount)
+  })
+
   it('shutdown Tymly', async () => {
     await tymlyService.shutdown()
   })
@@ -165,7 +214,8 @@ describe('Tymly schedule tests', function () {
         pluginPaths: [
           path.resolve(__dirname, '..'),
           require.resolve('@wmfs/tymly-pg-plugin'),
-          require.resolve('@wmfs/tymly-test-helpers/plugins/mock-users-plugin')
+          require.resolve('@wmfs/tymly-test-helpers/plugins/mock-users-plugin'),
+          require.resolve('@wmfs/tymly-test-helpers/plugins/mock-user-info-plugin')
         ]
       }
     )