From eb7c666b5226036c950ae9120d1cf298eb091f66 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 22 Jul 2022 10:53:51 -0400 Subject: [PATCH] support optional lotId --- helpers/lotOccupancyDB/addLotOccupancy.js | 8 +++++--- helpers/lotOccupancyDB/addLotOccupancy.ts | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/helpers/lotOccupancyDB/addLotOccupancy.js b/helpers/lotOccupancyDB/addLotOccupancy.js index 4672c9ad..7e2d2f5b 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.js +++ b/helpers/lotOccupancyDB/addLotOccupancy.js @@ -15,9 +15,11 @@ export const addLotOccupancy = (lotOccupancyForm, requestSession) => { " recordCreate_userName, recordCreate_timeMillis," + " recordUpdate_userName, recordUpdate_timeMillis)" + " values (?, ?, ?, ?, ?, ?, ?, ?)") - .run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId, occupancyStartDate, (lotOccupancyForm.occupancyEndDateString === "" - ? undefined - : dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString)), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); + .run(lotOccupancyForm.occupancyTypeId, (lotOccupancyForm.lotId === "" ? + undefined : + lotOccupancyForm.lotId), occupancyStartDate, (lotOccupancyForm.occupancyEndDateString === "" ? + undefined : + dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString)), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); return result.lastInsertRowid; }; diff --git a/helpers/lotOccupancyDB/addLotOccupancy.ts b/helpers/lotOccupancyDB/addLotOccupancy.ts index 74f478fe..2ad72f64 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.ts @@ -1,5 +1,7 @@ import sqlite from "better-sqlite3"; -import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; +import { + lotOccupancyDB as databasePath +} from "../../data/databasePaths.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; @@ -7,11 +9,11 @@ import type * as recordTypes from "../../types/recordTypes"; interface AddLotOccupancyForm { - occupancyTypeId: string | number; - lotId: string | number; + occupancyTypeId: string | number; + lotId: string | number; - occupancyStartDateString: string; - occupancyEndDateString: string; + occupancyStartDateString: string; + occupancyEndDateString: string; } @@ -36,11 +38,13 @@ export const addLotOccupancy = " recordUpdate_userName, recordUpdate_timeMillis)" + " values (?, ?, ?, ?, ?, ?, ?, ?)") .run(lotOccupancyForm.occupancyTypeId, - lotOccupancyForm.lotId, + (lotOccupancyForm.lotId === "" ? + undefined : + lotOccupancyForm.lotId), occupancyStartDate, - (lotOccupancyForm.occupancyEndDateString === "" - ? undefined - : dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString)), + (lotOccupancyForm.occupancyEndDateString === "" ? + undefined : + dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString)), requestSession.user.userName, rightNowMillis, requestSession.user.userName,