From 991ad5bc822ab704464a47f2059a5b0f63af9541 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Wed, 11 Jan 2023 15:20:44 -0500 Subject: [PATCH] fix broken filter --- helpers/functions.sqlFilters.d.ts | 4 ++-- helpers/functions.sqlFilters.js | 4 ++-- helpers/functions.sqlFilters.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helpers/functions.sqlFilters.d.ts b/helpers/functions.sqlFilters.d.ts index 1c9b366a..14aa3c8d 100644 --- a/helpers/functions.sqlFilters.d.ts +++ b/helpers/functions.sqlFilters.d.ts @@ -3,8 +3,8 @@ interface WhereClauseReturn { sqlWhereClause: string; sqlParameters: unknown[]; } -export declare function getLotNameWhereClause(lotName: string, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string): WhereClauseReturn; +export declare function getLotNameWhereClause(lotName: string | undefined, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string): WhereClauseReturn; declare type OccupancyTime = '' | 'current' | 'past' | 'future'; export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime, lotOccupanciesTableAlias?: string): WhereClauseReturn; -export declare function getOccupantNameWhereClause(occupantName: string, tableAlias?: string): WhereClauseReturn; +export declare function getOccupantNameWhereClause(occupantName?: string, tableAlias?: string): WhereClauseReturn; export {}; diff --git a/helpers/functions.sqlFilters.js b/helpers/functions.sqlFilters.js index 00ceccae..c8442a48 100644 --- a/helpers/functions.sqlFilters.js +++ b/helpers/functions.sqlFilters.js @@ -1,5 +1,5 @@ import { dateToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js'; -export function getLotNameWhereClause(lotName, lotNameSearchType, lotsTableAlias = 'l') { +export function getLotNameWhereClause(lotName = '', lotNameSearchType, lotsTableAlias = 'l') { let sqlWhereClause = ''; const sqlParameters = []; if (lotName !== '') { @@ -66,7 +66,7 @@ export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAl sqlParameters }; } -export function getOccupantNameWhereClause(occupantName, tableAlias = 'o') { +export function getOccupantNameWhereClause(occupantName = '', tableAlias = 'o') { let sqlWhereClause = ''; const sqlParameters = []; if (occupantName !== '') { diff --git a/helpers/functions.sqlFilters.ts b/helpers/functions.sqlFilters.ts index de5922c0..fcf3dd3e 100644 --- a/helpers/functions.sqlFilters.ts +++ b/helpers/functions.sqlFilters.ts @@ -8,7 +8,7 @@ interface WhereClauseReturn { } export function getLotNameWhereClause( - lotName: string, + lotName = '', lotNameSearchType: LotNameSearchType, lotsTableAlias = 'l' ): WhereClauseReturn { @@ -93,7 +93,7 @@ export function getOccupancyTimeWhereClause( } export function getOccupantNameWhereClause( - occupantName: string, + occupantName = '', tableAlias = 'o' ): WhereClauseReturn { let sqlWhereClause = ''