From c18459d84d7c8979e5402226b6b189033dd386fc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 8 Aug 2023 13:43:13 +0100
Subject: [PATCH] Updating trim view info test case.
---
.../middleware/tests/trimViewRowInfo.spec.ts | 27 ++-----------------
.../server/src/middleware/trimViewRowInfo.ts | 2 +-
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/packages/server/src/middleware/tests/trimViewRowInfo.spec.ts b/packages/server/src/middleware/tests/trimViewRowInfo.spec.ts
index 427ac9a608..69d1272df9 100644
--- a/packages/server/src/middleware/tests/trimViewRowInfo.spec.ts
+++ b/packages/server/src/middleware/tests/trimViewRowInfo.spec.ts
@@ -117,7 +117,7 @@ describe("trimViewRowInfo middleware", () => {
})
expect(config.request?.body).toEqual(data)
- expect(config.params.tableId).toEqual(table._id)
+ expect(config.params.sourceId).toEqual(table._id)
expect(config.next).toBeCalledTimes(1)
expect(config.throw).not.toBeCalled()
@@ -143,32 +143,9 @@ describe("trimViewRowInfo middleware", () => {
name: data.name,
address: data.address,
})
- expect(config.params.tableId).toEqual(table._id)
+ expect(config.params.sourceId).toEqual(table._id)
expect(config.next).toBeCalledTimes(1)
expect(config.throw).not.toBeCalled()
})
-
- it("it should throw an error if no viewid is provided on the body", async () => {
- const data = getRandomData()
- await config.executeMiddleware(viewId, {
- ...data,
- })
-
- expect(config.throw).toBeCalledTimes(1)
- expect(config.throw).toBeCalledWith(400, "_viewId is required")
- expect(config.next).not.toBeCalled()
- })
-
- it("it should throw an error if no viewid is provided on the parameters", async () => {
- const data = getRandomData()
- await config.executeMiddleware(undefined as any, {
- _viewId: viewId,
- ...data,
- })
-
- expect(config.throw).toBeCalledTimes(1)
- expect(config.throw).toBeCalledWith(400, "viewId path is required")
- expect(config.next).not.toBeCalled()
- })
})
diff --git a/packages/server/src/middleware/trimViewRowInfo.ts b/packages/server/src/middleware/trimViewRowInfo.ts
index 5a207936b2..cff9dabd37 100644
--- a/packages/server/src/middleware/trimViewRowInfo.ts
+++ b/packages/server/src/middleware/trimViewRowInfo.ts
@@ -22,7 +22,7 @@ export default async (ctx: Ctx<Row>, next: Next) => {
const { tableId } = utils.extractViewInfoFromID(viewId)
// don't need to trim delete requests
- if (ctx.method.toLowerCase() !== "delete") {
+ if (ctx?.method?.toLowerCase() !== "delete") {
const { _viewId, ...trimmedView } = await trimViewFields(
viewId,
tableId,