include other IDs in assignment points CSV; add test

Author: sealexan

src/main/kotlin/ch/uzh/ifi/access/controller/CourseController.kt

@@ -195,36 +195,14 @@ class CourseController(
         @PathVariable courseSlug: String,
         response: HttpServletResponse
     ) {
-        val pointsData = courseService.getStudentsWithAssignmentPoints(courseSlug)
+        val rows = courseService.getStudentsWithAssignmentPoints(courseSlug)
         response.apply {
             setHeader("Content-Disposition", "attachment; filename=access_points_${courseSlug}.csv")
             contentType = "text/csv"
         }
         response.outputStream.writer(StandardCharsets.UTF_8).use { writer ->
-            val pointsByUser = pointsData.groupBy { it.userId }
-            val assignments = pointsData
-                .map { it.ordinalNum }
-                .distinct()
-                .sortedBy { ordinalNum ->
-                    pointsData
-                        .filter { it.ordinalNum == ordinalNum }
-                        .minByOrNull { it.ordinalNum ?: Long.MAX_VALUE }
-                        ?.ordinalNum ?: Long.MAX_VALUE
-                }
-            val header = listOf("user_id") + assignments.map { "as${it}" } + listOf("total")
-            writer.write(header.joinToString(",") { (it.toString()) })
-            writer.appendLine()
-            pointsByUser.forEach { (userId, userAssignmentPoints) ->
-                val row = mutableListOf(userId)
-                assignments.forEach { ordinalNum ->
-                    val points = userAssignmentPoints
-                        .find { it.ordinalNum == ordinalNum }
-                        ?.totalPoints
-                        ?: 0.0
-                    row.add(points.toString())
-                }
-                row.add(userAssignmentPoints.sumOf { it.totalPoints ?: 0.0 }.toString())
-                writer.write(row.joinToString(","))
+            rows.forEach { row ->
+                writer.write(row.joinToString(",") { (it.toString()) })
                 writer.appendLine()
             }
             writer.flush()

src/main/kotlin/ch/uzh/ifi/access/service/CourseService.kt

@@ -100,7 +100,7 @@ class CourseService(
     fun getStudentsWithAssignmentPoints(
         courseSlug: String,
         withAssistants: Boolean = false
-    ): List<AssignmentPointsDTO> {
+    ): MutableList<List<String?>> {
         val course = getCourseBySlug(courseSlug)
         val names = if (withAssistants) {
             course.registeredStudents + course.assistants + course.supervisors
@@ -111,7 +111,7 @@ class CourseService(
         val userIds = course.registeredStudents.associateWith { roleService.getUserId(it) }
         val userIdsInverse = userIds.map { (k, v) -> v to k }.toMap()
         val userNames = users.map { (k, v) -> k to v?.username }.toMap()
-        return courseRepository.getParticipantsAssignmentPoints(
+        val pointsData = courseRepository.getParticipantsAssignmentPoints(
             courseSlug,
             userIds.values.filterNotNull().toTypedArray()
         ).map {
@@ -122,6 +122,40 @@ class CourseService(
                 it.totalPoints,
             )
         }
+        val pointsByUser = pointsData.groupBy { it.userId }
+        val assignments = pointsData
+            .map { it.ordinalNum }
+            .distinct()
+            .sortedBy { ordinalNum ->
+                pointsData
+                    .filter { it.ordinalNum == ordinalNum }
+                    .minByOrNull { it.ordinalNum ?: Long.MAX_VALUE }
+                    ?.ordinalNum ?: Long.MAX_VALUE
+            }
+        val rows = mutableListOf(
+            mutableListOf<String?>(
+                "username",
+                "registered_as",
+                "other_ids"
+            ) + assignments.map { "as${it}" } + listOf("total"))
+        pointsByUser.forEach { (userId, userAssignmentPoints) ->
+            val registrationID = userIdsInverse.getOrDefault(userId!!, userId)
+            val row = mutableListOf(
+                userId,
+                registrationID,
+                roleService.getRegistrationIDCandidates(userId).minus(setOf(userId, registrationID)).joinToString(" ")
+            )
+            assignments.forEach { ordinalNum ->
+                val points = userAssignmentPoints
+                    .find { it.ordinalNum == ordinalNum }
+                    ?.totalPoints
+                    ?: 0.0
+                row.add(points.toString())
+            }
+            row.add(userAssignmentPoints.sumOf { it.totalPoints ?: 0.0 }.toString())
+            rows.add(row)
+        }
+        return rows
     }
 
     fun getCourseBySlug(courseSlug: String): Course {

src/test/kotlin/ch/uzh/ifi/access/api/AfterSubmissionTests.kt

@@ -1,5 +1,6 @@
 package ch.uzh.ifi.access.api
 
+import ch.uzh.ifi.access.AccessUser
 import ch.uzh.ifi.access.BaseTest
 import org.hamcrest.Matchers.*
 import org.junit.jupiter.api.*
@@ -159,4 +160,22 @@ class AfterSubmissionTests(@Autowired val mvc: MockMvc) : BaseTest() {
             .andExpect(jsonPath(path, hasItem(containsString("a=1;b=0;c=0;d=0"))))
     }
 
+    @Test
+    @Order(0)
+    @AccessUser(
+        username = "supervisor@uzh.ch",
+        authorities = ["supervisor", "access-mock-course-supervisor", "access-mock-course"]
+    )
+    fun `Can download CSV with assignment points`() {
+        mvc.perform(
+            get("/courses/access-mock-course/assignmentPoints")
+                .contentType("text/csv")
+                .with(csrf())
+        )
+            .andExpect(status().isOk)
+            .andExpect(content().contentType("text/csv"))
+            .andExpect(content().string(containsString("username,registered_as,other_ids,")))
+            .andExpect(content().string(containsString("student@uzh.ch,,2.0,2.0")))
+    }
+
 }