@budibase/server 1.2.44-alpha.0 → 1.2.46

package/dist/utilities/fileSystem/index.js

@@ -14,7 +14,7 @@ const { join } = require("path");
 const uuid = require("uuid/v4");
 const { doWithDB, dangerousGetDB, closeDB, } = require("@budibase/backend-core/db");
 const { ObjectStoreBuckets } = require("../../constants");
-const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, deleteFiles, } = require("./utilities");
+const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, } = require("./utilities");
 const { updateClientLibrary } = require("./clientLibrary");
 const env = require("../../environment");
 const { USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, } = require("../../db/utils");
@@ -289,6 +289,5 @@ exports.cleanup = appIds => {
 exports.upload = upload;
 exports.retrieve = retrieve;
 exports.retrieveToTmp = retrieveToTmp;
-exports.deleteFiles = deleteFiles;
 exports.TOP_LEVEL_PATH = TOP_LEVEL_PATH;
 exports.NODE_MODULES_PATH = NODE_MODULES_PATH;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.44-alpha.0",
+  "version": "1.2.46",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.44-alpha.0",
-    "@budibase/client": "1.2.44-alpha.0",
-    "@budibase/pro": "1.2.43",
-    "@budibase/string-templates": "1.2.44-alpha.0",
-    "@budibase/types": "1.2.44-alpha.0",
+    "@budibase/backend-core": "^1.2.46",
+    "@budibase/client": "^1.2.46",
+    "@budibase/pro": "1.2.45",
+    "@budibase/string-templates": "^1.2.46",
+    "@budibase/types": "^1.2.46",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -106,7 +106,7 @@
     "google-auth-library": "7.12.0",
     "google-spreadsheet": "3.2.0",
     "jimp": "0.16.1",
-    "joi": "17.6.0",
+    "joi": "17.2.1",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
     "knex": "0.95.15",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "a9aebf552f8f7e69aa0afa1d88c6f090a609f470"
+  "gitHead": "9c20cb857b8fd3caa99fab0c926c32bc2189deaa"
 }

package/src/api/controllers/row/internal.js

