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

make options object mandatory

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-24 10:38:49 -05:00
parent dbd2acce75
commit 6077199543
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/lotOccupancyDB/getWorkOrders.d.ts vendored
View File

@ -15,7 +15,7 @@ interface GetWorkOrdersOptions {
includeComments?: boolean; includeComments?: boolean;
includeMilestones?: boolean; includeMilestones?: boolean;
} }
export declare function getWorkOrders(filters: GetWorkOrdersFilters, options?: GetWorkOrdersOptions, connectedDatabase?: PoolConnection): Promise<{ export declare function getWorkOrders(filters: GetWorkOrdersFilters, options: GetWorkOrdersOptions, connectedDatabase?: PoolConnection): Promise<{
count: number; count: number;
workOrders: recordTypes.WorkOrder[]; workOrders: recordTypes.WorkOrder[];
}>; }>;

8
helpers/lotOccupancyDB/getWorkOrders.js
View File

@ -82,15 +82,15 @@ export async function getWorkOrders(filters, options, connectedDatabase) {
' group by workOrderId) m on w.workOrderId = m.workOrderId') + ' group by workOrderId) m on w.workOrderId = m.workOrderId') +
sqlWhereClause + sqlWhereClause +
' order by w.workOrderOpenDate desc, w.workOrderNumber desc' + ' order by w.workOrderOpenDate desc, w.workOrderNumber desc' +
(options === undefined (options.limit === -1
? '' ? ''
: ` limit ${options.limit} offset ${options.offset}`)) : ` limit ${options.limit} offset ${options.offset}`))
.all(sqlParameters); .all(sqlParameters);
} }
if (options !== undefined && const hasInclusions = (options.includeComments ?? false) ||
((options.includeComments ?? false) ||
(options.includeLotsAndLotOccupancies ?? false) || (options.includeLotsAndLotOccupancies ?? false) ||
(options.includeMilestones ?? false))) { (options.includeMilestones ?? false);
if (hasInclusions) {
for (const workOrder of workOrders) { for (const workOrder of workOrders) {
if (options.includeComments ?? false) { if (options.includeComments ?? false) {
workOrder.workOrderComments = await getWorkOrderComments(workOrder.workOrderId, database); workOrder.workOrderComments = await getWorkOrderComments(workOrder.workOrderId, database);

16
helpers/lotOccupancyDB/getWorkOrders.ts
View File

@ -101,7 +101,7 @@ function buildWhereClause(filters: GetWorkOrdersFilters): {
export async function getWorkOrders( export async function getWorkOrders(
filters: GetWorkOrdersFilters, filters: GetWorkOrdersFilters,
options?: GetWorkOrdersOptions, options: GetWorkOrdersOptions,
connectedDatabase?: PoolConnection connectedDatabase?: PoolConnection
): Promise<{ count: number; workOrders: recordTypes.WorkOrder[] }> { ): Promise<{ count: number; workOrders: recordTypes.WorkOrder[] }> {
const database = connectedDatabase ?? (await acquireConnection()) const database = connectedDatabase ?? (await acquireConnection())
@ -138,23 +138,23 @@ export async function getWorkOrders(
' group by workOrderId) m on w.workOrderId = m.workOrderId') + ' group by workOrderId) m on w.workOrderId = m.workOrderId') +
sqlWhereClause + sqlWhereClause +
' order by w.workOrderOpenDate desc, w.workOrderNumber desc' + ' order by w.workOrderOpenDate desc, w.workOrderNumber desc' +
(options === undefined (options.limit === -1
? '' ? ''
: ` limit ${options.limit} offset ${options.offset}`) : ` limit ${options.limit} offset ${options.offset}`)
) )
.all(sqlParameters) .all(sqlParameters)
} }
if ( const hasInclusions =
options !== undefined && (options.includeComments ?? false) ||
((options.includeComments ?? false) ||
(options.includeLotsAndLotOccupancies ?? false) || (options.includeLotsAndLotOccupancies ?? false) ||
(options.includeMilestones ?? false)) (options.includeMilestones ?? false)
) {
if (hasInclusions) {
for (const workOrder of workOrders) { for (const workOrder of workOrders) {
if (options.includeComments ?? false) { if (options.includeComments ?? false) {
workOrder.workOrderComments = await getWorkOrderComments( workOrder.workOrderComments = await getWorkOrderComments(
workOrder.workOrderId as number, workOrder.workOrderId!,
database database
) )
} }