From b5703dc7366f506fd76579ec1bc1b673e153dfab Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Thu, 26 May 2022 19:09:02 +0000
Subject: [PATCH] Move APs updates

---
 server/package-lock.json       |  4 ++--
 server/package.json            |  2 +-
 server/src/lib/accessPoints.js | 12 ------------
 server/src/lib/wifiDevices.js  | 15 ++++++++++++++-
 web/package-lock.json          |  4 ++--
 web/package.json               |  2 +-
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index f6fa202..56d76a1 100755
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ifms-pti-svr",
-  "version": "2.16.2",
+  "version": "2.16.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ifms-pti-svr",
-      "version": "2.16.2",
+      "version": "2.16.3",
       "license": "ISC",
       "dependencies": {
         "@prisma/client": "^3.13.0",
diff --git a/server/package.json b/server/package.json
index 75c8b70..989fde5 100755
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ifms-pti-svr",
-  "version": "2.16.2",
+  "version": "2.16.3",
   "description": "Servidor do Portal de TI do IFMS",
   "main": "src/index.js",
   "scripts": {
diff --git a/server/src/lib/accessPoints.js b/server/src/lib/accessPoints.js
index a05d1cd..4692ef2 100644
--- a/server/src/lib/accessPoints.js
+++ b/server/src/lib/accessPoints.js
@@ -54,18 +54,6 @@ export async function updateAccessPoints() {
     }
   })
 
-  const updatedDbAccessPoints = await prisma.accessPoint.findMany({
-    include: {
-      wifiDevices: {
-        where: {
-          status: 'ONLINE'
-        }
-      }
-    }
-  })
-
-  pubsub.publish(ACCESS_POINTS_UPDATED, { accessPointsUpdated: updatedDbAccessPoints })
-
   logSuccess({
     tags: ['accessPoints', 'updateAccessPoints'],
     message: `${updatedDbAccessPoints.length} APs atualizados`
diff --git a/server/src/lib/wifiDevices.js b/server/src/lib/wifiDevices.js
index 86b5620..0d5a0f1 100644
--- a/server/src/lib/wifiDevices.js
+++ b/server/src/lib/wifiDevices.js
@@ -4,7 +4,7 @@ import * as ciscoController from './ciscoController'
 
 import prisma from '../prisma'
 
-import { pubsub, USER_PRESENCE_UPDATED } from '../pubsub'
+import { pubsub, USER_PRESENCE_UPDATED, ACCESS_POINTS_UPDATED } from '../pubsub'
 import { logError, logSuccess } from './logger'
 
 import { performance } from 'perf_hooks'
@@ -192,6 +192,19 @@ function updateDevicesInfo() {
         userPresenceUpdated: onlineDevices.length
       })
 
+
+      const updatedDbAccessPoints = await prisma.accessPoint.findMany({
+        include: {
+          wifiDevices: {
+            where: {
+              status: 'ONLINE'
+            }
+          }
+        }
+      })
+
+      pubsub.publish(ACCESS_POINTS_UPDATED, { accessPointsUpdated: updatedDbAccessPoints })
+
       logSuccess({
         tags: ['wifiDevices'],
         message: `${onlineDevices.length} dispositivos Wi-Fi atualizados em 
diff --git a/web/package-lock.json b/web/package-lock.json
index 7ad0283..a3ba4f7 100755
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ifms-pti",
-  "version": "2.16.2",
+  "version": "2.16.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ifms-pti",
-      "version": "2.16.2",
+      "version": "2.16.3",
       "dependencies": {
         "@mdi/font": "^6.6.96",
         "apollo-link-ws": "^1.0.20",
diff --git a/web/package.json b/web/package.json
index fd7e672..4db330a 100755
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ifms-pti",
-  "version": "2.16.2",
+  "version": "2.16.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",