Skip to content

New feature. #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
momotakas wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

New feature. #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/main/scala/model/OfficeHoursServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class OfficeHoursServer() {
}else{
new Database
}
var llst:List[String]=List()

var usernameToSocket: Map[String, SocketIOClient] = Map()
var socketToUsername: Map[SocketIOClient, String] = Map()
Expand Down Expand Up @@ -49,7 +50,7 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene
override def onDisconnect(socket: SocketIOClient): Unit = {
if (server.socketToUsername.contains(socket)) {
val username = server.socketToUsername(socket)
server.socketToUsername -= socket
server.socketToUsername -= socket
if (server.usernameToSocket.contains(username)) {
server.usernameToSocket -= username
}
Expand All @@ -60,10 +61,13 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene

class EnterQueueListener(server: OfficeHoursServer) extends DataListener[String] {
override def onData(socket: SocketIOClient, username: String, ackRequest: AckRequest): Unit = {
server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
server.socketToUsername += (socket -> username)
server.usernameToSocket += (username -> socket)
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
if(server.llst.contains(username)){}else {
server.llst=server.llst:+username
server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
server.socketToUsername += (socket -> username)
server.usernameToSocket += (username -> socket)
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
}
}
}

Expand All @@ -78,6 +82,7 @@ class ReadyForStudentListener(server: OfficeHoursServer) extends DataListener[No
if(server.usernameToSocket.contains(studentToHelp.username)){
server.usernameToSocket(studentToHelp.username).sendEvent("message", "A TA is ready to help you")
}
server.llst=server.llst.tail
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
}
}
Expand Down