Refactor exception usage

This commit is contained in:
Jonas Lochmann
2020-09-28 02:00:00 +02:00
parent d68b425e0e
commit 8d65c5d777
148 changed files with 2061 additions and 769 deletions
+12 -12
View File
@@ -85,7 +85,7 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
throw new BadRequest()
}
await database.transaction(async (transaction) => {
const serverStatus = await database.transaction(async (transaction) => {
const deviceEntryUnsafe = await database.device.findOne({
where: {
deviceAuthToken: body.deviceAuthToken
@@ -112,23 +112,23 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
})
}
const serverStatus = await generateServerDataStatus({
return generateServerDataStatus({
database,
familyId,
clientStatus: body.status,
transaction
})
if (serverStatus.devices) { eventHandler.countEvent('pullStatusRequest devices') }
if (serverStatus.apps) { eventHandler.countEvent('pullStatusRequest apps') }
if (serverStatus.categoryBase) { eventHandler.countEvent('pullStatusRequest categoryBase') }
if (serverStatus.categoryApp) { eventHandler.countEvent('pullStatusRequest categoryApp') }
if (serverStatus.usedTimes) { eventHandler.countEvent('pullStatusRequest usedTimes') }
if (serverStatus.rules) { eventHandler.countEvent('pullStatusRequest rules') }
if (serverStatus.users) { eventHandler.countEvent('pullStatusRequest users') }
res.json(serverStatus)
})
if (serverStatus.devices) { eventHandler.countEvent('pullStatusRequest devices') }
if (serverStatus.apps) { eventHandler.countEvent('pullStatusRequest apps') }
if (serverStatus.categoryBase) { eventHandler.countEvent('pullStatusRequest categoryBase') }
if (serverStatus.categoryApp) { eventHandler.countEvent('pullStatusRequest categoryApp') }
if (serverStatus.usedTimes) { eventHandler.countEvent('pullStatusRequest usedTimes') }
if (serverStatus.rules) { eventHandler.countEvent('pullStatusRequest rules') }
if (serverStatus.users) { eventHandler.countEvent('pullStatusRequest users') }
res.json(serverStatus)
} catch (ex) {
next(ex)
}