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

include lotOccupancyFeeCount

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-17 10:20:28 -05:00
parent 7467fd9609
commit e40b86f15e
4 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
helpers/lotOccupancyDB/getFees.js
View File

@ -19,18 +19,25 @@ export function getFees(feeCategoryId, additionalFilters, connectedDatabase) {
sqlParameters.push(additionalFilters.lotTypeId);
}
const fees = database
.prepare('select f.feeId, f.feeName, f.feeDescription,' +
' f.occupancyTypeId, o.occupancyType,' +
' f.lotTypeId, l.lotType,' +
' ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction,' +
' f.taxAmount, f.taxPercentage,' +
' f.includeQuantity, f.quantityUnit,' +
' f.isRequired, f.orderNumber' +
' from Fees f' +
' left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId' +
' left join LotTypes l on f.lotTypeId = l.lotTypeId' +
sqlWhereClause +
' order by f.orderNumber, f.feeName')
.prepare(`select f.feeId, f.feeName, f.feeDescription,
f.occupancyTypeId, o.occupancyType,
f.lotTypeId, l.lotType,
ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction,
f.taxAmount, f.taxPercentage,
f.includeQuantity, f.quantityUnit,
f.isRequired, f.orderNumber,
ifnull(lo.lotOccupancyFeeCount, 0) as lotOccupancyFeeCount
from Fees f
left join (
select feeId, count(lotOccupancyId) as lotOccupancyFeeCount
from LotOccupancyFees
where recordDelete_timeMillis is null
group by feeId
) lo on f.feeId = lo.feeId
left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId
left join LotTypes l on f.lotTypeId = l.lotTypeId
${sqlWhereClause}
order by f.orderNumber, f.feeName`)
.all(sqlParameters);
if (updateOrderNumbers) {
let expectedOrderNumber = 0;

33
helpers/lotOccupancyDB/getFees.ts
View File

@ -44,20 +44,27 @@ export function getFees(
sqlParameters.push(additionalFilters.lotTypeId)
}
const fees = database
const fees: recordTypes.Fee[] = database
.prepare(
'select f.feeId, f.feeName, f.feeDescription,' +
' f.occupancyTypeId, o.occupancyType,' +
' f.lotTypeId, l.lotType,' +
' ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction,' +
' f.taxAmount, f.taxPercentage,' +
' f.includeQuantity, f.quantityUnit,' +
' f.isRequired, f.orderNumber' +
' from Fees f' +
' left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId' +
' left join LotTypes l on f.lotTypeId = l.lotTypeId' +
sqlWhereClause +
' order by f.orderNumber, f.feeName'
`select f.feeId, f.feeName, f.feeDescription,
f.occupancyTypeId, o.occupancyType,
f.lotTypeId, l.lotType,
ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction,
f.taxAmount, f.taxPercentage,
f.includeQuantity, f.quantityUnit,
f.isRequired, f.orderNumber,
ifnull(lo.lotOccupancyFeeCount, 0) as lotOccupancyFeeCount
from Fees f
left join (
select feeId, count(lotOccupancyId) as lotOccupancyFeeCount
from LotOccupancyFees
where recordDelete_timeMillis is null
group by feeId
) lo on f.feeId = lo.feeId
left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId
left join LotTypes l on f.lotTypeId = l.lotTypeId
${sqlWhereClause}
order by f.orderNumber, f.feeName`
)
.all(sqlParameters)

1
types/recordTypes.d.ts vendored
View File

@ -128,6 +128,7 @@ export interface Fee extends Record {
taxPercentage?: number;
isRequired?: boolean;
orderNumber?: number;
lotOccupancyFeeCount?: number;
}
export interface LotOccupancyFee extends Fee, Record {
lotOccupancyId?: number;

2
types/recordTypes.ts
View File

@ -171,6 +171,8 @@ export interface Fee extends Record {
isRequired?: boolean
orderNumber?: number
lotOccupancyFeeCount?: number
}
export interface LotOccupancyFee extends Fee, Record {