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

use template literals

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-05 15:01:58 -05:00
parent d9a2d34296
commit 1710f5ca1e
2 changed files with 161 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
helpers/lotOccupancyDB/getReportData.js
View File

@ -31,26 +31,17 @@ export function getReportData(reportName, reportParameters) {
break; break;
} }
case "maps-formatted": { case "maps-formatted": {
sql = sql = `select mapName as ${mapNameAlias},
"select mapName as " + mapDescription as ${mapDescriptionAlias},
mapNameAlias + mapAddress1 as ${mapAddress1Alias},
"," + mapAddress2 as ${mapAddress2Alias},
(" mapDescription as " + mapDescriptionAlias) + mapCity as ${mapCityAlias},
"," + mapProvince as ${mapProvinceAlias},
(" mapAddress1 as " + mapAddress1Alias) + mapPostalCode as ${mapPostalCodeAlias},
"," + mapPhoneNumber as ${mapPhoneNumberAlias}
(" mapAddress2 as " + mapAddress2Alias) + from Maps
"," + where recordDelete_timeMillis is null
(" mapCity as " + mapCityAlias) + order by mapName`;
"," +
(" mapProvince as " + mapProvinceAlias) +
"," +
(" mapPostalCode as " + mapPostalCodeAlias) +
"," +
(" mapPhoneNumber as " + mapPhoneNumberAlias) +
" from Maps" +
" where recordDelete_timeMillis is null" +
" order by mapName";
break; break;
} }
case "lots-all": { case "lots-all": {
@ -58,65 +49,47 @@ export function getReportData(reportName, reportParameters) {
break; break;
} }
case "lots-byLotTypeId": { case "lots-byLotTypeId": {
sql = sql = `select l.lotId as ${lotIdAlias},
"select l.lotId as " + m.mapName as ${mapNameAlias},
lotIdAlias + l.lotName as ${lotNameAlias},
"," + t.lotType as ${lotTypeAlias},
(" m.mapName as " + mapNameAlias) + s.lotStatus as ${lotStatusAlias}
"," + from Lots l
(" l.lotName as " + lotNameAlias) + left join LotTypes t on l.lotTypeId = t.lotTypeId
"," + left join LotStatuses s on l.lotStatusId = s.lotStatusId
(" t.lotType as " + lotTypeAlias) + left join Maps m on l.mapId = m.mapId
"," + where l.recordDelete_timeMillis is null
(" s.lotStatus as " + lotStatusAlias) + and l.lotTypeId = ?`;
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
" where l.recordDelete_timeMillis is null" +
" and l.lotTypeId = ?";
sqlParameters.push(reportParameters.lotTypeId); sqlParameters.push(reportParameters.lotTypeId);
break; break;
} }
case "lots-byLotStatusId": { case "lots-byLotStatusId": {
sql = sql = `select l.lotId as ${lotIdAlias},
"select l.lotId as " + m.mapName as ${mapNameAlias},
lotIdAlias + l.lotName as ${lotNameAlias},
"," + t.lotType as ${lotTypeAlias},
(" m.mapName as " + mapNameAlias) + s.lotStatus as ${lotStatusAlias}
"," + from Lots l
(" l.lotName as " + lotNameAlias) + left join LotTypes t on l.lotTypeId = t.lotTypeId
"," + left join LotStatuses s on l.lotStatusId = s.lotStatusId
(" t.lotType as " + lotTypeAlias) + left join Maps m on l.mapId = m.mapId
"," + where l.recordDelete_timeMillis is null
(" s.lotStatus as " + lotStatusAlias) + and l.lotStatusId = ?`;
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
" where l.recordDelete_timeMillis is null" +
" and l.lotStatusId = ?";
sqlParameters.push(reportParameters.lotStatusId); sqlParameters.push(reportParameters.lotStatusId);
break; break;
} }
case "lots-byMapId": { case "lots-byMapId": {
sql = sql = `select l.lotId as ${lotIdAlias},
"select l.lotId as " + m.mapName as ${mapNameAlias},
lotIdAlias + l.lotName as ${lotNameAlias},
"," + t.lotType as ${lotTypeAlias},
(" m.mapName as " + mapNameAlias) + s.lotStatus as ${lotStatusAlias}
"," + from Lots l
(" l.lotName as " + lotNameAlias) + left join LotTypes t on l.lotTypeId = t.lotTypeId
"," + left join LotStatuses s on l.lotStatusId = s.lotStatusId
(" t.lotType as " + lotTypeAlias) + left join Maps m on l.mapId = m.mapId
"," + where l.recordDelete_timeMillis is null
(" s.lotStatus as " + lotStatusAlias) + and l.mapId = ?`;
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
" where l.recordDelete_timeMillis is null" +
" and l.mapId = ?";
sqlParameters.push(reportParameters.mapId); sqlParameters.push(reportParameters.mapId);
break; break;
} }
@ -133,26 +106,19 @@ export function getReportData(reportName, reportParameters) {
break; break;
} }
case "lotOccupancies-current-byMapId": { case "lotOccupancies-current-byMapId": {
sql = sql = `select o.lotOccupancyId as ${lotOccupancyIdAlias},
"select o.lotOccupancyId as " + l.lotName as ${lotNameAlias},
lotOccupancyIdAlias + m.mapName as ${mapNameAlias},
"," + ot.occupancyType as ${occupancyTypeAlias},
(" l.lotName as " + lotNameAlias) + o.occupancyStartDate as ${occupancyStartDateAlias},
"," + o.occupancyEndDate as ${occupancyEndDateAlias}
(" m.mapName as " + mapNameAlias) + from LotOccupancies o
"," + left join OccupancyTypes ot on o.occupancyTypeId = ot.occupancyTypeId
(" ot.occupancyType as " + occupancyTypeAlias) + left join Lots l on o.lotId = l.lotId
"," + left join Maps m on l.mapId = m.mapId
(" o.occupancyStartDate as " + occupancyStartDateAlias) + where o.recordDelete_timeMillis is null
"," + and (o.occupancyEndDate is null or o.occupancyEndDate >= ?)
(" o.occupancyEndDate as " + occupancyEndDateAlias) + and l.mapId = ?`;
" from LotOccupancies o" +
" left join OccupancyTypes ot on o.occupancyTypeId = ot.occupancyTypeId" +
" left join Lots l on o.lotId = l.lotId" +
" left join Maps m on l.mapId = m.mapId" +
" where o.recordDelete_timeMillis is null" +
" and (o.occupancyEndDate is null or o.occupancyEndDate >= ?)" +
" and l.mapId = ?";
sqlParameters.push(dateTimeFunctions.dateToInteger(new Date()), reportParameters.mapId); sqlParameters.push(dateTimeFunctions.dateToInteger(new Date()), reportParameters.mapId);
break; break;
} }
@ -177,14 +143,13 @@ export function getReportData(reportName, reportParameters) {
break; break;
} }
case "lotOccupancyTransactions-byTransactionDateString": { case "lotOccupancyTransactions-byTransactionDateString": {
sql = sql = `select t.lotOccupancyId, t.transactionIndex,
"select t.lotOccupancyId, t.transactionIndex," + t.transactionDate, t.transactionTime,
" t.transactionDate, t.transactionTime," + t.transactionAmount,
" t.transactionAmount, t.externalReceiptNumber," + t.externalReceiptNumber, t.transactionNote
" t.transactionNote" + from LotOccupancyTransactions t
" from LotOccupancyTransactions t" + where t.recordDelete_timeMillis is null
" where t.recordDelete_timeMillis is null" + and t.transactionDate = ?`;
" and t.transactionDate = ?";
sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString)); sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString));
break; break;
} }
@ -193,23 +158,22 @@ export function getReportData(reportName, reportParameters) {
break; break;
} }
case "workOrders-open": { case "workOrders-open": {
sql = sql = `select w.workOrderId, w.workOrderNumber,
"select w.workOrderId, w.workOrderNumber," + t.workOrderType, w.workOrderDescription,
" t.workOrderType, w.workOrderDescription," + w.workOrderOpenDate,
" w.workOrderOpenDate," + m.workOrderMilestoneCount, m.workOrderMilestoneCompletionCount
" m.workOrderMilestoneCount, m.workOrderMilestoneCompletionCount" + from WorkOrders w
" from WorkOrders w" + left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId
" left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId" + left join (
(" left join (" + select m.workOrderId,
"select m.workOrderId," + count(m.workOrderMilestoneId) as workOrderMilestoneCount,
" count(m.workOrderMilestoneId) as workOrderMilestoneCount," + sum(case when m.workOrderMilestoneCompletionDate is null then 0 else 1 end) as workOrderMilestoneCompletionCount
" sum(case when m.workOrderMilestoneCompletionDate is null then 0 else 1 end) as workOrderMilestoneCompletionCount" + from WorkOrderMilestones m
" from WorkOrderMilestones m" + where m.recordDelete_timeMillis is null
" where m.recordDelete_timeMillis is null" + group by m.workOrderId
" group by m.workOrderId" + ) m on w.workOrderId = m.workOrderId
") m on w.workOrderId = m.workOrderId") + where w.recordDelete_timeMillis is null
" where w.recordDelete_timeMillis is null" + and w.workOrderCloseDate is null`;
" and w.workOrderCloseDate is null";
break; break;
} }
case "workOrderComments-all": { case "workOrderComments-all": {

200
helpers/lotOccupancyDB/getReportData.ts
View File

@ -49,26 +49,17 @@ export function getReportData(
} }
case "maps-formatted": { case "maps-formatted": {
sql = sql = `select mapName as ${mapNameAlias},
"select mapName as " + mapDescription as ${mapDescriptionAlias},
mapNameAlias + mapAddress1 as ${mapAddress1Alias},
"," + mapAddress2 as ${mapAddress2Alias},
(" mapDescription as " + mapDescriptionAlias) + mapCity as ${mapCityAlias},
"," + mapProvince as ${mapProvinceAlias},
(" mapAddress1 as " + mapAddress1Alias) + mapPostalCode as ${mapPostalCodeAlias},
"," + mapPhoneNumber as ${mapPhoneNumberAlias}
(" mapAddress2 as " + mapAddress2Alias) + from Maps
"," + where recordDelete_timeMillis is null
(" mapCity as " + mapCityAlias) + order by mapName`;
"," +
(" mapProvince as " + mapProvinceAlias) +
"," +
(" mapPostalCode as " + mapPostalCodeAlias) +
"," +
(" mapPhoneNumber as " + mapPhoneNumberAlias) +
" from Maps" +
" where recordDelete_timeMillis is null" +
" order by mapName";
break; break;
} }
@ -79,23 +70,17 @@ export function getReportData(
} }
case "lots-byLotTypeId": { case "lots-byLotTypeId": {
sql = sql = `select l.lotId as ${lotIdAlias},
"select l.lotId as " + m.mapName as ${mapNameAlias},
lotIdAlias + l.lotName as ${lotNameAlias},
"," + t.lotType as ${lotTypeAlias},
(" m.mapName as " + mapNameAlias) + s.lotStatus as ${lotStatusAlias}
"," + from Lots l
(" l.lotName as " + lotNameAlias) + left join LotTypes t on l.lotTypeId = t.lotTypeId
"," + left join LotStatuses s on l.lotStatusId = s.lotStatusId
(" t.lotType as " + lotTypeAlias) + left join Maps m on l.mapId = m.mapId
"," + where l.recordDelete_timeMillis is null
(" s.lotStatus as " + lotStatusAlias) + and l.lotTypeId = ?`;
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
" where l.recordDelete_timeMillis is null" +
" and l.lotTypeId = ?";
sqlParameters.push(reportParameters.lotTypeId); sqlParameters.push(reportParameters.lotTypeId);
@ -103,23 +88,17 @@ export function getReportData(
} }
case "lots-byLotStatusId": { case "lots-byLotStatusId": {
sql = sql = `select l.lotId as ${lotIdAlias},
"select l.lotId as " + m.mapName as ${mapNameAlias},
lotIdAlias + l.lotName as ${lotNameAlias},
"," + t.lotType as ${lotTypeAlias},
(" m.mapName as " + mapNameAlias) + s.lotStatus as ${lotStatusAlias}
"," + from Lots l
(" l.lotName as " + lotNameAlias) + left join LotTypes t on l.lotTypeId = t.lotTypeId
"," + left join LotStatuses s on l.lotStatusId = s.lotStatusId
(" t.lotType as " + lotTypeAlias) + left join Maps m on l.mapId = m.mapId
"," + where l.recordDelete_timeMillis is null
(" s.lotStatus as " + lotStatusAlias) + and l.lotStatusId = ?`;
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
" where l.recordDelete_timeMillis is null" +
" and l.lotStatusId = ?";
sqlParameters.push(reportParameters.lotStatusId); sqlParameters.push(reportParameters.lotStatusId);
@ -127,23 +106,17 @@ export function getReportData(
} }
case "lots-byMapId": { case "lots-byMapId": {
sql = sql = `select l.lotId as ${lotIdAlias},
"select l.lotId as " + m.mapName as ${mapNameAlias},
lotIdAlias + l.lotName as ${lotNameAlias},
"," + t.lotType as ${lotTypeAlias},
(" m.mapName as " + mapNameAlias) + s.lotStatus as ${lotStatusAlias}
"," + from Lots l
(" l.lotName as " + lotNameAlias) + left join LotTypes t on l.lotTypeId = t.lotTypeId
"," + left join LotStatuses s on l.lotStatusId = s.lotStatusId
(" t.lotType as " + lotTypeAlias) + left join Maps m on l.mapId = m.mapId
"," + where l.recordDelete_timeMillis is null
(" s.lotStatus as " + lotStatusAlias) + and l.mapId = ?`;
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
" where l.recordDelete_timeMillis is null" +
" and l.mapId = ?";
sqlParameters.push(reportParameters.mapId); sqlParameters.push(reportParameters.mapId);
@ -166,26 +139,19 @@ export function getReportData(
} }
case "lotOccupancies-current-byMapId": { case "lotOccupancies-current-byMapId": {
sql = sql = `select o.lotOccupancyId as ${lotOccupancyIdAlias},
"select o.lotOccupancyId as " + l.lotName as ${lotNameAlias},
lotOccupancyIdAlias + m.mapName as ${mapNameAlias},
"," + ot.occupancyType as ${occupancyTypeAlias},
(" l.lotName as " + lotNameAlias) + o.occupancyStartDate as ${occupancyStartDateAlias},
"," + o.occupancyEndDate as ${occupancyEndDateAlias}
(" m.mapName as " + mapNameAlias) + from LotOccupancies o
"," + left join OccupancyTypes ot on o.occupancyTypeId = ot.occupancyTypeId
(" ot.occupancyType as " + occupancyTypeAlias) + left join Lots l on o.lotId = l.lotId
"," + left join Maps m on l.mapId = m.mapId
(" o.occupancyStartDate as " + occupancyStartDateAlias) + where o.recordDelete_timeMillis is null
"," + and (o.occupancyEndDate is null or o.occupancyEndDate >= ?)
(" o.occupancyEndDate as " + occupancyEndDateAlias) + and l.mapId = ?`;
" from LotOccupancies o" +
" left join OccupancyTypes ot on o.occupancyTypeId = ot.occupancyTypeId" +
" left join Lots l on o.lotId = l.lotId" +
" left join Maps m on l.mapId = m.mapId" +
" where o.recordDelete_timeMillis is null" +
" and (o.occupancyEndDate is null or o.occupancyEndDate >= ?)" +
" and l.mapId = ?";
sqlParameters.push(dateTimeFunctions.dateToInteger(new Date()), reportParameters.mapId); sqlParameters.push(dateTimeFunctions.dateToInteger(new Date()), reportParameters.mapId);
@ -218,19 +184,16 @@ export function getReportData(
} }
case "lotOccupancyTransactions-byTransactionDateString": { case "lotOccupancyTransactions-byTransactionDateString": {
sql = sql = `select t.lotOccupancyId, t.transactionIndex,
"select t.lotOccupancyId, t.transactionIndex," + t.transactionDate, t.transactionTime,
" t.transactionDate, t.transactionTime," + t.transactionAmount,
" t.transactionAmount, t.externalReceiptNumber," + t.externalReceiptNumber, t.transactionNote
" t.transactionNote" + from LotOccupancyTransactions t
" from LotOccupancyTransactions t" + where t.recordDelete_timeMillis is null
" where t.recordDelete_timeMillis is null" + and t.transactionDate = ?`;
" and t.transactionDate = ?";
sqlParameters.push( sqlParameters.push(
dateTimeFunctions.dateStringToInteger( dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString as string)
reportParameters.transactionDateString as string
)
); );
break; break;
} }
@ -241,23 +204,22 @@ export function getReportData(
} }
case "workOrders-open": { case "workOrders-open": {
sql = sql = `select w.workOrderId, w.workOrderNumber,
"select w.workOrderId, w.workOrderNumber," + t.workOrderType, w.workOrderDescription,
" t.workOrderType, w.workOrderDescription," + w.workOrderOpenDate,
" w.workOrderOpenDate," + m.workOrderMilestoneCount, m.workOrderMilestoneCompletionCount
" m.workOrderMilestoneCount, m.workOrderMilestoneCompletionCount" + from WorkOrders w
" from WorkOrders w" + left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId
" left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId" + left join (
(" left join (" + select m.workOrderId,
"select m.workOrderId," + count(m.workOrderMilestoneId) as workOrderMilestoneCount,
" count(m.workOrderMilestoneId) as workOrderMilestoneCount," + sum(case when m.workOrderMilestoneCompletionDate is null then 0 else 1 end) as workOrderMilestoneCompletionCount
" sum(case when m.workOrderMilestoneCompletionDate is null then 0 else 1 end) as workOrderMilestoneCompletionCount" + from WorkOrderMilestones m
" from WorkOrderMilestones m" + where m.recordDelete_timeMillis is null
" where m.recordDelete_timeMillis is null" + group by m.workOrderId
" group by m.workOrderId" + ) m on w.workOrderId = m.workOrderId
") m on w.workOrderId = m.workOrderId") + where w.recordDelete_timeMillis is null
" where w.recordDelete_timeMillis is null" + and w.workOrderCloseDate is null`;
" and w.workOrderCloseDate is null";
break; break;
} }