@@ -375,6 +375,7 @@ exports.exportRows = async ctx => {
   const table = await db.get(ctx.params.tableId)
   const rowIds = ctx.request.body.rows
   let format = ctx.query.format
+  const { columns } = ctx.request.body
   let response = (
     await db.allDocs({
       include_docs: true,
@@ -382,7 +383,20 @@ exports.exportRows = async ctx => {
     })
   ).rows.map(row => row.doc)
 
-  let rows = await outputProcessing(table, response)
+  let result = await outputProcessing(table, response)
+  let rows = []
+
+  // Filter data to only specified columns if required
+  if (columns && columns.length) {
+    for (let i = 0; i < result.length; i++) {
+      rows[i] = {}
+      for (let column of columns) {
+        rows[i][column] = result[i][column]
+      }
+    }
+  } else {
+    rows = result
+  }
 
   let headers = Object.keys(rows[0])
   const exporter = exporters[format]

package/src/api/controllers/row/internalSearch.js

@@ -1,5 +1,4 @@
 const { SearchIndexes } = require("../../../db/utils")
-const { removeKeyNumbering } = require("./utils")
 const fetch = require("node-fetch")
 const { getCouchInfo } = require("@budibase/backend-core/db")
 const { getAppId } = require("@budibase/backend-core/context")
@@ -21,8 +20,6 @@ class QueryBuilder {
       notEmpty: {},
       oneOf: {},
       contains: {},
-      notContains: {},
-      containsAny: {},
       ...base,
     }
     this.limit = 50
@@ -128,16 +125,6 @@ class QueryBuilder {
     return this
   }
 
-  addNotContains(key, value) {
-    this.query.notContains[key] = value
-    return this
-  }
-
-  addContainsAny(key, value) {
-    this.query.containsAny[key] = value
-    return this
-  }
-
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -183,29 +170,11 @@ class QueryBuilder {
       return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
     }
 
-    const contains = (key, value, mode = "AND") => {
-      if (Array.isArray(value) && value.length === 0) {
+    const contains = (key, value) => {
+      if (!value && value !== 0) {
         return null
       }
-      if (!Array.isArray(value)) {
-        return `${key}:${value}`
-      }
-      let statement = `${builder.preprocess(value[0], { escape: true })}`
-      for (let i = 1; i < value.length; i++) {
-        statement += ` ${mode} ${builder.preprocess(value[i], {
-          escape: true,
-        })}`
-      }
-      return `${key}:(${statement})`
-    }
-
-    const notContains = (key, value) => {
-      const allPrefix = allOr === "" ? "*:* AND" : ""
-      return allPrefix + "NOT " + contains(key, value)
-    }
-
-    const containsAny = (key, value) => {
-      return contains(key, value, "OR")
+      return `${key}:${builder.preprocess(value, { escape: true })}`
     }
 
     const oneOf = (key, value) => {
@@ -228,8 +197,6 @@ class QueryBuilder {
 
     function build(structure, queryFn) {
       for (let [key, value] of Object.entries(structure)) {
-        // check for new format - remove numbering if needed
-        key = removeKeyNumbering(key)
         key = builder.preprocess(key.replace(/ /g, "_"), {
           escape: true,
         })
@@ -308,12 +275,6 @@ class QueryBuilder {
     if (this.query.contains) {
       build(this.query.contains, contains)
     }
-    if (this.query.notContains) {
-      build(this.query.notContains, notContains)
-    }
-    if (this.query.containsAny) {
-      build(this.query.containsAny, containsAny)
-    }
     // make sure table ID is always added as an AND
     if (tableId) {
       query = `(${query})`
@@ -349,9 +310,6 @@ class QueryBuilder {
   }
 }
 
-// exported for unit testing
-exports.QueryBuilder = QueryBuilder
-
 /**
  * Executes a lucene search query.
  * @param url The query URL

package/src/api/controllers/row/utils.js

@@ -3,9 +3,8 @@ const { cloneDeep } = require("lodash/fp")
 const { InternalTables } = require("../../../db/utils")
 const userController = require("../user")
 const { FieldTypes } = require("../../../constants")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { makeExternalQuery } = require("../../../integrations/base/query")
-const { removeKeyNumbering } = require("../../../integrations/base/utils")
 
 validateJs.extend(validateJs.validators.datetime, {
   parse: function (value) {
@@ -17,8 +16,6 @@ validateJs.extend(validateJs.validators.datetime, {
   },
 })
 
-exports.removeKeyNumbering = removeKeyNumbering
-
 exports.getDatasourceAndQuery = async json => {
   const datasourceId = json.endpoint.datasourceId
   const db = getAppDB()

package/src/api/controllers/static/index.ts

@@ -12,7 +12,7 @@ const {
 } = require("../../../utilities/fileSystem")
 const env = require("../../../environment")
 const { clientLibraryPath } = require("../../../utilities")
-const { upload, deleteFiles } = require("../../../utilities/fileSystem")
+const { upload } = require("../../../utilities/fileSystem")
 const { attachmentsRelativeURL } = require("../../../utilities")
 const { DocumentType } = require("../../../db/utils")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
@@ -97,10 +97,6 @@ export const uploadFile = async function (ctx: any) {
   ctx.body = await Promise.all(uploads)
 }
 
-export const deleteObjects = async function (ctx: any) {
-  ctx.body = await deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys)
-}
-
 export const serveApp = async function (ctx: any) {
   const db = getAppDB({ skip_setup: true })
   const appInfo = await db.get(DocumentType.APP_METADATA)

package/src/api/controllers/table/external.js

@@ -14,7 +14,7 @@ const {
   FieldTypes,
   RelationshipTypes,
 } = require("../../../constants")
-const { makeExternalQuery } = require("../../../integrations/base/query")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { cloneDeep } = require("lodash/fp")
 const csvParser = require("../../../utilities/csvParser")
 const { handleRequest } = require("../row/external")

package/src/api/routes/static.ts

@@ -38,11 +38,6 @@ router
   // TODO: for now this builder endpoint is not authorized/secured, will need to be
   .get("/builder/:file*", controller.serveBuilder)
   .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
-  .post(
-    "/api/attachments/delete",
-    authorized(BUILDER),
-    controller.deleteObjects
-  )
   .post("/api/beta/:feature", controller.toggleBetaUiFeature)
   .post(
     "/api/attachments/:tableId/upload",
@@ -50,12 +45,6 @@ router
     authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
     controller.uploadFile
   )
-  .post(
-    "/api/attachments/:tableId/delete",
-    paramResource("tableId"),
-    authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
-    controller.deleteObjects
-  )
   .get("/:appId/:path*", controller.serveApp)
   .get("/app/:appUrl/:path*", controller.serveApp)
   .post(

package/src/api/routes/tests/row.spec.js

@@ -3,7 +3,12 @@ const setup = require("./utilities")
 const { basicRow } = setup.structures
 const { doInAppContext } = require("@budibase/backend-core/context")
 const { doInTenant } = require("@budibase/backend-core/tenancy")
-const { quotas, QuotaUsageType, StaticQuotaName, MonthlyQuotaName } = require("@budibase/pro")
+const {
+  quotas,
+  QuotaUsageType,
+  StaticQuotaName,
+  MonthlyQuotaName,
+} = require("@budibase/pro")
 
 describe("/rows", () => {
   let request = setup.getRequest()
@@ -23,23 +28,30 @@ describe("/rows", () => {
     await request
       .get(`/api/${table._id}/rows/${id}`)
       .set(config.defaultHeaders())
-      .expect('Content-Type', /json/)
+      .expect("Content-Type", /json/)
       .expect(status)
 
   const getRowUsage = async () => {
-    return config.doInContext(null, () => quotas.getCurrentUsageValue(QuotaUsageType.STATIC, StaticQuotaName.ROWS))
+    return config.doInContext(null, () =>
+      quotas.getCurrentUsageValue(QuotaUsageType.STATIC, StaticQuotaName.ROWS)
+    )
   }
 
   const getQueryUsage = async () => {
-    return config.doInContext(null, () => quotas.getCurrentUsageValue(QuotaUsageType.MONTHLY, MonthlyQuotaName.QUERIES))
+    return config.doInContext(null, () =>
+      quotas.getCurrentUsageValue(
+        QuotaUsageType.MONTHLY,
+        MonthlyQuotaName.QUERIES
+      )
+    )
   }
 
-  const assertRowUsage = async (expected) => {
+  const assertRowUsage = async expected => {
     const usage = await getRowUsage()
     expect(usage).toBe(expected)
   }
 
-  const assertQueryUsage = async (expected) => {
+  const assertQueryUsage = async expected => {
     const usage = await getQueryUsage()
     expect(usage).toBe(expected)
   }
@@ -76,10 +88,12 @@ describe("/rows", () => {
           name: "Updated Name",
         })
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
-      expect(res.res.statusMessage).toEqual(`${table.name} updated successfully.`)
+      expect(res.res.statusMessage).toEqual(
+        `${table.name} updated successfully.`
+      )
       expect(res.body.name).toEqual("Updated Name")
       // await assertRowUsage(rowUsage)
       // await assertQueryUsage(queryUsage + 1)
@@ -92,7 +106,7 @@ describe("/rows", () => {
       const res = await request
         .get(`/api/${table._id}/rows/${existing._id}`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body).toEqual({
@@ -110,7 +124,7 @@ describe("/rows", () => {
       const newRow = {
         tableId: table._id,
         name: "Second Contact",
-        status: "new"
+        status: "new",
       }
       await config.createRow()
       await config.createRow(newRow)
@@ -119,7 +133,7 @@ describe("/rows", () => {
       const res = await request
         .get(`/api/${table._id}/rows`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body.length).toBe(2)
@@ -135,17 +149,36 @@ describe("/rows", () => {
       await request
         .get(`/api/${table._id}/rows/not-a-valid-id`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(404)
       await assertQueryUsage(queryUsage) // no change
     })
 
     it("row values are coerced", async () => {
-      const str = {type:"string", constraints: { type: "string", presence: false }}
-      const attachment = {type:"attachment", constraints: { type: "array", presence: false }}
-      const bool = {type:"boolean", constraints: { type: "boolean", presence: false }}
-      const number = {type:"number", constraints: { type: "number", presence: false }}
-      const datetime = {type:"datetime", constraints: { type: "string", presence: false, datetime: {earliest:"", latest: ""}  }}
+      const str = {
+        type: "string",
+        constraints: { type: "string", presence: false },
+      }
+      const attachment = {
+        type: "attachment",
+        constraints: { type: "array", presence: false },
+      }
+      const bool = {
+        type: "boolean",
+        constraints: { type: "boolean", presence: false },
+      }
+      const number = {
+        type: "number",
+        constraints: { type: "number", presence: false },
+      }
+      const datetime = {
+        type: "datetime",
+        constraints: {
+          type: "string",
+          presence: false,
+          datetime: { earliest: "", latest: "" },
+        },
+      }
 
       table = await config.createTable({
         name: "TestTable2",
@@ -171,9 +204,9 @@ describe("/rows", () => {
           boolUndefined: bool,
           boolString: bool,
           boolBool: bool,
-          attachmentNull : attachment,
-          attachmentUndefined : attachment,
-          attachmentEmpty : attachment,
+          attachmentNull: attachment,
+          attachmentUndefined: attachment,
+          attachmentEmpty: attachment,
         },
       })
 
@@ -198,9 +231,9 @@ describe("/rows", () => {
         boolString: "true",
         boolBool: true,
         tableId: table._id,
-        attachmentNull : null,
-        attachmentUndefined : undefined,
-        attachmentEmpty : "",
+        attachmentNull: null,
+        attachmentUndefined: undefined,
+        attachmentEmpty: "",
       }
 
       const id = (await config.createRow(row))._id
@@ -218,7 +251,9 @@ describe("/rows", () => {
       expect(saved.datetimeEmptyString).toBe(null)
       expect(saved.datetimeNull).toBe(null)
       expect(saved.datetimeUndefined).toBe(undefined)
-      expect(saved.datetimeString).toBe(new Date(row.datetimeString).toISOString())
+      expect(saved.datetimeString).toBe(
+        new Date(row.datetimeString).toISOString()
+      )
       expect(saved.datetimeDate).toBe(row.datetimeDate.toISOString())
       expect(saved.boolNull).toBe(null)
       expect(saved.boolEmpty).toBe(null)
@@ -247,10 +282,12 @@ describe("/rows", () => {
           name: "Updated Name",
         })
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
-      
-      expect(res.res.statusMessage).toEqual(`${table.name} updated successfully.`)
+
+      expect(res.res.statusMessage).toEqual(
+        `${table.name} updated successfully.`
+      )
       expect(res.body.name).toEqual("Updated Name")
       expect(res.body.description).toEqual(existing.description)
 
@@ -292,16 +329,14 @@ describe("/rows", () => {
       const res = await request
         .delete(`/api/${table._id}/rows`)
         .send({
-          rows: [
-            createdRow
-          ]
+          rows: [createdRow],
         })
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body[0]._id).toEqual(createdRow._id)
-      await assertRowUsage(rowUsage -1)
-      await assertQueryUsage(queryUsage +1)
+      await assertRowUsage(rowUsage - 1)
+      await assertQueryUsage(queryUsage + 1)
     })
   })
 
@@ -314,9 +349,9 @@ describe("/rows", () => {
         .post(`/api/${table._id}/rows/validate`)
         .send({ name: "ivan" })
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
-      
+
       expect(res.body.valid).toBe(true)
       expect(Object.keys(res.body.errors)).toEqual([])
       await assertRowUsage(rowUsage)
@@ -331,9 +366,9 @@ describe("/rows", () => {
         .post(`/api/${table._id}/rows/validate`)
         .send({ name: 1 })
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
-      
+
       expect(res.body.valid).toBe(false)
       expect(Object.keys(res.body.errors)).toEqual(["name"])
       await assertRowUsage(rowUsage)
@@ -351,19 +386,16 @@ describe("/rows", () => {
       const res = await request
         .delete(`/api/${table._id}/rows`)
         .send({
-          rows: [
-            row1,
-            row2,
-          ]
+          rows: [row1, row2],
         })
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
 
       expect(res.body.length).toEqual(2)
       await loadRow(row1._id, 404)
       await assertRowUsage(rowUsage - 2)
-      await assertQueryUsage(queryUsage +1)
+      await assertQueryUsage(queryUsage + 1)
     })
   })
 
@@ -376,12 +408,12 @@ describe("/rows", () => {
       const res = await request
         .get(`/api/views/${table._id}`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.length).toEqual(1)
       expect(res.body[0]._id).toEqual(row._id)
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage +1)
+      await assertQueryUsage(queryUsage + 1)
     })
 
     it("should throw an error if view doesn't exist", async () => {
@@ -406,7 +438,7 @@ describe("/rows", () => {
       const res = await request
         .get(`/api/views/${view.name}`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.length).toEqual(1)
       expect(res.body[0]._id).toEqual(row._id)
@@ -418,21 +450,24 @@ describe("/rows", () => {
 
   describe("fetchEnrichedRows", () => {
     it("should allow enriching some linked rows", async () => {
-      const { table, firstRow, secondRow } = await doInTenant(setup.structures.TENANT_ID, async () => {
-        const table = await config.createLinkedTable()
-        const firstRow = await config.createRow({
-          name: "Test Contact",
-          description: "original description",
-          tableId: table._id
-        })
-        const secondRow = await config.createRow({
-          name: "Test 2",
-          description: "og desc",
-          link: [{_id: firstRow._id}],
-          tableId: table._id,
-        })
-        return { table, firstRow, secondRow }
-      })
+      const { table, firstRow, secondRow } = await doInTenant(
+        setup.structures.TENANT_ID,
+        async () => {
+          const table = await config.createLinkedTable()
+          const firstRow = await config.createRow({
+            name: "Test Contact",
+            description: "original description",
+            tableId: table._id,
+          })
+          const secondRow = await config.createRow({
+            name: "Test 2",
+            description: "og desc",
+            link: [{ _id: firstRow._id }],
+            tableId: table._id,
+          })
+          return { table, firstRow, secondRow }
+        }
+      )
       const rowUsage = await getRowUsage()
       const queryUsage = await getQueryUsage()
 
@@ -440,7 +475,7 @@ describe("/rows", () => {
       const resBasic = await request
         .get(`/api/${table._id}/rows/${secondRow._id}`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
       expect(resBasic.body.link[0]._id).toBe(firstRow._id)
       expect(resBasic.body.link[0].primaryDisplay).toBe("Test Contact")
@@ -449,14 +484,14 @@ describe("/rows", () => {
       const resEnriched = await request
         .get(`/api/${table._id}/${secondRow._id}/enrich`)
         .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
+        .expect("Content-Type", /json/)
         .expect(200)
       expect(resEnriched.body.link.length).toBe(1)
       expect(resEnriched.body.link[0]._id).toBe(firstRow._id)
       expect(resEnriched.body.link[0].name).toBe("Test Contact")
       expect(resEnriched.body.link[0].description).toBe("original description")
       await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage +2)
+      await assertQueryUsage(queryUsage + 2)
     })
   })
 
@@ -466,9 +501,11 @@ describe("/rows", () => {
       const row = await config.createRow({
         name: "test",
         description: "test",
-        attachment: [{
-          key: `${config.getAppId()}/attachments/test/thing.csv`,
-        }],
+        attachment: [
+          {
+            key: `${config.getAppId()}/attachments/test/thing.csv`,
+          },
+        ],
         tableId: table._id,
       })
       // the environment needs configured for this
@@ -482,4 +519,49 @@ describe("/rows", () => {
       })
     })
   })
+
+  describe("exportData", () => {
+    it("should allow exporting all columns", async () => {
+      const existing = await config.createRow()
+      const res = await request
+        .post(`/api/${table._id}/rows/exportRows?format=json`)
+        .set(config.defaultHeaders())
+        .send({
+          rows: [existing._id],
+        })
+        .expect("Content-Type", /json/)
+        .expect(200)
+      const results = JSON.parse(res.text)
+      expect(results.length).toEqual(1)
+      const row = results[0]
+
+      // Ensure all original columns were exported
+      expect(Object.keys(row).length).toBeGreaterThanOrEqual(
+        Object.keys(existing).length
+      )
+      Object.keys(existing).forEach(key => {
+        expect(row[key]).toEqual(existing[key])
+      })
+    })
+
+    it("should allow exporting only certain columns", async () => {
+      const existing = await config.createRow()
+      const res = await request
+        .post(`/api/${table._id}/rows/exportRows?format=json`)
+        .set(config.defaultHeaders())
+        .send({
+          rows: [existing._id],
+          columns: ["_id"],
+        })
+        .expect("Content-Type", /json/)
+        .expect(200)
+      const results = JSON.parse(res.text)
+      expect(results.length).toEqual(1)
+      const row = results[0]
+
+      // Ensure only the _id column was exported
+      expect(Object.keys(row).length).toEqual(1)
+      expect(row._id).toEqual(existing._id)
+    })
+  })
 })

package/src/automations/bullboard.js

@@ -8,12 +8,14 @@ const Queue = env.isTest()
 const { JobQueues } = require("../constants")
 const { utils } = require("@budibase/backend-core/redis")
 const { opts, redisProtocolUrl } = utils.getRedisOptions()
+const listeners = require("./listeners")
 
 const CLEANUP_PERIOD_MS = 60 * 1000
 const queueConfig = redisProtocolUrl || { redis: opts }
 let cleanupInternal = null
 
 let automationQueue = new Queue(JobQueues.AUTOMATIONS, queueConfig)
+listeners.addListeners(automationQueue)
 
 async function cleanup() {
   await automationQueue.clean(CLEANUP_PERIOD_MS, "completed")