From 19a7c81766cfde475e797f0ed42c665fc2913170 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 28 Apr 2025 15:30:48 -0400 Subject: [PATCH] linting --- docs/installation.md | 4 ++-- handlers/contracts-get/edit.js | 2 +- handlers/contracts-get/edit.ts | 6 +++--- temp/legacyImportFromCsv/data.cemeteries.js | 5 +++++ temp/legacyImportFromCsv/data.cemeteries.ts | 6 ++++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 28c627f4..774907fb 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -61,9 +61,9 @@ Open a command line, and navigate to the folder where the application will resid ## Step 5: Create a `config.js` file -It is recommended to copy the `config.testing.js` file to get started. +It is recommended to copy the `testing.config.js` file to get started. - > cp data/config.testing.js data/config.js + > cp data/testing.config.js data/config.js See the [config.js documentation](configJs.md) for help customizing your configuration. diff --git a/handlers/contracts-get/edit.js b/handlers/contracts-get/edit.js index 0c7e36f1..0d85611c 100644 --- a/handlers/contracts-get/edit.js +++ b/handlers/contracts-get/edit.js @@ -1,9 +1,9 @@ +import getBurialSiteDirectionsOfArrival, { defaultDirectionsOfArrival } from '../../database/getBurialSiteDirectionsOfArrival.js'; import getCemeteries from '../../database/getCemeteries.js'; import getContract from '../../database/getContract.js'; import getFuneralHomes from '../../database/getFuneralHomes.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; import { getBurialSiteStatuses, getBurialSiteTypes, getCommittalTypes, getContractTypePrintsById, getContractTypes, getIntermentContainerTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; -import getBurialSiteDirectionsOfArrival, { defaultDirectionsOfArrival } from '../../database/getBurialSiteDirectionsOfArrival.js'; export default async function handler(request, response) { const contract = await getContract(request.params.contractId); if (contract === undefined) { diff --git a/handlers/contracts-get/edit.ts b/handlers/contracts-get/edit.ts index d767071d..ecbac3af 100644 --- a/handlers/contracts-get/edit.ts +++ b/handlers/contracts-get/edit.ts @@ -1,5 +1,8 @@ import type { Request, Response } from 'express' +import getBurialSiteDirectionsOfArrival, { + defaultDirectionsOfArrival +} from '../../database/getBurialSiteDirectionsOfArrival.js' import getCemeteries from '../../database/getCemeteries.js' import getContract from '../../database/getContract.js' import getFuneralHomes from '../../database/getFuneralHomes.js' @@ -13,9 +16,6 @@ import { getIntermentContainerTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js' -import getBurialSiteDirectionsOfArrival, { - defaultDirectionsOfArrival -} from '../../database/getBurialSiteDirectionsOfArrival.js' export default async function handler( request: Request, diff --git a/temp/legacyImportFromCsv/data.cemeteries.js b/temp/legacyImportFromCsv/data.cemeteries.js index bb49b950..82c72d9f 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.js +++ b/temp/legacyImportFromCsv/data.cemeteries.js @@ -211,7 +211,9 @@ export function getCemeteryIdByKey(cemeteryKeyToSearch, user) { if (cemeteryCache.has(cemeteryKey)) { return cemeteryCache.get(cemeteryKey); } + console.log(`Cemetery cache miss: ${cemeteryKey}`); const cemetery = getCemeteryByKey(cemeteryKey); + console.log(`Cemetery found: ${cemeteryKey}`); if (cemetery === undefined) { console.log(`Creating cemetery: ${cemeteryKey}`); let addForm = cemeteryKeyToCemetery[cemeteryKey]; @@ -234,5 +236,8 @@ export function getCemeteryIdByKey(cemeteryKeyToSearch, user) { const cemeteryId = addCemetery(addForm, user); cemeteryCache.set(cemeteryKey, cemeteryId); } + else { + cemeteryCache.set(cemeteryKey, cemetery.cemeteryId); + } return cemeteryCache.get(cemeteryKey); } diff --git a/temp/legacyImportFromCsv/data.cemeteries.ts b/temp/legacyImportFromCsv/data.cemeteries.ts index 7820fe13..3427354e 100644 --- a/temp/legacyImportFromCsv/data.cemeteries.ts +++ b/temp/legacyImportFromCsv/data.cemeteries.ts @@ -281,8 +281,12 @@ export function getCemeteryIdByKey( return cemeteryCache.get(cemeteryKey) as number } + console.log(`Cemetery cache miss: ${cemeteryKey}`) + const cemetery = getCemeteryByKey(cemeteryKey) + console.log(`Cemetery found: ${cemeteryKey}`) + if (cemetery === undefined) { console.log(`Creating cemetery: ${cemeteryKey}`) @@ -312,6 +316,8 @@ export function getCemeteryIdByKey( const cemeteryId = addCemetery(addForm, user) cemeteryCache.set(cemeteryKey, cemeteryId) + } else { + cemeteryCache.set(cemeteryKey, cemetery.cemeteryId as number) } return cemeteryCache.get(cemeteryKey) as number