@budibase/server 2.1.32-alpha.7 → 2.1.32

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

@@ -1,18 +1,17 @@
 const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
+const { getAppDB } = require("@budibase/backend-core/context")
 const setup = require("./utilities")
 const { basicTable } = setup.structures
-const { events, context } = require("@budibase/backend-core")
+const { events } = require("@budibase/backend-core")
 
 describe("/tables", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
-  let appId
 
   afterAll(setup.afterAll)
 
   beforeEach(async () => {
-    const app = await config.init()
-    appId = app.appId
+    await config.init()
   })
 
   describe("create", () => {
@@ -200,6 +199,38 @@ describe("/tables", () => {
     })
   })
 
+  describe("indexing", () => {
+    it("should be able to create a table with indexes", async () => {
+      const db = getAppDB(config)
+      const indexCount = (await db.getIndexes()).total_rows
+      const table = basicTable()
+      table.indexes = ["name"]
+      const res = await request
+        .post(`/api/tables`)
+        .send(table)
+        .set(config.defaultHeaders())
+        .expect('Content-Type', /json/)
+        .expect(200)
+      expect(res.body._id).toBeDefined()
+      expect(res.body._rev).toBeDefined()
+      expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
+      // update index to see what happens
+      table.indexes = ["name", "description"]
+      await request
+        .post(`/api/tables`)
+        .send({
+          ...table,
+          _id: res.body._id,
+          _rev: res.body._rev,
+        })
+        .set(config.defaultHeaders())
+        .expect('Content-Type', /json/)
+        .expect(200)
+      // shouldn't have created a new index
+      expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
+    })
+  })
+
   describe("validate csv", () => {
     it("should be able to validate a CSV layout", async () => {
       const res = await request
@@ -218,40 +249,6 @@ describe("/tables", () => {
     })
   })
 
-  describe("indexing", () => {
-    it("should be able to create a table with indexes", async () => {
-      await context.doInAppContext(appId, async () => {
-        const db = context.getAppDB()
-        const indexCount = (await db.getIndexes()).total_rows
-        const table = basicTable()
-        table.indexes = ["name"]
-        const res = await request
-          .post(`/api/tables`)
-          .send(table)
-          .set(config.defaultHeaders())
-          .expect('Content-Type', /json/)
-          .expect(200)
-        expect(res.body._id).toBeDefined()
-        expect(res.body._rev).toBeDefined()
-        expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
-        // update index to see what happens
-        table.indexes = ["name", "description"]
-        await request
-          .post(`/api/tables`)
-          .send({
-            ...table,
-            _id: res.body._id,
-            _rev: res.body._rev,
-          })
-          .set(config.defaultHeaders())
-          .expect('Content-Type', /json/)
-          .expect(200)
-        // shouldn't have created a new index
-        expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
-      })
-    })
-  })
-
   describe("destroy", () => {
     let testTable
 

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

@@ -1,7 +1,6 @@
-const { roles } = require("@budibase/backend-core")
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { checkPermissionsEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
-const { BUILTIN_ROLE_IDS } = roles
 
 jest.mock("../../../utilities/workerRequests", () => ({
   getGlobalUsers: jest.fn(() => {

package/src/api/routes/tests/utilities/TestFunctions.ts

@@ -1,8 +1,10 @@
 import * as rowController from "../../../controllers/row"
 import * as appController from "../../../controllers/application"
 import { AppStatus } from "../../../../db/utils"
-import { roles, tenancy, context } from "@budibase/backend-core"
+import { BUILTIN_ROLE_IDS } from "@budibase/backend-core/roles"
+import { doInTenant } from "@budibase/backend-core/tenancy"
 import { TENANT_ID } from "../../../../tests/utilities/structures"
+import { getAppDB, doInAppContext } from "@budibase/backend-core/context"
 import * as env from "../../../../environment"
 
 class Request {
@@ -19,7 +21,7 @@ class Request {
 }
 
 function runRequest(appId: any, controlFunc: any, request?: any) {
-  return context.doInAppContext(appId, async () => {
+  return doInAppContext(appId, async () => {
     return controlFunc(request)
   })
 }
@@ -31,7 +33,7 @@ export const getAllTableRows = async (config: any) => {
 }
 
 export const clearAllApps = async (tenantId = TENANT_ID) => {
-  await tenancy.doInTenant(tenantId, async () => {
+  await doInTenant(tenantId, async () => {
     const req: any = { query: { status: AppStatus.DEV }, user: { tenantId } }
     await appController.fetch(req)
     const apps = req.body
@@ -49,7 +51,7 @@ export const clearAllApps = async (tenantId = TENANT_ID) => {
 export const clearAllAutomations = async (config: any) => {
   const automations = await config.getAllAutomations()
   for (let auto of automations) {
-    await context.doInAppContext(config.appId, async () => {
+    await doInAppContext(config.appId, async () => {
       await config.deleteAutomation(auto)
     })
   }
@@ -108,7 +110,7 @@ export const checkPermissionsEndpoint = async ({
     .expect(200)
 
   let failHeader
-  if (failRole === roles.BUILTIN_ROLE_IDS.PUBLIC) {
+  if (failRole === BUILTIN_ROLE_IDS.PUBLIC) {
     failHeader = config.publicHeaders({ prodApp: true })
   } else {
     failHeader = await config.login({
@@ -125,7 +127,7 @@ export const checkPermissionsEndpoint = async ({
 }
 
 export const getDB = () => {
-  return context.getAppDB()
+  return getAppDB()
 }
 
 export const testAutomation = async (config: any, automation: any) => {

package/src/api/routes/user.js

@@ -0,0 +1,53 @@
+const Router = require("@koa/router")
+const controller = require("../controllers/user")
+const authorized = require("../../middleware/authorized")
+const {
+  PermissionLevels,
+  PermissionTypes,
+} = require("@budibase/backend-core/permissions")
+
+const router = new Router()
+
+router
+  .get(
+    "/api/users/metadata",
+    authorized(PermissionTypes.USER, PermissionLevels.READ),
+    controller.fetchMetadata
+  )
+  .get(
+    "/api/users/metadata/:id",
+    authorized(PermissionTypes.USER, PermissionLevels.READ),
+    controller.findMetadata
+  )
+  .put(
+    "/api/users/metadata",
+    authorized(PermissionTypes.USER, PermissionLevels.WRITE),
+    controller.updateMetadata
+  )
+  .post(
+    "/api/users/metadata/self",
+    authorized(PermissionTypes.USER, PermissionLevels.WRITE),
+    controller.updateSelfMetadata
+  )
+  .delete(
+    "/api/users/metadata/:id",
+    authorized(PermissionTypes.USER, PermissionLevels.WRITE),
+    controller.destroyMetadata
+  )
+  .post(
+    "/api/users/metadata/sync/:id",
+    authorized(PermissionTypes.USER, PermissionLevels.WRITE),
+    controller.syncUser
+  )
+  .post(
+    "/api/users/flags",
+    authorized(PermissionTypes.USER, PermissionLevels.WRITE),
+    controller.setFlag
+  )
+  .get(
+    "/api/users/flags",
+    authorized(PermissionTypes.USER, PermissionLevels.READ),
+    controller.getFlags
+  )
+
+module.exports = router

package/src/api/routes/utils/{validators.ts → validators.js}

@@ -1,16 +1,20 @@
-import { auth, permissions } from "@budibase/backend-core"
-import { DataSourceOperation } from "../../../constants"
-import { WebhookActionType } from "@budibase/types"
-import Joi from "joi"
+const { joiValidator } = require("@budibase/backend-core/auth")
+const { DataSourceOperation } = require("../../../constants")
+const {
+  BUILTIN_PERMISSION_IDS,
+  PermissionLevels,
+} = require("@budibase/backend-core/permissions")
+const { WebhookActionType } = require("@budibase/types")
+const Joi = require("joi")
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null)
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null)
 const APP_NAME_REGEX = /^[\w\s]+$/
 
-export function tableValidator() {
+exports.tableValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     type: OPTIONAL_STRING.valid("table", "internal", "external"),
@@ -22,16 +26,16 @@ export function tableValidator() {
   }).unknown(true))
 }
 
-export function nameValidator() {
+exports.nameValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     name: OPTIONAL_STRING,
   }))
 }
 
-export function datasourceValidator() {
+exports.datasourceValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     _id: Joi.string(),
     _rev: Joi.string(),
     type: OPTIONAL_STRING.allow("datasource_plus"),
@@ -60,9 +64,9 @@ function filterObject() {
   }).unknown(true)
 }
 
-export function internalSearchValidator() {
+exports.internalSearchValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     tableId: OPTIONAL_STRING,
     query: filterObject(),
     limit: OPTIONAL_NUMBER,
@@ -74,8 +78,8 @@ export function internalSearchValidator() {
   }))
 }
 
-export function externalSearchValidator() {
-  return auth.joiValidator.body(
+exports.externalSearchValidator = () => {
+  return joiValidator.body(
     Joi.object({
       query: filterObject(),
       paginate: Joi.boolean().optional(),
@@ -92,9 +96,9 @@ export function externalSearchValidator() {
   )
 }
 
-export function datasourceQueryValidator() {
+exports.datasourceQueryValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     endpoint: Joi.object({
       datasourceId: Joi.string().required(),
       operation: Joi.string().required().valid(...Object.values(DataSourceOperation)),
@@ -113,9 +117,9 @@ export function datasourceQueryValidator() {
   }))
 }
 
-export function webhookValidator() {
+exports.webhookValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     live: Joi.bool(),
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
@@ -128,15 +132,15 @@ export function webhookValidator() {
   }).unknown(true))
 }
 
-export function roleValidator() {
-  const permLevelArray = Object.values(permissions.PermissionLevel)
+exports.roleValidator = () => {
+  const permLevelArray = Object.values(PermissionLevels)
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     name: Joi.string().required(),
     // this is the base permission ID (for now a built in)
-    permissionId: Joi.string().valid(...Object.values(permissions.BuiltinPermissionID)).required(),
+    permissionId: Joi.string().valid(...Object.values(BUILTIN_PERMISSION_IDS)).required(),
     permissions: Joi.object()
       .pattern(/.*/, [Joi.string().valid(...permLevelArray)])
       .optional(),
@@ -144,19 +148,19 @@ export function roleValidator() {
   }).unknown(true))
 }
 
-export function permissionValidator() {
-  const permLevelArray = Object.values(permissions.PermissionLevel)
+exports.permissionValidator = () => {
+  const permLevelArray = Object.values(PermissionLevels)
   // prettier-ignore
-  return auth.joiValidator.params(Joi.object({
+  return joiValidator.params(Joi.object({
     level: Joi.string().valid(...permLevelArray).required(),
     resourceId: Joi.string(),
     roleId: Joi.string(),
   }).unknown(true))
 }
 
-export function screenValidator() {
+exports.screenValidator = () => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     name: Joi.string().required(),
     showNavigation: OPTIONAL_BOOLEAN,
     width: OPTIONAL_STRING,
@@ -177,7 +181,7 @@ export function screenValidator() {
   }).unknown(true))
 }
 
-function generateStepSchema(allowStepTypes: string[]) {
+function generateStepSchema(allowStepTypes) {
   // prettier-ignore
   return Joi.object({
     stepId: Joi.string().required(),
@@ -192,9 +196,9 @@ function generateStepSchema(allowStepTypes: string[]) {
   }).unknown(true)
 }
 
-export function automationValidator(existing = false) {
+exports.automationValidator = (existing = false) => {
   // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
+  return joiValidator.body(Joi.object({
     _id: existing ? Joi.string().required() : OPTIONAL_STRING,
     _rev: existing ? Joi.string().required() : OPTIONAL_STRING,
     name: Joi.string().required(),
@@ -206,9 +210,9 @@ export function automationValidator(existing = false) {
   }).unknown(true))
 }
 
-export function applicationValidator(opts = { isCreate: true }) {
+exports.applicationValidator = (opts = { isCreate: true }) => {
   // prettier-ignore
-  const base: any = {
+  const base = {
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     url: OPTIONAL_STRING,
@@ -226,7 +230,7 @@ export function applicationValidator(opts = { isCreate: true }) {
     base.name = appNameValidator.optional()
   }
 
-  return auth.joiValidator.body(
+  return joiValidator.body(
     Joi.object({
       _id: OPTIONAL_STRING,
       _rev: OPTIONAL_STRING,

package/src/api/routes/view.js

@@ -0,0 +1,31 @@
+const Router = require("@koa/router")
+const viewController = require("../controllers/view")
+const rowController = require("../controllers/row")
+const authorized = require("../../middleware/authorized")
+const { paramResource } = require("../../middleware/resourceId")
+const {
+  BUILDER,
+  PermissionTypes,
+  PermissionLevels,
+} = require("@budibase/backend-core/permissions")
+
+const router = new Router()
+
+router
+  .get("/api/views/export", authorized(BUILDER), viewController.exportView)
+  .get(
+    "/api/views/:viewName",
+    paramResource("viewName"),
+    authorized(PermissionTypes.VIEW, PermissionLevels.READ),
+    rowController.fetchView
+  )
+  .get("/api/views", authorized(BUILDER), viewController.fetch)
+  .delete(
+    "/api/views/:viewName",
+    paramResource("viewName"),
+    authorized(BUILDER),
+    viewController.destroy
+  )
+  .post("/api/views", authorized(BUILDER), viewController.save)
+
+module.exports = router

package/src/api/routes/webhook.ts

@@ -5,7 +5,7 @@ import { permissions } from "@budibase/backend-core"
 import { webhookValidator } from "./utils/validators"
 
 const BUILDER = permissions.BUILDER
-const router: Router = new Router()
+const router = new Router()
 
 router
   .get("/api/webhooks", authorized(BUILDER), controller.fetch)
@@ -24,4 +24,4 @@ router
   // this shouldn't have authorisation, right now its always public
   .post("/api/webhooks/trigger/:instance/:id", controller.trigger)
 
-export = router
+export default router

package/src/app.ts

@@ -19,9 +19,10 @@ const http = require("http")
 const api = require("./api")
 const automations = require("./automations/index")
 const Sentry = require("@sentry/node")
+const { logAlert } = require("@budibase/backend-core/logging")
 const { Thread } = require("./threads")
-import * as redis from "./utilities/redis"
-import { events, logging } from "@budibase/backend-core"
+import redis from "./utilities/redis"
+import { events } from "@budibase/backend-core"
 import { initialise as initialiseWebsockets } from "./websocket"
 import { startup } from "./startup"
 
@@ -92,7 +93,7 @@ process.on("uncaughtException", err => {
     return
   }
   errCode = -1
-  logging.logAlert("Uncaught exception.", err)
+  logAlert("Uncaught exception.", err)
   shutdown()
 })
 

package/src/automations/tests/updateRow.spec.js

@@ -1,3 +1,4 @@
+const env = require("../../environment")
 const setup = require("./utilities")
 
 describe("test the update row action", () => {

package/src/automations/tests/utilities/index.js

@@ -1,5 +1,6 @@
 const TestConfig = require("../../../tests/utilities/TestConfiguration")
-const { context } = require("@budibase/backend-core")
+const { TENANT_ID } = require("../../../tests/utilities/structures")
+const { doInTenant } = require("@budibase/backend-core/tenancy")
 const actions = require("../../actions")
 const emitter = require("../../../events/index")
 const env = require("../../../environment")
@@ -32,7 +33,7 @@ exports.runInProd = async fn => {
 }
 
 exports.runStep = async function runStep(stepId, inputs) {
-  async function run() {
+  return doInTenant(TENANT_ID, async () => {
     let step = await actions.getAction(stepId)
     expect(step).toBeDefined()
     return step({
@@ -42,14 +43,7 @@ exports.runStep = async function runStep(stepId, inputs) {
       apiKey: exports.apiKey,
       emitter,
     })
-  }
-  if (config?.appId) {
-    return context.doInContext(config?.appId, async () => {
-      return run()
-    })
-  } else {
-    return run()
-  }
+  })
 }
 
 exports.apiKey = "test"

package/src/automations/triggers.js

@@ -8,7 +8,8 @@ const { automationQueue } = require("./bullboard")
 const { checkTestFlag } = require("../utilities/redis")
 const utils = require("./utils")
 const env = require("../environment")
-const { context, db: dbCore } = require("@budibase/backend-core")
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
+const { getAllApps } = require("@budibase/backend-core/db")
 
 const TRIGGER_DEFINITIONS = definitions
 const JOB_OPTS = {
@@ -17,7 +18,7 @@ const JOB_OPTS = {
 }
 
 async function getAllAutomations() {
-  const db = context.getAppDB()
+  const db = getAppDB()
   let automations = await db.allDocs(
     getAutomationParams(null, { include_docs: true })
   )
@@ -29,7 +30,7 @@ async function queueRelevantRowAutomations(event, eventType) {
     throw `No appId specified for ${eventType} - check event emitters.`
   }
 
-  context.doInAppContext(event.appId, async () => {
+  doInAppContext(event.appId, async () => {
     let automations = await getAllAutomations()
 
     // filter down to the correct event type
@@ -121,9 +122,9 @@ exports.rebootTrigger = async () => {
   }
   // iterate through all production apps, find the reboot crons
   // and trigger events for them
-  const appIds = await dbCore.getAllApps({ dev: false, idsOnly: true })
+  const appIds = await getAllApps({ dev: false, idsOnly: true })
   for (let prodAppId of appIds) {
-    await context.doInAppContext(prodAppId, async () => {
+    await doInAppContext(prodAppId, async () => {
       let automations = await getAllAutomations()
       let rebootEvents = []
       for (let automation of automations) {

package/src/automations/utils.ts

@@ -4,9 +4,15 @@ import { automationQueue } from "./bullboard"
 import newid from "../db/newid"
 import { updateEntityMetadata } from "../utilities"
 import { MetadataTypes } from "../constants"
-import { db as dbCore, context } from "@budibase/backend-core"
+import { getProdAppID, doWithDB } from "@budibase/backend-core/db"
 import { getAutomationMetadataParams } from "../db/utils"
 import { cloneDeep } from "lodash/fp"
+import {
+  getAppDB,
+  getAppId,
+  getProdAppDB,
+} from "@budibase/backend-core/context"
+import { context } from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import { Automation, WebhookActionType } from "@budibase/types"
 import sdk from "../sdk"
@@ -96,7 +102,7 @@ export async function disableCronById(jobId: number | string) {
 }
 
 export async function clearMetadata() {
-  const db = context.getProdAppDB()
+  const db = getProdAppDB()
   const automationMetadata = (
     await db.allDocs(
       getAutomationMetadataParams({
@@ -151,7 +157,7 @@ export async function enableCronTrigger(appId: any, automation: Automation) {
     // can't use getAppDB here as this is likely to be called from dev app,
     // but this call could be for dev app or prod app, need to just use what
     // was passed in
-    await dbCore.doWithDB(appId, async (db: any) => {
+    await doWithDB(appId, async (db: any) => {
       const response = await db.put(automation)
       automation._id = response.id
       automation._rev = response.rev
@@ -169,10 +175,7 @@ export async function enableCronTrigger(appId: any, automation: Automation) {
  * written to DB (this does not write to DB as it would be wasteful to repeat).
  */
 export async function checkForWebhooks({ oldAuto, newAuto }: any) {
-  const appId = context.getAppId()
-  if (!appId) {
-    throw new Error("Unable to check webhooks - no app ID in context.")
-  }
+  const appId = getAppId()
   const oldTrigger = oldAuto ? oldAuto.definition.trigger : null
   const newTrigger = newAuto ? newAuto.definition.trigger : null
   const triggerChanged =
@@ -191,7 +194,7 @@ export async function checkForWebhooks({ oldAuto, newAuto }: any) {
     oldTrigger.webhookId
   ) {
     try {
-      let db = context.getAppDB()
+      let db = getAppDB()
       // need to get the webhook to get the rev
       const webhook = await db.get(oldTrigger.webhookId)
       // might be updating - reset the inputs to remove the URLs
@@ -221,7 +224,7 @@ export async function checkForWebhooks({ oldAuto, newAuto }: any) {
     // the app ID has to be development for this endpoint
     // it can only be used when building the app
     // but the trigger endpoint will always be used in production
-    const prodAppId = dbCore.getProdAppID(appId)
+    const prodAppId = getProdAppID(appId)
     newTrigger.inputs = {
       schemaUrl: `api/webhooks/schema/${appId}/${id}`,
       triggerUrl: `api/webhooks/trigger/${prodAppId}/${id}`,

package/src/constants/index.js

@@ -1,4 +1,6 @@
-const { objectStore, roles, constants } = require("@budibase/backend-core")
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
+const { UserStatus } = require("@budibase/backend-core/constants")
+const { objectStore } = require("@budibase/backend-core")
 
 const FilterTypes = {
   STRING: "string",
@@ -137,7 +139,7 @@ exports.USERS_TABLE_SCHEMA = {
       constraints: {
         type: exports.FieldTypes.STRING,
         presence: false,
-        inclusion: Object.values(roles.BUILTIN_ROLE_IDS),
+        inclusion: Object.values(BUILTIN_ROLE_IDS),
       },
     },
     status: {
@@ -147,7 +149,7 @@ exports.USERS_TABLE_SCHEMA = {
       constraints: {
         type: exports.FieldTypes.STRING,
         presence: false,
-        inclusion: Object.values(constants.UserStatus),
+        inclusion: Object.values(UserStatus),
       },
     },
   },

package/src/constants/screens.js

@@ -1,4 +1,4 @@
-const { roles } = require("@budibase/backend-core")
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { BASE_LAYOUT_PROP_IDS } = require("./layouts")
 
 exports.createHomeScreen = () => ({
@@ -40,7 +40,7 @@ exports.createHomeScreen = () => ({
   },
   routing: {
     route: "/",
-    roleId: roles.BUILTIN_ROLE_IDS.BASIC,
+    roleId: BUILTIN_ROLE_IDS.BASIC,
   },
   name: "home-screen",
 })

package/src/db/inMemoryView.js

@@ -2,8 +2,8 @@ const newid = require("./newid")
 
 // bypass the main application db config
 // use in memory pouchdb directly
-const { db: dbCore } = require("@budibase/backend-core")
-const Pouch = dbCore.getPouch({ inMemory: true })
+const { getPouch, closeDB } = require("@budibase/backend-core/db")
+const Pouch = getPouch({ inMemory: true })
 
 exports.runView = async (view, calculation, group, data) => {
   // use a different ID each time for the DB, make sure they
@@ -44,6 +44,6 @@ exports.runView = async (view, calculation, group, data) => {
     return response
   } finally {
     await db.destroy()
-    await dbCore.closePouchDB(db)
+    await closeDB(db)
   }
 }