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

attempt to reduce complexity

deepsource-autofix-76c6eb20
Dan Gowans 2023-03-28 13:05:48 -04:00
parent 71583c5d45
commit 095eb2e5f8
2 changed files with 115 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
helpers/lotOccupancyDB/getWorkOrders.js
View File

@ -55,12 +55,55 @@ function buildWhereClause(filters) {
sqlParameters
};
}
async function addInclusions(workOrder, options, database) {
if (options.includeComments ?? false) {
workOrder.workOrderComments = await getWorkOrderComments(workOrder.workOrderId, database);
}
if (options.includeLotsAndLotOccupancies ?? false) {
if (workOrder.workOrderLotCount === 0) {
workOrder.workOrderLots = [];
}
else {
const workOrderLotsResults = await getLots({
workOrderId: workOrder.workOrderId
}, {
limit: -1,
offset: 0,
includeLotOccupancyCount: false
}, database);
workOrder.workOrderLots = workOrderLotsResults.lots;
}
const lotOccupancies = await getLotOccupancies({
workOrderId: workOrder.workOrderId
}, {
limit: -1,
offset: 0,
includeOccupants: true,
includeFees: false,
includeTransactions: false
}, database);
workOrder.workOrderLotOccupancies = lotOccupancies.lotOccupancies;
}
if (options.includeMilestones ?? false) {
workOrder.workOrderMilestones =
workOrder.workOrderMilestoneCount === 0
? []
: await getWorkOrderMilestones({
workOrderId: workOrder.workOrderId
}, {
orderBy: 'date'
}, database);
}
return workOrder;
}
export async function getWorkOrders(filters, options, connectedDatabase) {
const database = connectedDatabase ?? (await acquireConnection());
database.function('userFn_dateIntegerToString', dateIntegerToString);
const { sqlWhereClause, sqlParameters } = buildWhereClause(filters);
const count = database
.prepare('select count(*) as recordCount from WorkOrders w' + sqlWhereClause)
.prepare(`select count(*) as recordCount
from WorkOrders w
${sqlWhereClause}`)
.get(sqlParameters).recordCount;
let workOrders = [];
if (count > 0) {
@ -99,44 +142,7 @@ export async function getWorkOrders(filters, options, connectedDatabase) {
(options.includeMilestones ?? false);
if (hasInclusions) {
for (const workOrder of workOrders) {
if (options.includeComments ?? false) {
workOrder.workOrderComments = await getWorkOrderComments(workOrder.workOrderId, database);
}
if (options.includeLotsAndLotOccupancies ?? false) {
if (workOrder.workOrderLotCount === 0) {
workOrder.workOrderLots = [];
}
else {
const workOrderLotsResults = await getLots({
workOrderId: workOrder.workOrderId
}, {
limit: -1,
offset: 0,
includeLotOccupancyCount: false
}, database);
workOrder.workOrderLots = workOrderLotsResults.lots;
}
const lotOccupancies = await getLotOccupancies({
workOrderId: workOrder.workOrderId
}, {
limit: -1,
offset: 0,
includeOccupants: true,
includeFees: false,
includeTransactions: false
}, database);
workOrder.workOrderLotOccupancies = lotOccupancies.lotOccupancies;
}
if (options.includeMilestones ?? false) {
workOrder.workOrderMilestones =
workOrder.workOrderMilestoneCount === 0
? []
: await getWorkOrderMilestones({
workOrderId: workOrder.workOrderId
}, {
orderBy: 'date'
}, database);
}
await addInclusions(workOrder, options, database);
}
}
if (connectedDatabase === undefined) {

128
helpers/lotOccupancyDB/getWorkOrders.ts
View File

@ -99,6 +99,72 @@ function buildWhereClause(filters: GetWorkOrdersFilters): {
}
}
async function addInclusions(
workOrder: recordTypes.WorkOrder,
options: GetWorkOrdersOptions,
database: PoolConnection
): Promise<recordTypes.WorkOrder> {
if (options.includeComments ?? false) {
workOrder.workOrderComments = await getWorkOrderComments(
workOrder.workOrderId!,
database
)
}
if (options.includeLotsAndLotOccupancies ?? false) {
if (workOrder.workOrderLotCount === 0) {
workOrder.workOrderLots = []
} else {
const workOrderLotsResults = await getLots(
{
workOrderId: workOrder.workOrderId
},
{
limit: -1,
offset: 0,
includeLotOccupancyCount: false
},
database
)
workOrder.workOrderLots = workOrderLotsResults.lots
}
const lotOccupancies = await getLotOccupancies(
{
workOrderId: workOrder.workOrderId
},
{
limit: -1,
offset: 0,
includeOccupants: true,
includeFees: false,
includeTransactions: false
},
database
)
workOrder.workOrderLotOccupancies = lotOccupancies.lotOccupancies
}
if (options.includeMilestones ?? false) {
workOrder.workOrderMilestones =
workOrder.workOrderMilestoneCount === 0
? []
: await getWorkOrderMilestones(
{
workOrderId: workOrder.workOrderId
},
{
orderBy: 'date'
},
database
)
}
return workOrder
}
export async function getWorkOrders(
filters: GetWorkOrdersFilters,
options: GetWorkOrdersOptions,
@ -112,7 +178,9 @@ export async function getWorkOrders(
const count: number = database
.prepare(
'select count(*) as recordCount from WorkOrders w' + sqlWhereClause
`select count(*) as recordCount
from WorkOrders w
${sqlWhereClause}`
)
.get(sqlParameters).recordCount
@ -161,63 +229,7 @@ export async function getWorkOrders(
if (hasInclusions) {
for (const workOrder of workOrders) {
if (options.includeComments ?? false) {
workOrder.workOrderComments = await getWorkOrderComments(
workOrder.workOrderId!,
database
)
}
if (options.includeLotsAndLotOccupancies ?? false) {
if (workOrder.workOrderLotCount === 0) {
workOrder.workOrderLots = []
} else {
const workOrderLotsResults = await getLots(
{
workOrderId: workOrder.workOrderId
},
{
limit: -1,
offset: 0,
includeLotOccupancyCount: false
},
database
)
workOrder.workOrderLots = workOrderLotsResults.lots
}
const lotOccupancies = await getLotOccupancies(
{
workOrderId: workOrder.workOrderId
},
{
limit: -1,
offset: 0,
includeOccupants: true,
includeFees: false,
includeTransactions: false
},
database
)
workOrder.workOrderLotOccupancies = lotOccupancies.lotOccupancies
}
if (options.includeMilestones ?? false) {
workOrder.workOrderMilestones =
workOrder.workOrderMilestoneCount === 0
? []
: await getWorkOrderMilestones(
{
workOrderId: workOrder.workOrderId
},
{
orderBy: 'date'
},
database
)
}
await addInclusions(workOrder, options, database)
}
}