deepsource-autofix-76c6eb20
Dan Gowans 2024-07-02 11:46:27 -04:00
parent d55f4e127b
commit bca8a3bfa0
2 changed files with 48 additions and 35 deletions

View File

@ -209,7 +209,7 @@ async function importFromMasterCSV() {
} }
preneedLotOccupancyId = await addLotOccupancy({ preneedLotOccupancyId = await addLotOccupancy({
occupancyTypeId: importIds.preneedOccupancyType.occupancyTypeId, occupancyTypeId: importIds.preneedOccupancyType.occupancyTypeId,
lotId, lotId: lotId ?? '',
occupancyStartDateString: preneedOccupancyStartDateString, occupancyStartDateString: preneedOccupancyStartDateString,
occupancyEndDateString, occupancyEndDateString,
occupancyTypeFieldIds: '' occupancyTypeFieldIds: ''
@ -253,7 +253,7 @@ async function importFromMasterCSV() {
}, user); }, user);
} }
if (occupancyEndDateString === '') { if (occupancyEndDateString === '') {
await updateLotStatus(lotId, importIds.reservedLotStatusId, user); await updateLotStatus(lotId ?? '', importIds.reservedLotStatusId, user);
} }
} }
let deceasedOccupancyStartDateString; let deceasedOccupancyStartDateString;
@ -278,7 +278,7 @@ async function importFromMasterCSV() {
: importIds.cremationOccupancyType; : importIds.cremationOccupancyType;
deceasedLotOccupancyId = await addLotOccupancy({ deceasedLotOccupancyId = await addLotOccupancy({
occupancyTypeId: occupancyType.occupancyTypeId, occupancyTypeId: occupancyType.occupancyTypeId,
lotId, lotId: lotId ?? '',
occupancyStartDateString: deceasedOccupancyStartDateString, occupancyStartDateString: deceasedOccupancyStartDateString,
occupancyEndDateString: deceasedOccupancyEndDateString, occupancyEndDateString: deceasedOccupancyEndDateString,
occupancyTypeFieldIds: '' occupancyTypeFieldIds: ''
@ -330,16 +330,16 @@ async function importFromMasterCSV() {
const funeralHomeOccupant = importData.getFuneralHomeLotOccupancyOccupantData(masterRow.CM_FUNERAL_HOME); const funeralHomeOccupant = importData.getFuneralHomeLotOccupancyOccupantData(masterRow.CM_FUNERAL_HOME);
await addLotOccupancyOccupant({ await addLotOccupancyOccupant({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
lotOccupantTypeId: funeralHomeOccupant.lotOccupantTypeId, lotOccupantTypeId: funeralHomeOccupant.lotOccupantTypeId ?? '',
occupantName: funeralHomeOccupant.occupantName, occupantName: funeralHomeOccupant.occupantName ?? '',
occupantFamilyName: '', occupantFamilyName: '',
occupantAddress1: funeralHomeOccupant.occupantAddress1, occupantAddress1: funeralHomeOccupant.occupantAddress1 ?? '',
occupantAddress2: funeralHomeOccupant.occupantAddress2, occupantAddress2: funeralHomeOccupant.occupantAddress2 ?? '',
occupantCity: funeralHomeOccupant.occupantCity, occupantCity: funeralHomeOccupant.occupantCity ?? '',
occupantProvince: funeralHomeOccupant.occupantProvince, occupantProvince: funeralHomeOccupant.occupantProvince ?? '',
occupantPostalCode: funeralHomeOccupant.occupantPostalCode, occupantPostalCode: funeralHomeOccupant.occupantPostalCode ?? '',
occupantPhoneNumber: funeralHomeOccupant.occupantPhoneNumber, occupantPhoneNumber: funeralHomeOccupant.occupantPhoneNumber ?? '',
occupantEmailAddress: funeralHomeOccupant.occupantEmailAddress occupantEmailAddress: funeralHomeOccupant.occupantEmailAddress ?? ''
}, user); }, user);
/* /*
addOrUpdateLotOccupancyField( addOrUpdateLotOccupancyField(
@ -414,7 +414,7 @@ async function importFromMasterCSV() {
lotOccupancyComment: `Imported Contract #${masterRow.CM_WORK_ORDER}` lotOccupancyComment: `Imported Contract #${masterRow.CM_WORK_ORDER}`
}, user); }, user);
} }
await updateLotStatus(lotId, importIds.takenLotStatusId, user); await updateLotStatus(lotId ?? '', importIds.takenLotStatusId, user);
if (masterRow.CM_PRENEED_OWNER !== '') { if (masterRow.CM_PRENEED_OWNER !== '') {
await addLotOccupancyOccupant({ await addLotOccupancyOccupant({
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
@ -485,7 +485,7 @@ async function importFromPrepaidCSV() {
lotName, lotName,
lotTypeId, lotTypeId,
lotStatusId: importIds.reservedLotStatusId, lotStatusId: importIds.reservedLotStatusId,
mapId: map.mapId, mapId: map.mapId ?? '',
mapKey: lotName.includes(',') ? lotName.split(',')[0] : lotName, mapKey: lotName.includes(',') ? lotName.split(',')[0] : lotName,
lotLatitude: '', lotLatitude: '',
lotLongitude: '' lotLongitude: ''

View File

@ -1,6 +1,11 @@
import fs from 'node:fs' import fs from 'node:fs'
import { dateIntegerToString, dateToString } from '@cityssm/utils-datetime' import {
type DateString,
type TimeString,
dateIntegerToString,
dateToString
} from '@cityssm/utils-datetime'
import sqlite from 'better-sqlite3' import sqlite from 'better-sqlite3'
import papa from 'papaparse' import papa from 'papaparse'
@ -243,19 +248,23 @@ function getMapByMapDescription(mapDescription: string): recordTypes.MapRecord {
return map return map
} }
function formatDateString(year: string, month: string, day: string): string { function formatDateString(
year: string,
month: string,
day: string
): DateString {
const formattedYear = `0000${year}`.slice(-4) const formattedYear = `0000${year}`.slice(-4)
const formattedMonth = `00${month}`.slice(-2) const formattedMonth = `00${month}`.slice(-2)
const formattedDay = `00${day}`.slice(-2) const formattedDay = `00${day}`.slice(-2)
return `${formattedYear}-${formattedMonth}-${formattedDay}` return `${formattedYear}-${formattedMonth}-${formattedDay}` as DateString
} }
function formatTimeString(hour: string, minute: string): string { function formatTimeString(hour: string, minute: string): TimeString {
const formattedHour = `00${hour}`.slice(-2) const formattedHour = `00${hour}`.slice(-2)
const formattedMinute = `00${minute}`.slice(-2) const formattedMinute = `00${minute}`.slice(-2)
return `${formattedHour}:${formattedMinute}` return `${formattedHour}:${formattedMinute}` as TimeString
} }
const cemeteryToMapName = { const cemeteryToMapName = {
@ -359,7 +368,7 @@ async function importFromMasterCSV(): Promise<void> {
cemetery: masterRow.CM_CEMETERY cemetery: masterRow.CM_CEMETERY
})! })!
let lotId: number let lotId: number | undefined
if (masterRow.CM_CEMETERY !== '00') { if (masterRow.CM_CEMETERY !== '00') {
lotId = await addLot( lotId = await addLot(
@ -438,7 +447,7 @@ async function importFromMasterCSV(): Promise<void> {
preneedLotOccupancyId = await addLotOccupancy( preneedLotOccupancyId = await addLotOccupancy(
{ {
occupancyTypeId: importIds.preneedOccupancyType.occupancyTypeId, occupancyTypeId: importIds.preneedOccupancyType.occupancyTypeId,
lotId, lotId: lotId ?? '',
occupancyStartDateString: preneedOccupancyStartDateString, occupancyStartDateString: preneedOccupancyStartDateString,
occupancyEndDateString, occupancyEndDateString,
occupancyTypeFieldIds: '' occupancyTypeFieldIds: ''
@ -503,7 +512,11 @@ async function importFromMasterCSV(): Promise<void> {
} }
if (occupancyEndDateString === '') { if (occupancyEndDateString === '') {
await updateLotStatus(lotId, importIds.reservedLotStatusId, user) await updateLotStatus(
lotId ?? '',
importIds.reservedLotStatusId,
user
)
} }
} }
@ -548,7 +561,7 @@ async function importFromMasterCSV(): Promise<void> {
deceasedLotOccupancyId = await addLotOccupancy( deceasedLotOccupancyId = await addLotOccupancy(
{ {
occupancyTypeId: occupancyType.occupancyTypeId, occupancyTypeId: occupancyType.occupancyTypeId,
lotId, lotId: lotId ?? '',
occupancyStartDateString: deceasedOccupancyStartDateString, occupancyStartDateString: deceasedOccupancyStartDateString,
occupancyEndDateString: deceasedOccupancyEndDateString, occupancyEndDateString: deceasedOccupancyEndDateString,
occupancyTypeFieldIds: '' occupancyTypeFieldIds: ''
@ -640,16 +653,16 @@ async function importFromMasterCSV(): Promise<void> {
await addLotOccupancyOccupant( await addLotOccupancyOccupant(
{ {
lotOccupancyId: deceasedLotOccupancyId, lotOccupancyId: deceasedLotOccupancyId,
lotOccupantTypeId: funeralHomeOccupant.lotOccupantTypeId!, lotOccupantTypeId: funeralHomeOccupant.lotOccupantTypeId ?? '',
occupantName: funeralHomeOccupant.occupantName!, occupantName: funeralHomeOccupant.occupantName ?? '',
occupantFamilyName: '', occupantFamilyName: '',
occupantAddress1: funeralHomeOccupant.occupantAddress1!, occupantAddress1: funeralHomeOccupant.occupantAddress1 ?? '',
occupantAddress2: funeralHomeOccupant.occupantAddress2!, occupantAddress2: funeralHomeOccupant.occupantAddress2 ?? '',
occupantCity: funeralHomeOccupant.occupantCity!, occupantCity: funeralHomeOccupant.occupantCity ?? '',
occupantProvince: funeralHomeOccupant.occupantProvince!, occupantProvince: funeralHomeOccupant.occupantProvince ?? '',
occupantPostalCode: funeralHomeOccupant.occupantPostalCode!, occupantPostalCode: funeralHomeOccupant.occupantPostalCode ?? '',
occupantPhoneNumber: funeralHomeOccupant.occupantPhoneNumber!, occupantPhoneNumber: funeralHomeOccupant.occupantPhoneNumber ?? '',
occupantEmailAddress: funeralHomeOccupant.occupantEmailAddress! occupantEmailAddress: funeralHomeOccupant.occupantEmailAddress ?? ''
}, },
user user
) )
@ -771,7 +784,7 @@ async function importFromMasterCSV(): Promise<void> {
) )
} }
await updateLotStatus(lotId, importIds.takenLotStatusId, user) await updateLotStatus(lotId ?? '', importIds.takenLotStatusId, user)
if (masterRow.CM_PRENEED_OWNER !== '') { if (masterRow.CM_PRENEED_OWNER !== '') {
await addLotOccupancyOccupant( await addLotOccupancyOccupant(
@ -830,7 +843,7 @@ async function importFromPrepaidCSV(): Promise<void> {
cemetery = 'HC' cemetery = 'HC'
} }
let lot: recordTypes.Lot let lot: recordTypes.Lot | undefined
if (cemetery !== '') { if (cemetery !== '') {
const map = await getMap({ const map = await getMap({
@ -861,7 +874,7 @@ async function importFromPrepaidCSV(): Promise<void> {
lotName, lotName,
lotTypeId, lotTypeId,
lotStatusId: importIds.reservedLotStatusId, lotStatusId: importIds.reservedLotStatusId,
mapId: map.mapId!, mapId: map.mapId ?? '',
mapKey: lotName.includes(',') ? lotName.split(',')[0] : lotName, mapKey: lotName.includes(',') ? lotName.split(',')[0] : lotName,
lotLatitude: '', lotLatitude: '',
lotLongitude: '' lotLongitude: ''