ac-bootstrap-bull 2.1.1 → 2.1.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="2.1.2"></a>
+
+## [2.1.2](https://github.com/admiralcloud/ac-bootstrap-bull/compare/v2.1.1..v2.1.2) (2024-12-01 17:02:13)
+
+
+### Bug Fix
+
+* **App:** Improved jobId creation | MP | [f6ee6e16539230bf089ee05e337b73d6a0288e0c](https://github.com/admiralcloud/ac-bootstrap-bull/commit/f6ee6e16539230bf089ee05e337b73d6a0288e0c)    
+All jobIds should be prefixed with customerId. Job.remove should remove the entry in customer actitivies  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+### Chores
+
+* **App:** Updated packages | MP | [dde087d2753e8531dfd6ce3a25b5c664748119ad](https://github.com/admiralcloud/ac-bootstrap-bull/commit/dde087d2753e8531dfd6ce3a25b5c664748119ad)    
+Updated packages  
+Related issues: [undefined/undefined#master](undefined/browse/master)
 <a name="2.1.1"></a>
 
 ## [2.1.1](https://github.com/admiralcloud/ac-bootstrap-bull/compare/v2.1.0..v2.1.1) (2024-10-13 13:37:17)

package/index.js

@@ -3,6 +3,7 @@ const _ = require('lodash')
 const Redis = require('ioredis')
 const async = require('async')
 const redisLock = require('ac-redislock')
+const { v4: uuidV4 } = require('uuid')
 
 
 module.exports = function(acapi) {
@@ -158,8 +159,13 @@ module.exports = function(acapi) {
     const name = _.get(params, 'name') // named job
     const jobPayload = _.get(params, 'jobPayload')
     const jobOptions = _.get(params, 'jobOptions', {})
-    if (_.get(jobPayload, 'jobId')) {
-      _.set(jobOptions, 'jobId', _.get(jobPayload, 'jobId'))
+
+    // prefix jobIds with customerId, make sure to set a jobId (uuidV4)
+    const customerId = _.get(jobPayload, 'customerId')
+    if (customerId) {
+      const plainJobId = _.get(jobOptions, 'jobId') || _.get(jobPayload, 'jobId') || uuidV4()
+      const jobId = plainJobId.startsWith(customerId) ? plainJobId : `${customerId}:::${plainJobId}`
+      _.set(jobOptions, 'jobId', jobId)
     }
 
     const identifier = _.get(params, 'identifier') // e.g. customerId
@@ -227,6 +233,15 @@ module.exports = function(acapi) {
       removeJob: (done) => {
         job.remove()
         return done()
+      },
+      cleanUpActivity: async() => {
+        if (!acapi.redis.mcCache) return
+        const [ customerId, jobIdentifier ] = jobId.split(':::')
+        const redisKey = `${acapi.config.environment}:v5:${customerId}:activities`
+        const multi = acapi.redis.mcCache.multi()
+        multi.hdel(redisKey, jobIdentifier)
+        multi.hdel(redisKey, `${jobIdentifier}:progress`)
+        await multi.exec()
       }
     }, function allDone(err) {
       if (err) acapi.log.error('%s | %s | %s | %s | Failed %j', functionName, functionIdentifier, queueName, jobId, err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ac-bootstrap-bull",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Bull helper",
   "repository": "admiralcloud/ac-bootstrap-bull",
   "author": "Mark Poepping <mark.poepping@admiralcloud.com>",
@@ -8,12 +8,12 @@
   "dependencies": {
     "ac-redislock": "^3.0.0",
     "async": "^3.2.6",
-    "bull": "^4.16.3",
+    "bull": "^4.16.4",
     "ioredis": "^5.4.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "ac-semantic-release": "^0.4.3",
-    "eslint": "^9.12.0"
+    "eslint": "^9.16.0"
   }
 }