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

add missing deleted check

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-19 14:31:58 -05:00
parent 285704daab
commit fcdd8f950e
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
import type * as recordTypes from '../../types/recordTypes'; import type * as recordTypes from '../../types/recordTypes';
export declare function getMap(mapId: number | string): Promise<recordTypes.Map>; export declare function getMap(mapId: number | string): Promise<recordTypes.Map | undefined>;
export default getMap; export default getMap;

13
helpers/lotOccupancyDB/getMap.js
View File

@ -13,13 +13,14 @@ export async function getMap(mapId) {
from Maps m from Maps m
left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null
where m.mapId = ? where m.mapId = ?
and m.recordDelete_timeMillis is null
group by m.mapId, m.mapName, m.mapDescription, group by m.mapId, m.mapName, m.mapDescription,
m.mapLatitude, m.mapLongitude, m.mapSVG, m.mapLatitude, m.mapLongitude, m.mapSVG,
m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode,
m.mapPhoneNumber, m.mapPhoneNumber,
m.recordCreate_userName, m.recordCreate_timeMillis, m.recordCreate_userName, m.recordCreate_timeMillis,
m.recordUpdate_userName, m.recordUpdate_timeMillis, m.recordUpdate_userName, m.recordUpdate_timeMillis,
m.recordDelete_userName, m.recordDelete_timeMillis`) m.recordDelete_userName, m.recordDelete_timeMillis`)
.get(mapId); .get(mapId);
database.release(); database.release();
return map; return map;

17
helpers/lotOccupancyDB/getMap.ts
View File

@ -2,7 +2,9 @@ import { acquireConnection } from './pool.js'
import type * as recordTypes from '../../types/recordTypes' import type * as recordTypes from '../../types/recordTypes'
export async function getMap(mapId: number | string): Promise<recordTypes.Map> { export async function getMap(
mapId: number | string
): Promise<recordTypes.Map | undefined> {
const database = await acquireConnection() const database = await acquireConnection()
const map: recordTypes.Map = database const map: recordTypes.Map = database
@ -18,13 +20,14 @@ export async function getMap(mapId: number | string): Promise<recordTypes.Map> {
from Maps m from Maps m
left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null
where m.mapId = ? where m.mapId = ?
and m.recordDelete_timeMillis is null
group by m.mapId, m.mapName, m.mapDescription, group by m.mapId, m.mapName, m.mapDescription,
m.mapLatitude, m.mapLongitude, m.mapSVG, m.mapLatitude, m.mapLongitude, m.mapSVG,
m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode,
m.mapPhoneNumber, m.mapPhoneNumber,
m.recordCreate_userName, m.recordCreate_timeMillis, m.recordCreate_userName, m.recordCreate_timeMillis,
m.recordUpdate_userName, m.recordUpdate_timeMillis, m.recordUpdate_userName, m.recordUpdate_timeMillis,
m.recordDelete_userName, m.recordDelete_timeMillis` m.recordDelete_userName, m.recordDelete_timeMillis`
) )
.get(mapId) .get(mapId)