diff --git a/helpers/lotOccupancyDB/addLotOccupancy.d.ts b/helpers/lotOccupancyDB/addLotOccupancy.d.ts index f4f2652b..7b40d3ec 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.d.ts @@ -7,7 +7,7 @@ interface AddLotOccupancyForm { occupancyEndDateString: string; occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; - lotOccupantTypeId: string; + lotOccupantTypeId?: string; occupantName?: string; occupantAddress1?: string; occupantAddress2?: string; diff --git a/helpers/lotOccupancyDB/addLotOccupancy.js b/helpers/lotOccupancyDB/addLotOccupancy.js index 52ab1bfb..c0d65150 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.js +++ b/helpers/lotOccupancyDB/addLotOccupancy.js @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js"; -import addLotOccupancyOccupant from "./addLotOccupancyOccupant.js"; +import { addLotOccupancyOccupant } from "./addLotOccupancyOccupant.js"; export const addLotOccupancy = (lotOccupancyForm, requestSession, connectedDatabase) => { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); diff --git a/helpers/lotOccupancyDB/addLotOccupancy.ts b/helpers/lotOccupancyDB/addLotOccupancy.ts index ef7abdc3..4b58d359 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.ts @@ -5,9 +5,9 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js"; +import { addLotOccupancyOccupant } from "./addLotOccupancyOccupant.js"; import type * as recordTypes from "../../types/recordTypes"; -import addLotOccupancyOccupant from "./addLotOccupancyOccupant.js"; interface AddLotOccupancyForm { occupancyTypeId: string | number; @@ -19,7 +19,7 @@ interface AddLotOccupancyForm { occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; - lotOccupantTypeId: string; + lotOccupantTypeId?: string; occupantName?: string; occupantAddress1?: string; occupantAddress2?: string;