From 7f4fcb5318c59a4627e7d9d0085c890140723139 Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Thu, 31 Mar 2022 16:05:04 -0400
Subject: [PATCH] Include local on userPresence View

---
 server/src/resolvers/Query/userPresence.js | 10 ++++++++--
 server/src/typeDefs.js                     |  1 +
 web/src/views/UserPresence.vue             |  4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/server/src/resolvers/Query/userPresence.js b/server/src/resolvers/Query/userPresence.js
index 1ef75b4..ce99162 100644
--- a/server/src/resolvers/Query/userPresence.js
+++ b/server/src/resolvers/Query/userPresence.js
@@ -7,7 +7,12 @@ export async function userPresence(_, { search }) {
     where: {
       wifiDevices: { some: { lastSeen: { not: null } } }
     },
-    include: { wifiDevices: { orderBy: [{ lastSeen: 'desc' }] } }
+    include: {
+      wifiDevices: {
+        orderBy: [{ lastSeen: 'desc' }],
+        include: { accessPoint: true }
+      }
+    }
   })
 
   search = search.toLowerCase().trim()
@@ -57,7 +62,8 @@ export async function userPresence(_, { search }) {
       thumbnailPhoto: userPresence.thumbnailPhoto,
       lastSeen: userPresence.wifiDevices[0].lastSeen,
       status: userPresence.wifiDevices[0].status,
-      apName: userPresence.wifiDevices[0].apName
+      apName: userPresence.wifiDevices[0].apName,
+      local: userPresence.wifiDevices[0].accessPoint.local
     }))
     .slice(0, 200)
 }
diff --git a/server/src/typeDefs.js b/server/src/typeDefs.js
index 4cd7b06..8312c3e 100644
--- a/server/src/typeDefs.js
+++ b/server/src/typeDefs.js
@@ -252,6 +252,7 @@ const typeDefs = gql`
     lastSeen: String!
     status: Status!
     apName: String!
+    local: String
   }
 
   "The status of a Device"
diff --git a/web/src/views/UserPresence.vue b/web/src/views/UserPresence.vue
index 3f19aff..4253820 100644
--- a/web/src/views/UserPresence.vue
+++ b/web/src/views/UserPresence.vue
@@ -139,9 +139,8 @@
                       <span class="font-weight-medium">On-line</span>
                     </v-list-item-subtitle>
                     <v-list-item-subtitle>
-                      Próximo ao AP
                       <span class="font-weight-medium">
-                        {{ userPresence.apName }}
+                        {{ userPresence.local || userPresence.apName }}
                       </span>
                     </v-list-item-subtitle>
                   </template>
@@ -290,6 +289,7 @@ export default {
             lastSeen
             status
             apName
+            local
           }
         }
       `,