From 18880905df72f117c59843f59ffd666746018ccb Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Fri, 13 Nov 2020 10:51:42 -0400
Subject: [PATCH] Token stats fix

---
 server/src/resolvers/Query.js                   | 8 ++++++--
 server/src/resolvers/ResetToken.js              | 4 +++-
 web/src/components/widgets/TokenStatsWidget.vue | 2 +-
 web/src/plugins/date.js                         | 2 +-
 web/src/views/PrintToken.vue                    | 6 +++---
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js
index aad8672..07ec281 100755
--- a/server/src/resolvers/Query.js
+++ b/server/src/resolvers/Query.js
@@ -84,9 +84,13 @@ const Query = {
       tokenCountUsed: prisma.resetToken.count({
         where: { NOT: { usedAt: null } }
       }),
-      tokenCountExpired: 0,
+      tokenCountExpired: prisma.resetToken.count({
+        where: {
+          AND: [{ expiration: { lt: new Date() } }, { usedAt: null }]
+        }
+      }),
       tokenCountNotUsed: prisma.resetToken.count({
-        where: { usedAt: null }
+        where: { usedAt: null, expiration: { gt: new Date() } }
       })
     }
   },
diff --git a/server/src/resolvers/ResetToken.js b/server/src/resolvers/ResetToken.js
index 0cea803..3bce67a 100755
--- a/server/src/resolvers/ResetToken.js
+++ b/server/src/resolvers/ResetToken.js
@@ -6,7 +6,9 @@ const ResetToken = {
   },
   user(_) {
     return prisma.resetToken.findOne({ where: { id: _.id } }).user()
-  }
+  },
+  expiration: _ => _.expiration.toISOString(),
+  createdAt: _ => _.createdAt.toISOString()
 }
 
 export { ResetToken }
diff --git a/web/src/components/widgets/TokenStatsWidget.vue b/web/src/components/widgets/TokenStatsWidget.vue
index f8152f2..47f7665 100755
--- a/web/src/components/widgets/TokenStatsWidget.vue
+++ b/web/src/components/widgets/TokenStatsWidget.vue
@@ -46,7 +46,7 @@
           <v-icon>mdi-clock-outline</v-icon>
         </v-list-item-avatar>
         <v-list-item-content>
-          <v-list-item-title> Tokens ainda não usados </v-list-item-title>
+          <v-list-item-title> Tokens aguardando uso </v-list-item-title>
           <v-list-item-subtitle>
             {{ stats.tokenCountNotUsed }}
           </v-list-item-subtitle>
diff --git a/web/src/plugins/date.js b/web/src/plugins/date.js
index 567dfe7..8eb9a46 100644
--- a/web/src/plugins/date.js
+++ b/web/src/plugins/date.js
@@ -12,4 +12,4 @@ Vue.filter('from', val =>
   formatDistance(new Date(val), Date.now(), { locale, addSuffix: true })
 )
 
-Vue.filter('time', val => format(new Date(val), 'HH:MM', { locale }))
\ No newline at end of file
+Vue.filter('time', val => format(new Date(val), 'HH:MM', { locale }))
diff --git a/web/src/views/PrintToken.vue b/web/src/views/PrintToken.vue
index 1f416ee..da1b4bb 100755
--- a/web/src/views/PrintToken.vue
+++ b/web/src/views/PrintToken.vue
@@ -31,7 +31,7 @@
               </v-card>
               <div class="text-center font-weight-light mt-5">
                 Válido até
-                {{ tokenInfo.expiration | dateAndtime }}
+                {{ tokenInfo.expiration | dateAndTime }}
               </div>
             </v-col>
           </v-row>
@@ -48,7 +48,7 @@
                 <v-list dense class="font-weight-light text-justify">
                   <v-list-item>
                     <v-list-item-avatar>
-                      <v-icon>mdi-account-card-details</v-icon>
+                      <v-icon>mdi-card-account-details</v-icon>
                     </v-list-item-avatar>
                     <v-list-item-content>
                       Após cadastrar sua nova senha, utilize seu CPF como login.
@@ -57,7 +57,7 @@
 
                   <v-list-item>
                     <v-list-item-avatar>
-                      <v-icon>mdi-textbox-password</v-icon>
+                      <v-icon>mdi-form-textbox-password</v-icon>
                     </v-list-item-avatar>
                     <v-list-item-content>
                       A senha é de responsabilidade do usuário e não deve ser