From 12876b53853765148b896b7322c661543f7278bd Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Mon, 21 Dec 2020 11:48:36 -0400 Subject: [PATCH] Fix refactor import error --- .../migration.sql | 4 ++-- server/src/resolvers/Query/basicUser.js | 2 ++ server/src/resolvers/User.js | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) rename server/prisma/migrations/{20201221144454_init => 20201221153520_init}/migration.sql (96%) diff --git a/server/prisma/migrations/20201221144454_init/migration.sql b/server/prisma/migrations/20201221153520_init/migration.sql similarity index 96% rename from server/prisma/migrations/20201221144454_init/migration.sql rename to server/prisma/migrations/20201221153520_init/migration.sql index a62cb62..139d4ca 100644 --- a/server/prisma/migrations/20201221144454_init/migration.sql +++ b/server/prisma/migrations/20201221153520_init/migration.sql @@ -21,8 +21,8 @@ CREATE TABLE "ResetToken" ( -- CreateTable CREATE TABLE "User" ( "id" SERIAL, - "lastLogin" TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP, - "lastLoginPrior" TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP, + "lastLogin" TIMESTAMP(3), + "lastLoginPrior" TIMESTAMP(3), "roles" JSONB, "groups" JSONB, "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/server/src/resolvers/Query/basicUser.js b/server/src/resolvers/Query/basicUser.js index e19ae3a..a4d0c5d 100644 --- a/server/src/resolvers/Query/basicUser.js +++ b/server/src/resolvers/Query/basicUser.js @@ -1,3 +1,5 @@ +import { User } from '../../classes/User' + export async function basicUser(parent, { sAMAccountName }) { if (sAMAccountName === '') throw new Error('Argumento inválido') diff --git a/server/src/resolvers/User.js b/server/src/resolvers/User.js index 1794271..2125135 100755 --- a/server/src/resolvers/User.js +++ b/server/src/resolvers/User.js @@ -11,9 +11,9 @@ const User = { ? parent.groups : ad.getGroupMembershipForUser(parent.sAMAccountName), - lastLogin: parent => parent.lastLogin.toISOString(), + lastLogin: parent => parent.lastLogin?.toISOString(), - lastLoginPrior: parent => parent.lastLoginPrior.toISOString(), + lastLoginPrior: parent => parent.lastLoginPrior?.toISOString(), pwdLastSet: parent => parent.pwdLastSet.toISOString(),