#4[30m]. Add bonusRating, contestRating.

yev-kanivets · Nov 7, 2017 · 0522599 · 0522599
1 parent 6db094a
commit 0522599
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -41,8 +41,10 @@ fun fetchStudents(failure: (reason: String) -> Unit = {}, success: (students: Ar
                     if (student.startRating == -1) {
                         student.startRating = student.currentRating
                     }
-                    student.solvedTasks = acmpUser.solvedTasks
-                    student.notSolvedTasks = acmpUser.notSolvedTasks
+                    student.bonusRating = 0
+                    student.contestRating = student.currentRating - student.startRating + student.bonusRating
+                    student.solvedTasks = acmpUser.solvedTasks.toList()
+                    student.notSolvedTasks = acmpUser.notSolvedTasks.toList()
                 }
             }
             success(students)

diff --git a/src/main/kotlin/firebase/FirebaseClient.kt b/src/main/kotlin/firebase/FirebaseClient.kt
@@ -29,7 +29,7 @@ class FirebaseClient {
     public fun fetchStudents(failure: (reason: String) -> Unit = {}, success: (students: Array<Student>) -> Unit) {
         val database = FirebaseDatabase.getInstance()
         val usersRef = database.getReference(KEY_USERS)
-        usersRef.addValueEventListener(object : ValueEventListener {
+        usersRef.addListenerForSingleValueEvent(object : ValueEventListener {
 
             override fun onCancelled(error: DatabaseError?) {
                 print(error)
@@ -59,6 +59,8 @@ class FirebaseClient {
         students.forEach {
             updates.put("${it.id}/startRating", it.startRating)
             updates.put("${it.id}/currentRating", it.currentRating)
+            updates.put("${it.id}/bonusRating", it.bonusRating)
+            updates.put("${it.id}/contestRating", it.contestRating)
             updates.put("${it.id}/solvedTasks", it.solvedTasks.toList())
             updates.put("${it.id}/notSolvedTasks", it.notSolvedTasks.toList())
         }

diff --git a/src/main/kotlin/model/Student.kt b/src/main/kotlin/model/Student.kt
@@ -15,5 +15,7 @@ data class Student(var id: String = "",
                    val telegramUsername: String = "",
                    var startRating: Int = -1,
                    var currentRating: Int = -1,
-                   var solvedTasks: Array<String> = arrayOf<String>(),
-                   var notSolvedTasks: Array<String> = arrayOf<String>())
+                   var bonusRating: Int = 0,
+                   var contestRating: Int = -1,
+                   var solvedTasks: List<String> = listOf<String>(),
+                   var notSolvedTasks: List<String> = listOf<String>())