From 3eb905ff6be12d3d1b3ec38e8089dba784804e29 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Mon, 9 Nov 2020 09:38:24 -0400 Subject: [PATCH] Refactor prisma imports --- server/src/classes/ResetToken.js | 3 +-- server/src/classes/User.js | 3 +-- server/src/prisma.js | 4 ++++ server/src/resolvers/Query.js | 5 +---- server/src/resolvers/ResetToken.js | 3 +-- server/src/resolvers/User.js | 3 +-- server/src/resolvers/WifiDevice.js | 5 ++--- server/src/utils/wifiUtils.js | 5 ++--- 8 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 server/src/prisma.js diff --git a/server/src/classes/ResetToken.js b/server/src/classes/ResetToken.js index c3ba8b7..c6624e2 100755 --- a/server/src/classes/ResetToken.js +++ b/server/src/classes/ResetToken.js @@ -1,5 +1,4 @@ -import { PrismaClient } from '@prisma/client' -const prisma = new PrismaClient() +import prisma from '../prisma' import uuid from 'uuid/v4' import { User } from './User' diff --git a/server/src/classes/User.js b/server/src/classes/User.js index 46adb37..2e12849 100755 --- a/server/src/classes/User.js +++ b/server/src/classes/User.js @@ -1,6 +1,5 @@ import { ad } from '../utils/activedirectory' -import { PrismaClient } from '@prisma/client' -const prisma = new PrismaClient() +import prisma from '../prisma' import { Change, createClient } from 'ldapjs' import { encodePassword } from '../utils/activedirectory/encodePassword' diff --git a/server/src/prisma.js b/server/src/prisma.js new file mode 100644 index 0000000..8210abe --- /dev/null +++ b/server/src/prisma.js @@ -0,0 +1,4 @@ +import { PrismaClient } from '@prisma/client' +const prisma = new PrismaClient() + +export default prisma diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js index 39ff032..eea622d 100755 --- a/server/src/resolvers/Query.js +++ b/server/src/resolvers/Query.js @@ -1,10 +1,7 @@ import { updateDBWithOnlineDevices } from '../utils/wifiUtils' import { User } from '../classes/User' import { gql } from 'apollo-server' - -import { PrismaClient } from '@prisma/client' - -const prisma = new PrismaClient() +import prisma from '../prisma' const parseSAMAccountName = sAMAccountName => sAMAccountName ? sAMAccountName.replace('.', ' ') : '' diff --git a/server/src/resolvers/ResetToken.js b/server/src/resolvers/ResetToken.js index ef956b3..0cea803 100755 --- a/server/src/resolvers/ResetToken.js +++ b/server/src/resolvers/ResetToken.js @@ -1,5 +1,4 @@ -import { PrismaClient } from '@prisma/client' -const prisma = new PrismaClient() +import prisma from '../prisma' const ResetToken = { creator(_) { diff --git a/server/src/resolvers/User.js b/server/src/resolvers/User.js index 0d9bd52..5ec6c40 100755 --- a/server/src/resolvers/User.js +++ b/server/src/resolvers/User.js @@ -1,5 +1,4 @@ -import { PrismaClient } from '@prisma/client' -const prisma = new PrismaClient() +import prisma from '../prisma' const User = { firstName: _ => _.displayName.split(' ')[0], diff --git a/server/src/resolvers/WifiDevice.js b/server/src/resolvers/WifiDevice.js index 4b245e4..e7f3d19 100644 --- a/server/src/resolvers/WifiDevice.js +++ b/server/src/resolvers/WifiDevice.js @@ -1,7 +1,6 @@ -import { PrismaClient } from '@prisma/client' -const prisma = new PrismaClient() +import prisma from '../prisma' -const WifiDevice = { +const WifiDevice = { user: _ => prisma.wifiDevice.findOne({ where: { id: _.id } }).User() } diff --git a/server/src/utils/wifiUtils.js b/server/src/utils/wifiUtils.js index d5037ef..d178a57 100644 --- a/server/src/utils/wifiUtils.js +++ b/server/src/utils/wifiUtils.js @@ -1,6 +1,5 @@ import { controller } from './unifiController' -import { PrismaClient } from '@prisma/client' -const prisma = new PrismaClient() +import prisma from '../prisma' const getOnlineWifiDevices = async () => { try { @@ -44,7 +43,7 @@ const updateDBWithOnlineDevices = async () => { status: 'OFFLINE' } }) - + onlineDevices.forEach(async device => { const newDevice = { ...device,