From b5b3c7e301661dd9fd73969fb24513feba81b94b Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Sat, 14 Nov 2020 10:10:40 -0400 Subject: [PATCH] Remove unnecessary Promisse.All() --- server/src/utils/wifiUtils.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/server/src/utils/wifiUtils.js b/server/src/utils/wifiUtils.js index bb58b11..2e6560d 100644 --- a/server/src/utils/wifiUtils.js +++ b/server/src/utils/wifiUtils.js @@ -8,12 +8,14 @@ async function getOnlineWifiDevices() { const accessPointsPromise = controller.getAccessDevices('default') const onlineDevicesPromise = controller.getClientDevices('default') + controller.logout() + const [accessPoints, onlineDevices] = await Promise.all([ accessPointsPromise, onlineDevicesPromise ]) - const onlineDevicesWithUser = onlineDevices[0].map(async client => ({ + const onlineDevicesWithUser = onlineDevices[0].map(client => ({ user: client['1x_identity'] || null, oui: client.oui, mac: client.mac, @@ -27,9 +29,7 @@ async function getOnlineWifiDevices() { status: 'ONLINE' })) - controller.logout() - - return Promise.all(onlineDevicesWithUser) + return onlineDevicesWithUser } catch (e) { throw new Error('Erro ao listar dispositivos. ' + e) } @@ -52,15 +52,11 @@ async function updateDBWithOnlineDevices() { : undefined } - try { - await prisma.wifiDevice.upsert({ - where: { mac: onlineDevice.mac }, - create: device, - update: device - }) - } catch (e) { - console.log(e) - } + await prisma.wifiDevice.upsert({ + where: { mac: onlineDevice.mac }, + create: device, + update: device + }) } // TODO: pubsub