From 0fa745b041ff4d512a2ec3d67a205cd29a82a00f Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Thu, 8 Dec 2022 12:17:47 -0400 Subject: [PATCH] Subnet stats ok --- server/src/lib/networkStats.js | 2 +- server/src/resolvers/Query/index.js | 2 ++ server/src/resolvers/Query/subnets.js | 5 +++++ server/src/resolvers/SubnetInfo.js | 13 +++++++++++++ server/src/resolvers/index.js | 2 ++ server/src/typeDefs.js | 2 +- 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 server/src/resolvers/Query/subnets.js create mode 100644 server/src/resolvers/SubnetInfo.js diff --git a/server/src/lib/networkStats.js b/server/src/lib/networkStats.js index b723186..1fcdd4c 100644 --- a/server/src/lib/networkStats.js +++ b/server/src/lib/networkStats.js @@ -36,7 +36,7 @@ async function generateStatsForNetwork(shortName) { sumUsage: dbStats._sum.usage || 0 } - prisma.networkStats.create({ + await prisma.networkStats.create({ data: { network: { connect: { diff --git a/server/src/resolvers/Query/index.js b/server/src/resolvers/Query/index.js index 2bb9ff4..b215439 100644 --- a/server/src/resolvers/Query/index.js +++ b/server/src/resolvers/Query/index.js @@ -11,6 +11,7 @@ import { userPresence } from './userPresence' import { users } from './users' import { wifiDevices } from './wifiDevices' import { wifiUsers } from './wifiUsers' +import { subnets } from './subnets' const Query = { accessPoints, @@ -21,6 +22,7 @@ const Query = { me, pAHosts, stats, + subnets, user, userPresence, users, diff --git a/server/src/resolvers/Query/subnets.js b/server/src/resolvers/Query/subnets.js new file mode 100644 index 0000000..8459343 --- /dev/null +++ b/server/src/resolvers/Query/subnets.js @@ -0,0 +1,5 @@ +import prisma from '../../prisma' + +export async function subnets() { + return prisma.network.findMany() +} diff --git a/server/src/resolvers/SubnetInfo.js b/server/src/resolvers/SubnetInfo.js new file mode 100644 index 0000000..b2cb4d8 --- /dev/null +++ b/server/src/resolvers/SubnetInfo.js @@ -0,0 +1,13 @@ +import prisma from '../prisma' + +export const SubnetInfo = { + stats: async (parent, args, context) => { + return prisma.networkStats.findMany({ + where: { + network: { + id: parent.id + } + } + }) + } +} diff --git a/server/src/resolvers/index.js b/server/src/resolvers/index.js index f984543..ed086ad 100755 --- a/server/src/resolvers/index.js +++ b/server/src/resolvers/index.js @@ -12,6 +12,7 @@ import { User } from './User' import { UserPresence } from './UserPresence' import { WifiDevice } from './WifiDevice' import { AccessPointStats } from './AccessPointStats' +import { SubnetInfo } from './SubnetInfo' const resolvers = { Mutation, @@ -24,6 +25,7 @@ const resolvers = { PAHost, ResetToken, Stats, + SubnetInfo, User, UserPresence, WifiDevice, diff --git a/server/src/typeDefs.js b/server/src/typeDefs.js index fea3132..c84faae 100644 --- a/server/src/typeDefs.js +++ b/server/src/typeDefs.js @@ -400,7 +400,7 @@ const typeDefs = gql` subnetMaskLength: String! numHosts: String! length: String! - stats: SubnetStats! + stats: [SubnetStats] } input LoginInput {