From f470be38cba3325fb22ccc7b2dc87685ddcb0181 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Tue, 10 Nov 2020 16:59:48 -0400 Subject: [PATCH] Fixed wifiDevices query --- server/src/resolvers/Query.js | 5 +++-- server/src/resolvers/WifiDevice.js | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js index e238b7c..4014fb8 100755 --- a/server/src/resolvers/Query.js +++ b/server/src/resolvers/Query.js @@ -98,9 +98,10 @@ const Query = { // console.log('PubSub') //TODO: PubSub // }) - return prisma.wifiDevices({ + return prisma.wifiDevice.findMany({ orderBy: [{ lastSeen: 'desc' }], - where: identifiedOnly ? { NOT: { user: null } } : {} + where: identifiedOnly ? { NOT: { userId: null } } : {}, + include: { user: true } }) }, diff --git a/server/src/resolvers/WifiDevice.js b/server/src/resolvers/WifiDevice.js index d83be50..cab28ab 100644 --- a/server/src/resolvers/WifiDevice.js +++ b/server/src/resolvers/WifiDevice.js @@ -1,7 +1,6 @@ import prisma from '../prisma' const WifiDevice = { - user: _ => prisma.wifiDevice.findOne({ where: { id: _.id } }).User(), lastSeen: _ => _.lastSeen.toISOString(), firstSeen: _ => _.firstSeen.toISOString() }