@budibase/backend-core 2.29.23 → 2.29.25

package/src/db/couch/DatabaseImpl.ts

@@ -56,24 +56,24 @@ class CouchDBError extends Error implements DBError {
   constructor(
     message: string,
     info: {
-      status: number | undefined
-      statusCode: number | undefined
+      status?: number
+      statusCode?: number
       name: string
-      errid: string
-      description: string
-      reason: string
-      error: string
+      errid?: string
+      description?: string
+      reason?: string
+      error?: string
     }
   ) {
     super(message)
     const statusCode = info.status || info.statusCode || 500
     this.status = statusCode
     this.statusCode = statusCode
-    this.reason = info.reason
+    this.reason = info.reason || "Unknown"
     this.name = info.name
-    this.errid = info.errid
-    this.description = info.description
-    this.error = info.error
+    this.errid = info.errid || "Unknown"
+    this.description = info.description || "Unknown"
+    this.error = info.error || "Not found"
   }
 }
 
@@ -246,6 +246,35 @@ export class DatabaseImpl implements Database {
     })
   }
 
+  async bulkRemove(documents: Document[], opts?: { silenceErrors?: boolean }) {
+    const response: Nano.DocumentBulkResponse[] = await this.performCall(db => {
+      return () =>
+        db.bulk({
+          docs: documents.map(doc => ({
+            ...doc,
+            _deleted: true,
+          })),
+        })
+    })
+    if (opts?.silenceErrors) {
+      return
+    }
+    let errorFound = false
+    let errorMessage: string = "Unable to bulk remove documents: "
+    for (let res of response) {
+      if (res.error) {
+        errorFound = true
+        errorMessage += res.error
+      }
+    }
+    if (errorFound) {
+      throw new CouchDBError(errorMessage, {
+        name: this.name,
+        status: 400,
+      })
+    }
+  }
+
   async post(document: AnyDocument, opts?: DatabasePutOpts) {
     if (!document._id) {
       document._id = newid()

package/src/db/instrumentation.ts

@@ -71,6 +71,16 @@ export class DDInstrumentedDatabase implements Database {
     })
   }
 
+  bulkRemove(
+    documents: Document[],
+    opts?: { silenceErrors?: boolean }
+  ): Promise<void> {
+    return tracer.trace("db.bulkRemove", span => {
+      span?.addTags({ db_name: this.name, num_docs: documents.length })
+      return this.db.bulkRemove(documents, opts)
+    })
+  }
+
   put(
     document: AnyDocument,
     opts?: DatabasePutOpts | undefined

package/src/platform/users.ts

@@ -113,15 +113,12 @@ export async function addUser(
 export async function removeUser(user: User) {
   const db = getPlatformDB()
   const keys = [user._id!, user.email]
-  const userDocs = await db.allDocs({
+  const userDocs = await db.allDocs<User>({
     keys,
     include_docs: true,
   })
-  const toDelete = userDocs.rows.map((row: any) => {
-    return {
-      ...row.doc,
-      _deleted: true,
-    }
-  })
-  await db.bulkDocs(toDelete)
+  await db.bulkRemove(
+    userDocs.rows.map(row => row.doc!),
+    { silenceErrors: true }
+  )
 }