1839811/ifms-pti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort userPresence by lastSeen timestamp and display name

Browse Source
This commit is contained in:
Douglas Barone 2024-01-19 21:22:06 -04:00
parent be7262bbdf
commit 15b8d248a8
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/resolvers/Query/userPresence.js
View File

@ -11,7 +11,8 @@ export async function userPresence(_, { search, onlyServants }) {
orderBy: { displayName: 'asc' }, orderBy: { displayName: 'asc' },
include: { include: {
wifiDevices: { wifiDevices: {
include: { accessPoint: true } include: { accessPoint: true },
orderBy: { lastSeen: 'desc' }
} }
} }
}) })
@ -49,9 +50,7 @@ export async function userPresence(_, { search, onlyServants }) {
} }
} }
const sortedUsers = filteredUsers const sortedUsers = filteredUsers.sort((a, b) => {
.sort((a, b) => a.displayName.localeCompare(b.displayName))
.sort((a, b) => {
const [aStatus, bStatus] = [ const [aStatus, bStatus] = [
a.wifiDevices[0].status, a.wifiDevices[0].status,
b.wifiDevices[0].status b.wifiDevices[0].status
@ -69,7 +68,7 @@ export async function userPresence(_, { search, onlyServants }) {
) )
return 1 return 1
return 0 return a.displayName.localeCompare(b.displayName)
}) })
const userPresence = sortedUsers const userPresence = sortedUsers