From b86bc6cd6a811822d2b130c37c77482069445bf8 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 5 Jan 2023 15:51:47 -0500 Subject: [PATCH] linting --- data/databasePaths.js | 6 ++---- data/databasePaths.ts | 8 +++---- helpers/lotOccupancyDB/getLot.js | 19 +++++++---------- helpers/lotOccupancyDB/getLot.ts | 20 +++++++----------- .../lotOccupancyDB/getWorkOrderMilestones.js | 10 +++------ .../lotOccupancyDB/getWorkOrderMilestones.ts | 21 ++++++------------- 6 files changed, 30 insertions(+), 54 deletions(-) diff --git a/data/databasePaths.js b/data/databasePaths.js index 8af3b56b..e52dd3fc 100644 --- a/data/databasePaths.js +++ b/data/databasePaths.js @@ -3,10 +3,8 @@ import Debug from "debug"; const debug = Debug("lot-occupancy-system:databasePaths"); export const useTestDatabases = configFunctions.getProperty("application.useTestDatabases") || process.env.TEST_DATABASES === "true"; if (useTestDatabases) { - debug("Using \"-testing\" databases."); + debug('Using "-testing" databases.'); } export const lotOccupancyDB_live = "data/lotOccupancy.db"; export const lotOccupancyDB_testing = "data/lotOccupancy-testing.db"; -export const lotOccupancyDB = useTestDatabases - ? lotOccupancyDB_testing - : lotOccupancyDB_live; +export const lotOccupancyDB = useTestDatabases ? lotOccupancyDB_testing : lotOccupancyDB_live; diff --git a/data/databasePaths.ts b/data/databasePaths.ts index 3f4a411f..848ecefa 100644 --- a/data/databasePaths.ts +++ b/data/databasePaths.ts @@ -6,15 +6,13 @@ const debug = Debug("lot-occupancy-system:databasePaths"); // Determine if test databases should be used export const useTestDatabases = - configFunctions.getProperty("application.useTestDatabases") || process.env.TEST_DATABASES === "true"; + configFunctions.getProperty("application.useTestDatabases") || process.env.TEST_DATABASES === "true"; if (useTestDatabases) { - debug("Using \"-testing\" databases."); + debug('Using "-testing" databases.'); } export const lotOccupancyDB_live = "data/lotOccupancy.db"; export const lotOccupancyDB_testing = "data/lotOccupancy-testing.db"; -export const lotOccupancyDB = useTestDatabases - ? lotOccupancyDB_testing - : lotOccupancyDB_live; +export const lotOccupancyDB = useTestDatabases ? lotOccupancyDB_testing : lotOccupancyDB_live; diff --git a/helpers/lotOccupancyDB/getLot.js b/helpers/lotOccupancyDB/getLot.js index d2516f28..bf206076 100644 --- a/helpers/lotOccupancyDB/getLot.js +++ b/helpers/lotOccupancyDB/getLot.js @@ -3,17 +3,14 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getLotFields } from "./getLotFields.js"; import { getLotComments } from "./getLotComments.js"; import { getLotOccupancies } from "./getLotOccupancies.js"; -const baseSQL = "select l.lotId," + - " l.lotTypeId, t.lotType," + - " l.lotName," + - " l.lotStatusId, s.lotStatus," + - " l.mapId, m.mapName, m.mapSVG, l.mapKey," + - " l.lotLatitude, l.lotLongitude" + - " from Lots l" + - " left join LotTypes t on l.lotTypeId = t.lotTypeId" + - " left join LotStatuses s on l.lotStatusId = s.lotStatusId" + - " left join Maps m on l.mapId = m.mapId" + - " where l.recordDelete_timeMillis is null"; +const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusId, s.lotStatus, + l.mapId, m.mapName, m.mapSVG, l.mapKey, + l.lotLatitude, l.lotLongitude + from Lots l + left join LotTypes t on l.lotTypeId = t.lotTypeId + left join LotStatuses s on l.lotStatusId = s.lotStatusId + left join Maps m on l.mapId = m.mapId + where l.recordDelete_timeMillis is null`; function _getLot(sql, lotId_or_lotName) { const database = sqlite(databasePath, { readonly: true diff --git a/helpers/lotOccupancyDB/getLot.ts b/helpers/lotOccupancyDB/getLot.ts index 429324b2..5f9d3786 100644 --- a/helpers/lotOccupancyDB/getLot.ts +++ b/helpers/lotOccupancyDB/getLot.ts @@ -10,18 +10,14 @@ import { getLotOccupancies } from "./getLotOccupancies.js"; import type * as recordTypes from "../../types/recordTypes"; -const baseSQL = - "select l.lotId," + - " l.lotTypeId, t.lotType," + - " l.lotName," + - " l.lotStatusId, s.lotStatus," + - " l.mapId, m.mapName, m.mapSVG, l.mapKey," + - " l.lotLatitude, l.lotLongitude" + - " from Lots l" + - " left join LotTypes t on l.lotTypeId = t.lotTypeId" + - " left join LotStatuses s on l.lotStatusId = s.lotStatusId" + - " left join Maps m on l.mapId = m.mapId" + - " where l.recordDelete_timeMillis is null"; +const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusId, s.lotStatus, + l.mapId, m.mapName, m.mapSVG, l.mapKey, + l.lotLatitude, l.lotLongitude + from Lots l + left join LotTypes t on l.lotTypeId = t.lotTypeId + left join LotStatuses s on l.lotStatusId = s.lotStatusId + left join Maps m on l.mapId = m.mapId + where l.recordDelete_timeMillis is null`; function _getLot(sql: string, lotId_or_lotName: number | string): recordTypes.Lot | undefined { const database = sqlite(databasePath, { diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.js b/helpers/lotOccupancyDB/getWorkOrderMilestones.js index 9569d3c0..2d1ac329 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.js +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.js @@ -29,8 +29,7 @@ function buildWhereClause(filters) { break; } case "recent": { - sqlWhereClause += - " and m.workOrderMilestoneDate >= ? and m.workOrderMilestoneDate <= ?"; + sqlWhereClause += " and m.workOrderMilestoneDate >= ? and m.workOrderMilestoneDate <= ?"; sqlParameters.push(recentBeforeDateNumber, recentAfterDateNumber); break; } @@ -44,8 +43,7 @@ function buildWhereClause(filters) { } if (filters.workOrderMilestoneTypeIds && commaSeparatedNumbersRegex.test(filters.workOrderMilestoneTypeIds)) { - sqlWhereClause += - " and m.workOrderMilestoneTypeId in (" + filters.workOrderMilestoneTypeIds + ")"; + sqlWhereClause += " and m.workOrderMilestoneTypeId in (" + filters.workOrderMilestoneTypeIds + ")"; } return { sqlWhereClause, @@ -98,9 +96,7 @@ export function getWorkOrderMilestones(filters, options, connectedDatabase) { " left join WorkOrderTypes wt on w.workOrderTypeId = wt.workOrderTypeId" + sqlWhereClause + orderByClause; - const workOrderMilestones = database - .prepare(sql) - .all(sqlParameters); + const workOrderMilestones = database.prepare(sql).all(sqlParameters); if (options.includeWorkOrders) { for (const workOrderMilestone of workOrderMilestones) { workOrderMilestone.workOrderLots = getLots({ diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.ts b/helpers/lotOccupancyDB/getWorkOrderMilestones.ts index e0f4489c..47055ace 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.ts @@ -35,8 +35,7 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { sqlWhereClause: string; sqlParameters: unknown[]; } { - let sqlWhereClause = - " where m.recordDelete_timeMillis is null and w.recordDelete_timeMillis is null"; + let sqlWhereClause = " where m.recordDelete_timeMillis is null and w.recordDelete_timeMillis is null"; const sqlParameters: unknown[] = []; if (filters.workOrderId) { @@ -49,18 +48,14 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { date.setDate( date.getDate() - - configFunctions.getProperty( - "settings.workOrders.workOrderMilestoneDateRecentBeforeDays" - ) + configFunctions.getProperty("settings.workOrders.workOrderMilestoneDateRecentBeforeDays") ); const recentBeforeDateNumber = dateToInteger(date); date.setDate( date.getDate() + - configFunctions.getProperty( - "settings.workOrders.workOrderMilestoneDateRecentBeforeDays" - ) + + configFunctions.getProperty("settings.workOrders.workOrderMilestoneDateRecentBeforeDays") + configFunctions.getProperty("settings.workOrders.workOrderMilestoneDateRecentAfterDays") ); @@ -75,8 +70,7 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { } case "recent": { - sqlWhereClause += - " and m.workOrderMilestoneDate >= ? and m.workOrderMilestoneDate <= ?"; + sqlWhereClause += " and m.workOrderMilestoneDate >= ? and m.workOrderMilestoneDate <= ?"; sqlParameters.push(recentBeforeDateNumber, recentAfterDateNumber); break; } @@ -95,8 +89,7 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { filters.workOrderMilestoneTypeIds && commaSeparatedNumbersRegex.test(filters.workOrderMilestoneTypeIds) ) { - sqlWhereClause += - " and m.workOrderMilestoneTypeId in (" + filters.workOrderMilestoneTypeIds + ")"; + sqlWhereClause += " and m.workOrderMilestoneTypeId in (" + filters.workOrderMilestoneTypeIds + ")"; } return { @@ -167,9 +160,7 @@ export function getWorkOrderMilestones( sqlWhereClause + orderByClause; - const workOrderMilestones: recordTypes.WorkOrderMilestone[] = database - .prepare(sql) - .all(sqlParameters); + const workOrderMilestones: recordTypes.WorkOrderMilestone[] = database.prepare(sql).all(sqlParameters); if (options.includeWorkOrders) { for (const workOrderMilestone of workOrderMilestones) {