From ce91516b2374aec6890de74286e2ae557ec97762 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Mon, 11 Apr 2022 15:43:10 -0400 Subject: [PATCH] Bugfix --- server/src/resolvers/Query/wifiUsers.js | 4 +--- server/src/resolvers/WifiDevice.js | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/src/resolvers/Query/wifiUsers.js b/server/src/resolvers/Query/wifiUsers.js index 4b02287..56db13a 100644 --- a/server/src/resolvers/Query/wifiUsers.js +++ b/server/src/resolvers/Query/wifiUsers.js @@ -35,9 +35,7 @@ export async function wifiUsers(parent, { take = 100, skip = 0, search }) { ] }, include: { - wifiDevices: { - include: { accessPoint: true } - } + wifiDevices: true }, orderBy: [ { wifiDevices: { _count: 'desc' } }, diff --git a/server/src/resolvers/WifiDevice.js b/server/src/resolvers/WifiDevice.js index 8d25ace..52a20ab 100644 --- a/server/src/resolvers/WifiDevice.js +++ b/server/src/resolvers/WifiDevice.js @@ -17,7 +17,21 @@ const WifiDevice = { accessPoint: async parent => { - return prisma.accessPoint.findUnique({ where: { id: parent.accessPointId } }) + try { + const ap = await prisma.accessPoint.findUnique({ where: { hostname: parent.apName } }) + if (ap) + return ap + else + return null + } + catch (e) { + logError({ + tags: ['wifiDevice', 'accessPoint'], + message: `Could not find access point ${parent.apName}`, + data: parent + }) + } + } }