Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 17 additions & 6 deletions src/main/scala/model/OfficeHoursServer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class OfficeHoursServer() {

var usernameToSocket: Map[String, SocketIOClient] = Map()
var socketToUsername: Map[SocketIOClient, String] = Map()
var studentInQueue: Map[String,Int] = Map()

val config: Configuration = new Configuration {
setHostname("0.0.0.0")
Expand All @@ -27,7 +28,6 @@ class OfficeHoursServer() {
server.addDisconnectListener(new DisconnectionListener(this))
server.addEventListener("enter_queue", classOf[String], new EnterQueueListener(this))
server.addEventListener("ready_for_student", classOf[Nothing], new ReadyForStudentListener(this))

server.start()

def queueJSON(): String = {
Expand All @@ -36,6 +36,10 @@ class OfficeHoursServer() {
Json.stringify(Json.toJson(queueJSON))
}

def warning(username:String):String = {
val message = username +" is already in queue"
Json.stringify(Json.toJson(message))
}
}

object OfficeHoursServer {
Expand All @@ -60,10 +64,16 @@ 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.studentInQueue.contains(username)) {
server.studentInQueue += (username -> 0)
server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
server.socketToUsername += (socket -> username)
server.usernameToSocket += (username -> socket)
server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
}
else{
server.server.getBroadcastOperations.sendEvent("message", server.warning(username))
}
}
}

Expand All @@ -73,8 +83,9 @@ class ReadyForStudentListener(server: OfficeHoursServer) extends DataListener[No
val queue = server.database.getQueue.sortBy(_.timestamp)
if(queue.nonEmpty){
val studentToHelp = queue.head
server.studentInQueue -= studentToHelp.username
server.database.removeStudentFromQueue(studentToHelp.username)
socket.sendEvent("message", "You are now helping " + studentToHelp.username)
socket.sendEvent("message", "You are now helping " + studentToHelp.username )
if(server.usernameToSocket.contains(studentToHelp.username)){
server.usernameToSocket(studentToHelp.username).sendEvent("message", "A TA is ready to help you")
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/model/StudentInQueue.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object StudentInQueue {
}

def apply(username: String, timestamp: Long): StudentInQueue = {
new StudentInQueue(cleanString(username), timestamp)
new StudentInQueue(cleanString(username),timestamp)
}


Expand Down