steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure burial site names remain distinct

pull/3/head
Dan Gowans 2025-03-21 09:12:31 -04:00
parent d7f4cb4d3b
commit 80fa36853d
12 changed files with 212 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
database/addBurialSite.d.ts vendored
View File

@ -13,4 +13,11 @@ export interface AddBurialSiteForm {
burialSiteTypeFieldIds?: string;
[fieldValue_burialSiteTypeFieldId: string]: unknown;
}
/**
* Creates a new burial site.
* @param burialSiteForm - The new burial site's information
* @param user - The user making the request
* @returns The new burial site's id.
* @throws If an active burial site with the same name already exists.
*/
export default function addBurialSite(burialSiteForm: AddBurialSiteForm, user: User): Promise<number>;

31
database/addBurialSite.js
View File

@ -2,11 +2,32 @@ import { buildBurialSiteName } from '../helpers/burialSites.helpers.js';
import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js';
import getCemetery from './getCemetery.js';
import { acquireConnection } from './pool.js';
/**
* Creates a new burial site.
* @param burialSiteForm - The new burial site's information
* @param user - The user making the request
* @returns The new burial site's id.
* @throws If an active burial site with the same name already exists.
*/
export default async function addBurialSite(burialSiteForm, user) {
const database = await acquireConnection();
const rightNowMillis = Date.now();
const cemetery = burialSiteForm.cemeteryId === '' ? undefined : await getCemetery(burialSiteForm.cemeteryId, database);
const cemetery = burialSiteForm.cemeteryId === ''
? undefined
: await getCemetery(burialSiteForm.cemeteryId, database);
const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, burialSiteForm);
// Ensure no active burial sites share the same name
const existingBurialSite = database
.prepare(`select burialSiteId
from BurialSites
where burialSiteName = ?
and recordDelete_timeMillis is null`)
.pluck()
.get(burialSiteName);
if (existingBurialSite !== undefined) {
database.release();
throw new Error('An active burial site with that name already exists.');
}
const result = database
.prepare(`insert into BurialSites (
burialSiteNameSegment1,
@ -24,7 +45,13 @@ export default async function addBurialSite(burialSiteForm, user) {
values (?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?)`)
.run(burialSiteForm.burialSiteNameSegment1, burialSiteForm.burialSiteNameSegment2 ?? '', burialSiteForm.burialSiteNameSegment3 ?? '', burialSiteForm.burialSiteNameSegment4 ?? '', burialSiteForm.burialSiteNameSegment5 ?? '', burialSiteName, burialSiteForm.burialSiteTypeId, burialSiteForm.burialSiteStatusId === '' ? undefined : burialSiteForm.burialSiteStatusId, burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId, burialSiteForm.cemeterySvgId, burialSiteForm.burialSiteLatitude === '' ? undefined : burialSiteForm.burialSiteLatitude, burialSiteForm.burialSiteLongitude === '' ? undefined : burialSiteForm.burialSiteLongitude, user.userName, rightNowMillis, user.userName, rightNowMillis);
.run(burialSiteForm.burialSiteNameSegment1, burialSiteForm.burialSiteNameSegment2 ?? '', burialSiteForm.burialSiteNameSegment3 ?? '', burialSiteForm.burialSiteNameSegment4 ?? '', burialSiteForm.burialSiteNameSegment5 ?? '', burialSiteName, burialSiteForm.burialSiteTypeId, burialSiteForm.burialSiteStatusId === ''
? undefined
: burialSiteForm.burialSiteStatusId, burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId, burialSiteForm.cemeterySvgId, burialSiteForm.burialSiteLatitude === ''
? undefined
: burialSiteForm.burialSiteLatitude, burialSiteForm.burialSiteLongitude === ''
? undefined
: burialSiteForm.burialSiteLongitude, user.userName, rightNowMillis, user.userName, rightNowMillis);
const burialSiteId = result.lastInsertRowid;
const burialSiteTypeFieldIds = (burialSiteForm.burialSiteTypeFieldIds ?? '').split(',');
for (const burialSiteTypeFieldId of burialSiteTypeFieldIds) {

52
database/addBurialSite.ts
View File

@ -24,6 +24,13 @@ export interface AddBurialSiteForm {
[fieldValue_burialSiteTypeFieldId: string]: unknown
}
/**
* Creates a new burial site.
* @param burialSiteForm - The new burial site's information
* @param user - The user making the request
* @returns The new burial site's id.
* @throws If an active burial site with the same name already exists.
*/
export default async function addBurialSite(
burialSiteForm: AddBurialSiteForm,
user: User
@ -32,11 +39,32 @@ export default async function addBurialSite(
const rightNowMillis = Date.now()
const cemetery = burialSiteForm.cemeteryId === '' ? undefined : await getCemetery(burialSiteForm.cemeteryId, database)
const cemetery =
burialSiteForm.cemeteryId === ''
? undefined
: await getCemetery(burialSiteForm.cemeteryId, database)
const burialSiteName = buildBurialSiteName(
cemetery?.cemeteryKey,
burialSiteForm)
burialSiteForm
)
// Ensure no active burial sites share the same name
const existingBurialSite = database
.prepare(
`select burialSiteId
from BurialSites
where burialSiteName = ?
and recordDelete_timeMillis is null`
)
.pluck()
.get(burialSiteName) as number | undefined
if (existingBurialSite !== undefined) {
database.release()
throw new Error('An active burial site with that name already exists.')
}
const result = database
.prepare(
@ -65,11 +93,17 @@ export default async function addBurialSite(
burialSiteForm.burialSiteNameSegment5 ?? '',
burialSiteName,
burialSiteForm.burialSiteTypeId,
burialSiteForm.burialSiteStatusId === '' ? undefined : burialSiteForm.burialSiteStatusId,
burialSiteForm.burialSiteStatusId === ''
? undefined
: burialSiteForm.burialSiteStatusId,
burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId,
burialSiteForm.cemeterySvgId,
burialSiteForm.burialSiteLatitude === '' ? undefined : burialSiteForm.burialSiteLatitude,
burialSiteForm.burialSiteLongitude === '' ? undefined : burialSiteForm.burialSiteLongitude,
burialSiteForm.burialSiteLatitude === ''
? undefined
: burialSiteForm.burialSiteLatitude,
burialSiteForm.burialSiteLongitude === ''
? undefined
: burialSiteForm.burialSiteLongitude,
user.userName,
rightNowMillis,
user.userName,
@ -78,10 +112,14 @@ export default async function addBurialSite(
const burialSiteId = result.lastInsertRowid as number
const burialSiteTypeFieldIds = (burialSiteForm.burialSiteTypeFieldIds ?? '').split(',')
const burialSiteTypeFieldIds = (
burialSiteForm.burialSiteTypeFieldIds ?? ''
).split(',')
for (const burialSiteTypeFieldId of burialSiteTypeFieldIds) {
const fieldValue = burialSiteForm[`burialSiteFieldValue_${burialSiteTypeFieldId}`] as string | undefined
const fieldValue = burialSiteForm[
`burialSiteFieldValue_${burialSiteTypeFieldId}`
] as string | undefined
if ((fieldValue ?? '') !== '') {
await addOrUpdateBurialSiteField(

6
database/getBurialSites.js
View File

@ -91,11 +91,7 @@ export default async function getBurialSites(filters, options, connectedDatabase
group by burialSiteId) o on l.burialSiteId = o.burialSiteId`
: ''}
${sqlWhereClause}
order by l.burialSiteNameSegment1,
l.burialSiteNameSegment2,
l.burialSiteNameSegment3,
l.burialSiteNameSegment4,
l.burialSiteNameSegment5,
order by l.burialSiteName,
l.burialSiteId
${options.limit === -1
? ''

6
database/getBurialSites.ts
View File

@ -148,11 +148,7 @@ export default async function getBurialSites(
: ''
}
${sqlWhereClause}
order by l.burialSiteNameSegment1,
l.burialSiteNameSegment2,
l.burialSiteNameSegment3,
l.burialSiteNameSegment4,
l.burialSiteNameSegment5,
order by l.burialSiteName,
l.burialSiteId
${
options.limit === -1

7
database/updateBurialSite.d.ts vendored
View File

@ -14,5 +14,12 @@ export interface UpdateBurialSiteForm {
burialSiteTypeFieldIds?: string;
[fieldValue_burialSiteTypeFieldId: string]: unknown;
}
/**
* Updates a burial site.
* @param updateForm - The burial site's updated information
* @param user - The user making the request
* @returns True if the burial site was updated.
* @throws If an active burial site with the same name already exists.
*/
export default function updateBurialSite(updateForm: UpdateBurialSiteForm, user: User): Promise<boolean>;
export declare function updateBurialSiteStatus(burialSiteId: number | string, burialSiteStatusId: number | string, user: User): Promise<boolean>;

20
database/updateBurialSite.js
View File

@ -3,12 +3,32 @@ import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js';
import deleteBurialSiteField from './deleteBurialSiteField.js';
import getCemetery from './getCemetery.js';
import { acquireConnection } from './pool.js';
/**
* Updates a burial site.
* @param updateForm - The burial site's updated information
* @param user - The user making the request
* @returns True if the burial site was updated.
* @throws If an active burial site with the same name already exists.
*/
export default async function updateBurialSite(updateForm, user) {
const database = await acquireConnection();
const cemetery = updateForm.cemeteryId === ''
? undefined
: await getCemetery(updateForm.cemeteryId, database);
const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, updateForm);
// Ensure no active burial sites share the same name
const existingBurialSite = database
.prepare(`select burialSiteId
from BurialSites
where burialSiteName = ?
and burialSiteId <> ?
and recordDelete_timeMillis is null`)
.pluck()
.get(burialSiteName, updateForm.burialSiteId);
if (existingBurialSite !== undefined) {
database.release();
throw new Error('An active burial site with that name already exists.');
}
const result = database
.prepare(`update BurialSites
set burialSiteNameSegment1 = ?,

32
database/updateBurialSite.ts
View File

@ -27,6 +27,13 @@ export interface UpdateBurialSiteForm {
[fieldValue_burialSiteTypeFieldId: string]: unknown
}
/**
* Updates a burial site.
* @param updateForm - The burial site's updated information
* @param user - The user making the request
* @returns True if the burial site was updated.
* @throws If an active burial site with the same name already exists.
*/
export default async function updateBurialSite(
updateForm: UpdateBurialSiteForm,
user: User
@ -34,14 +41,29 @@ export default async function updateBurialSite(
const database = await acquireConnection()
const cemetery =
updateForm.cemeteryId === ''
updateForm.cemeteryId === ''
? undefined
: await getCemetery(updateForm.cemeteryId, database)
const burialSiteName = buildBurialSiteName(
cemetery?.cemeteryKey,
updateForm
)
const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, updateForm)
// Ensure no active burial sites share the same name
const existingBurialSite = database
.prepare(
`select burialSiteId
from BurialSites
where burialSiteName = ?
and burialSiteId <> ?
and recordDelete_timeMillis is null`
)
.pluck()
.get(burialSiteName, updateForm.burialSiteId) as number | undefined
if (existingBurialSite !== undefined) {
database.release()
throw new Error('An active burial site with that name already exists.')
}
const result = database
.prepare(

24
handlers/burialSites-post/doCreateBurialSite.js
View File

@ -1,12 +1,20 @@
import addBurialSite from '../../database/addBurialSite.js';
import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js';
export default async function handler(request, response) {
const burialSiteId = await addBurialSite(request.body, request.session.user);
response.json({
success: true,
burialSiteId
});
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(-1);
});
try {
const burialSiteId = await addBurialSite(request.body, request.session.user);
response.json({
success: true,
burialSiteId
});
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(-1);
});
}
catch (error) {
response.json({
success: false,
errorMessage: error.message
});
}
}

29
handlers/burialSites-post/doCreateBurialSite.ts
View File

@ -9,17 +9,24 @@ export default async function handler(
request: Request<unknown, unknown, AddBurialSiteForm>,
response: Response
): Promise<void> {
const burialSiteId = await addBurialSite(
request.body,
request.session.user as User
)
try {
const burialSiteId = await addBurialSite(
request.body,
request.session.user as User
)
response.json({
success: true,
burialSiteId
})
response.json({
success: true,
burialSiteId
})
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(-1)
})
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(-1)
})
} catch (error) {
response.json({
success: false,
errorMessage: (error as Error).message
})
}
}

30
handlers/burialSites-post/doUpdateBurialSite.js
View File

@ -1,15 +1,23 @@
import updateBurialSite from '../../database/updateBurialSite.js';
import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js';
export default async function handler(request, response) {
const success = await updateBurialSite(request.body, request.session.user);
const burialSiteId = typeof request.body.burialSiteId === 'string'
? Number.parseInt(request.body.burialSiteId, 10)
: request.body.burialSiteId;
response.json({
success,
burialSiteId
});
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(burialSiteId);
});
try {
const success = await updateBurialSite(request.body, request.session.user);
const burialSiteId = typeof request.body.burialSiteId === 'string'
? Number.parseInt(request.body.burialSiteId, 10)
: request.body.burialSiteId;
response.json({
success,
burialSiteId
});
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(burialSiteId);
});
}
catch (error) {
response.json({
success: false,
errorMessage: error.message
});
}
}

37
handlers/burialSites-post/doUpdateBurialSite.ts
View File

@ -9,22 +9,29 @@ export default async function handler(
request: Request<unknown, unknown, UpdateBurialSiteForm>,
response: Response
): Promise<void> {
const success = await updateBurialSite(
request.body,
request.session.user as User
)
try {
const success = await updateBurialSite(
request.body,
request.session.user as User
)
const burialSiteId =
typeof request.body.burialSiteId === 'string'
? Number.parseInt(request.body.burialSiteId, 10)
: request.body.burialSiteId
const burialSiteId =
typeof request.body.burialSiteId === 'string'
? Number.parseInt(request.body.burialSiteId, 10)
: request.body.burialSiteId
response.json({
success,
burialSiteId
})
response.json({
success,
burialSiteId
})
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(burialSiteId)
})
response.on('finish', () => {
clearNextPreviousBurialSiteIdCache(burialSiteId)
})
} catch (error) {
response.json({
success: false,
errorMessage: (error as Error).message
})
}
}