From f8adbb86a0e19d228629d4e1ce231a15412e51e7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 8 Sep 2023 10:04:49 +0200
Subject: [PATCH] Fix tests

---
 .../src/api/controllers/row/external.ts       |  8 +++-
 .../server/src/api/routes/tests/row.spec.ts   | 37 ++++++++++++-------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index 5a78b55ca7..5a1c7e04ff 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -109,7 +109,13 @@ export async function save(ctx: UserCtx) {
 export async function find(ctx: UserCtx): Promise<Row> {
   const id = ctx.params.rowId
   const tableId = utils.getTableId(ctx)
-  return sdk.rows.external.getRow(tableId, id)
+  const row = await sdk.rows.external.getRow(tableId, id)
+
+  if (!row) {
+    ctx.throw(404)
+  }
+
+  return row
 }
 
 export async function destroy(ctx: UserCtx) {
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 9c150d8968..821842e1b4 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -12,6 +12,7 @@ import {
   PermissionLevel,
   QuotaUsageType,
   Row,
+  SaveRowRequest,
   SaveTableRequest,
   SortOrder,
   SortType,
@@ -34,6 +35,8 @@ describe.each([
   ["internal", undefined],
   ["postgres", databaseTestProviders.postgres],
 ])("/rows (%s)", (_, dsProvider) => {
+  const isInternal = !dsProvider
+
   let request = setup.getRequest()
   let config = setup.getConfig()
   let table: Table
@@ -127,9 +130,20 @@ describe.each([
     expect(usage).toBe(expected)
   }
 
-  const createRow = () => config.api.row.save(table._id!, basicRow(table._id!))
+  const createRow = (row?: SaveRowRequest) =>
+    config.api.row.save(table._id!, row || basicRow(table._id!))
 
   describe("save, load, update", () => {
+    function getDefaultFields() {
+      if (isInternal) {
+        return {
+          type: "row",
+          createdAt: timestamp,
+          updatedAt: timestamp,
+        }
+      }
+    }
+
     it("returns a success message when the row is created", async () => {
       const rowUsage = await getRowUsage()
       const queryUsage = await getQueryUsage()
@@ -230,7 +244,7 @@ describe.each([
     })
 
     it("should load a row", async () => {
-      const existing = await config.createRow()
+      const existing = await createRow()
       const queryUsage = await getQueryUsage()
 
       const res = await request
@@ -243,9 +257,8 @@ describe.each([
         ...row,
         _id: existing._id,
         _rev: existing._rev,
-        type: "row",
-        createdAt: timestamp,
-        updatedAt: timestamp,
+        id: existing.id,
+        ...getDefaultFields(),
       })
       await assertQueryUsage(queryUsage + 1)
     })
@@ -256,8 +269,8 @@ describe.each([
         name: "Second Contact",
         status: "new",
       }
-      await config.createRow()
-      await config.createRow(newRow)
+      await createRow()
+      await createRow(newRow)
       const queryUsage = await getQueryUsage()
 
       const res = await request
@@ -273,14 +286,12 @@ describe.each([
     })
 
     it("load should return 404 when row does not exist", async () => {
-      await config.createRow()
+      await createRow()
       const queryUsage = await getQueryUsage()
 
-      await request
-        .get(`/api/${table._id}/rows/not-a-valid-id`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(404)
+      await config.api.row.get(table._id!, "1234567", {
+        expectStatus: 404,
+      })
       await assertQueryUsage(queryUsage) // no change
     })