From e784b97c509cf2e18e255cce7534f3c983fce107 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Mon, 26 Sep 2022 16:10:16 -0400
Subject: [PATCH] include fields available to all types

---
 .../lotOccupancies-post/doGetOccupancyTypeFields.js  |  6 ++++--
 .../lotOccupancies-post/doGetOccupancyTypeFields.ts  | 12 +++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/handlers/lotOccupancies-post/doGetOccupancyTypeFields.js b/handlers/lotOccupancies-post/doGetOccupancyTypeFields.js
index a42925e4..d4264e69 100644
--- a/handlers/lotOccupancies-post/doGetOccupancyTypeFields.js
+++ b/handlers/lotOccupancies-post/doGetOccupancyTypeFields.js
@@ -1,8 +1,10 @@
-import { getOccupancyTypeById } from "../../helpers/functions.cache.js";
+import { getOccupancyTypeById, getAllOccupancyTypeFields } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
+    const occupancyTypeFields = getAllOccupancyTypeFields();
     const result = getOccupancyTypeById(Number.parseInt(request.body.occupancyTypeId, 10));
+    occupancyTypeFields.push(...result.occupancyTypeFields);
     response.json({
-        occupancyTypeFields: result.occupancyTypeFields
+        occupancyTypeFields
     });
 };
 export default handler;
diff --git a/handlers/lotOccupancies-post/doGetOccupancyTypeFields.ts b/handlers/lotOccupancies-post/doGetOccupancyTypeFields.ts
index bef08adc..18ca5e8e 100644
--- a/handlers/lotOccupancies-post/doGetOccupancyTypeFields.ts
+++ b/handlers/lotOccupancies-post/doGetOccupancyTypeFields.ts
@@ -1,14 +1,16 @@
 import type { RequestHandler } from "express";
 
-import { getOccupancyTypeById } from "../../helpers/functions.cache.js";
+import { getOccupancyTypeById, getAllOccupancyTypeFields } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const result = getOccupancyTypeById(
-        Number.parseInt(request.body.occupancyTypeId, 10)
-    );
+    const occupancyTypeFields = getAllOccupancyTypeFields();
+
+    const result = getOccupancyTypeById(Number.parseInt(request.body.occupancyTypeId, 10));
+
+    occupancyTypeFields.push(...result.occupancyTypeFields);
 
     response.json({
-        occupancyTypeFields: result.occupancyTypeFields
+        occupancyTypeFields
     });
 };