Rename parent var

server/src/resolvers/Group.js

@@ -1,5 +1,5 @@
 const Group = {
-  members: (_, args, { ad }) => ad.getUsersForGroup(_.cn)
+  members: (parent, args, { ad }) => ad.getUsersForGroup(parent.cn)
 }
 
 export { Group }

server/src/resolvers/Log.js

@@ -1,6 +1,7 @@
 const Log = {
-  data: _ => JSON.stringify(_.data),
+  data: parent => JSON.stringify(parent.data),
-  timestamp: _ => _.timestamp?.toISOString()
+
+  timestamp: parent => parent.timestamp?.toISOString()
 }
 
 export { Log }

server/src/resolvers/ResetToken.js

@@ -1,14 +1,17 @@
 import prisma from '../prisma'
 
 const ResetToken = {
-  creator(_) {
+  creator(parent) {
-    return prisma.resetToken.findUnique({ where: { id: _.id } }).creator()
+    return prisma.resetToken.findUnique({ where: { id: parent.id } }).creator()
   },
-  user(_) {
+
-    return prisma.resetToken.findUnique({ where: { id: _.id } }).user()
+  user(parent) {
+    return prisma.resetToken.findUnique({ where: { id: parent.id } }).user()
   },
-  expiration: _ => _.expiration.toISOString(),
+
-  createdAt: _ => _.createdAt.toISOString()
+  expiration: parent => parent.expiration.toISOString(),
+
+  createdAt: parent => parent.createdAt.toISOString()
 }
 
 export { ResetToken }

server/src/resolvers/User.js

@@ -1,39 +1,49 @@
 import prisma from '../prisma'
 
 const User = {
-  firstName: _ => _.displayName.split(' ')[0],
+  firstName: parent => parent.displayName.split(' ')[0],
-  displayName: _ => (_.displayName ? _.displayName.capitalize() : ''),
 
-  groups: async (_, args, { ad }) =>
+  displayName: parent =>
-    _.groups ? _.groups : ad.getGroupMembershipForUser(_.sAMAccountName),
+    parent.displayName ? parent.displayName.capitalize() : '',
 
-  lastLogin: _ => _.lastLogin.toISOString(),
+  groups: async (parent, args, { ad }) =>
-  lastLoginPrior: _ => _.lastLoginPrior.toISOString(),
+    parent.groups
-  pwdLastSet: _ => _.pwdLastSet.toISOString(),
+      ? parent.groups
+      : ad.getGroupMembershipForUser(parent.sAMAccountName),
 
-  sharedFolders: _ =>
+  lastLogin: parent => parent.lastLogin.toISOString(),
-    _.groups
+
-      ? _.groups
+  lastLoginPrior: parent => parent.lastLoginPrior.toISOString(),
+
+  pwdLastSet: parent => parent.pwdLastSet.toISOString(),
+
+  sharedFolders: parent =>
+    parent.groups
+      ? parent.groups
           .filter(group => group.cn.includes('-Share-'))
           .map(group => group.cn.split('-')[2])
       : [],
 
-  sharedPrinters: _ =>
+  sharedPrinters: parent =>
-    _.groups
+    parent.groups
-      ? _.groups
+      ? parent.groups
           .filter(group => group.cn.includes('-Printer-'))
           .map(group => group.cn.split('-')[2])
       : [],
 
-  isSuperAdmin: _ => _.roles.includes('superAdmin'),
+  isSuperAdmin: parent => parent.roles.includes('superAdmin'),
-  isTokenCreator: _ => _.roles.includes('tokenCreator'),
-  isServant: _ => _.roles.includes('servant'),
-  isStudent: _ => _.roles.includes('student'),
-  isWatcher: _ => _.roles.includes('watcher'),
 
-  wifiDevices: (_, data, { auth }) => {
+  isTokenCreator: parent => parent.roles.includes('tokenCreator'),
+
+  isServant: parent => parent.roles.includes('servant'),
+
+  isStudent: parent => parent.roles.includes('student'),
+
+  isWatcher: parent => parent.roles.includes('watcher'),
+
+  wifiDevices: (parent, data, { auth }) => {
     if (
-      _.sAMAccountName !== auth.sAMAccountName &&
+      parent.sAMAccountName !== auth.sAMAccountName &&
       !auth.roles.includes('superAdmin')
     )
       return []
@@ -41,7 +51,7 @@ const User = {
     return prisma.user
       .findUnique({
         where: {
-          sAMAccountName: _.sAMAccountName
+          sAMAccountName: parent.sAMAccountName
         }
       })
       .wifiDevices()

server/src/resolvers/UserPresence.js

@@ -1,6 +1,8 @@
 const UserPresence = {
-  displayName: _ => (_.displayName ? _.displayName.capitalize() : ''),
+  displayName: parent =>
-  lastSeen: _ => _.lastSeen?.toISOString()
+    parent.displayName ? parent.displayName.capitalize() : '',
+
+  lastSeen: parent => parent.lastSeen?.toISOString()
 }
 
 export { UserPresence }

server/src/resolvers/WifiDevice.js

@@ -1,6 +1,7 @@
 const WifiDevice = {
-  lastSeen: _ => _.lastSeen?.toISOString(),
+  lastSeen: parent => parent.lastSeen?.toISOString(),
-  firstSeen: _ => _.firstSeen?.toISOString()
+
+  firstSeen: parent => parent.firstSeen?.toISOString()
 }
 
 export { WifiDevice }