#58 Added grades table api method

vityaman-edu · Apr 13, 2024 · 7a7b3f2 · 7a7b3f2
1 parent 25a8926
commit 7a7b3f2
Show file tree

Hide file tree

Showing 12 changed files with 289 additions and 9 deletions.
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/api/http/endpoint/RatingHttpApi.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/api/http/endpoint/RatingHttpApi.kt
@@ -0,0 +1,36 @@
+package ru.vityaman.lms.botalka.api.http.endpoint
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.RestController
+import ru.vityaman.lms.botalka.api.http.server.GetRatingGrades200ResponseMessage
+import ru.vityaman.lms.botalka.api.http.server.HomeworkGradeMessage
+import ru.vityaman.lms.botalka.api.http.server.StudentGradesMessage
+import ru.vityaman.lms.botalka.api.http.server.apis.RatingApi
+import ru.vityaman.lms.botalka.logic.RatingService
+
+typealias RatingGrades = GetRatingGrades200ResponseMessage
+
+@RestController
+class RatingHttpApi(
+    @Autowired private val service: RatingService,
+) : RatingApi {
+    override suspend fun getRatingGrades(): ResponseEntity<RatingGrades> =
+        ResponseEntity.ok(
+            RatingGrades(
+                grades = service.grades().map { (student, grades) ->
+                    println("$student $grades")
+                    StudentGradesMessage(
+                        studentId = student.id.number,
+                        grades = grades.entries
+                            .map { (homework, grade) ->
+                                HomeworkGradeMessage(
+                                    homeworkId = homework.number,
+                                    score = grade.value.toInt(),
+                                )
+                            },
+                    )
+                },
+            ),
+        )
+}
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/commons/Merge.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/commons/Merge.kt
@@ -1,9 +1,15 @@
 package ru.vityaman.lms.botalka.commons
 
+import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.produceIn
 
+private suspend fun <T> ReceiveChannel<T>.receiveIfNotEmpty(): T? =
+    this.receiveCatching().also {
+        it.exceptionOrNull()?.let { throw it }
+    }.getOrNull()
+
 fun <T, U : Comparable<U>> mergeOrdered(
     lhs: Flow<T>,
     rhs: Flow<T>,
@@ -12,26 +18,26 @@ fun <T, U : Comparable<U>> mergeOrdered(
     val lhsChan = lhs.produceIn(this)
     val rhsChan = rhs.produceIn(this)
 
-    var left = lhsChan.receiveCatching().getOrNull()
-    var right = rhsChan.receiveCatching().getOrNull()
+    var left = lhsChan.receiveIfNotEmpty()
+    var right = rhsChan.receiveIfNotEmpty()
 
     while (left != null && right != null) {
         if (key(left) < key(right)) {
             send(left)
-            left = lhsChan.receiveCatching().getOrNull()
+            left = lhsChan.receiveIfNotEmpty()
         } else {
             send(right)
-            right = rhsChan.receiveCatching().getOrNull()
+            right = rhsChan.receiveIfNotEmpty()
         }
     }
 
     while (left != null) {
         send(left)
-        left = lhsChan.receiveCatching().getOrNull()
+        left = lhsChan.receiveIfNotEmpty()
     }
 
     while (right != null) {
         send(right)
-        right = rhsChan.receiveCatching().getOrNull()
+        right = rhsChan.receiveIfNotEmpty()
     }
 }
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/RatingService.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/RatingService.kt
@@ -0,0 +1,10 @@
+package ru.vityaman.lms.botalka.logic
+
+import ru.vityaman.lms.botalka.domain.model.Homework
+import ru.vityaman.lms.botalka.domain.model.Student
+
+typealias Grades = Map<Student, Map<Homework.Id, Homework.Score>>
+
+interface RatingService {
+    suspend fun grades(): Grades
+}
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/WorkspaceService.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/WorkspaceService.kt
@@ -1,12 +1,18 @@
 package ru.vityaman.lms.botalka.logic
 
 import kotlinx.coroutines.flow.Flow
+import ru.vityaman.lms.botalka.domain.model.Homework
 import ru.vityaman.lms.botalka.domain.model.Workspace
 
 interface WorkspaceService {
     fun events(id: Workspace.Id): Flow<Workspace.Event>
+
     suspend fun produce(
         id: Workspace.Id,
         event: Workspace.Event.Draft,
     ): Workspace.Event
+
+    suspend fun grade(id: Workspace.Id): Homework.Score?
+
+    fun all(): Flow<Workspace.Id>
 }
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/basic/BasicRatingService.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/basic/BasicRatingService.kt
@@ -0,0 +1,34 @@
+package ru.vityaman.lms.botalka.logic.basic
+
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.toList
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+import ru.vityaman.lms.botalka.domain.model.Homework
+import ru.vityaman.lms.botalka.domain.model.Student
+import ru.vityaman.lms.botalka.logic.Grades
+import ru.vityaman.lms.botalka.logic.RatingService
+import ru.vityaman.lms.botalka.logic.WorkspaceService
+
+@Service
+class BasicRatingService(
+    @Autowired private val workspaces: WorkspaceService,
+) : RatingService {
+    override suspend fun grades(): Grades {
+        val byStuds = mutableMapOf<
+            Student,
+            MutableMap<Homework.Id, Homework.Score>,
+            >()
+
+        coroutineScope {
+            for (id in workspaces.all().toList()) {
+                workspaces.grade(id)?.let { grade ->
+                    val byHws = byStuds.getOrPut(id.student) { mutableMapOf() }
+                    byHws[id.homework] = grade
+                }
+            }
+        }
+
+        return byStuds
+    }
+}
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/basic/BasicWorkspaceService.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/logic/basic/BasicWorkspaceService.kt
@@ -1,8 +1,12 @@
 package ru.vityaman.lms.botalka.logic.basic
 
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.lastOrNull
+import kotlinx.coroutines.flow.map
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import ru.vityaman.lms.botalka.domain.model.Homework
 import ru.vityaman.lms.botalka.domain.model.Workspace
 import ru.vityaman.lms.botalka.logic.WorkspaceService
 import ru.vityaman.lms.botalka.storage.WorkspaceStorage
@@ -23,4 +27,15 @@ class BasicWorkspaceService(
             is Workspace.Submission.Draft -> storage.save(id, event)
             is Workspace.Feedback.Draft -> storage.save(id, event)
         }
+
+    override suspend fun grade(id: Workspace.Id): Homework.Score? =
+        events(id)
+            .map { it as? Workspace.Feedback }
+            .filterNotNull()
+            .map { it.score }
+            .filterNotNull()
+            .lastOrNull()
+
+    override fun all(): Flow<Workspace.Id> =
+        storage.all()
 }
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/storage/WorkspaceStorage.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/storage/WorkspaceStorage.kt
@@ -20,4 +20,6 @@ interface WorkspaceStorage {
         id: Workspace.Id,
         event: Workspace.Feedback.Draft,
     ): Workspace.Feedback
+
+    fun all(): Flow<Workspace.Id>
 }
diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/storage/jooq/JooqWorkspaceStorage.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/storage/jooq/JooqWorkspaceStorage.kt
@@ -8,6 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Repository
 import reactor.kotlin.core.publisher.toMono
 import ru.vityaman.lms.botalka.commons.mergeOrdered
+import ru.vityaman.lms.botalka.domain.model.Homework
+import ru.vityaman.lms.botalka.domain.model.Student
+import ru.vityaman.lms.botalka.domain.model.User
 import ru.vityaman.lms.botalka.domain.model.Workspace
 import ru.vityaman.lms.botalka.storage.WorkspaceStorage
 import ru.vityaman.lms.botalka.storage.jooq.entity.toModel
@@ -83,16 +86,31 @@ class JooqWorkspaceStorage(
                 HOMEWORK_FEEDBACK.STUDENT_ID,
                 HOMEWORK_FEEDBACK.TEACHER_ID,
                 HOMEWORK_FEEDBACK.COMMENT,
+                HOMEWORK_FEEDBACK.SCORE,
             )
             .values(
                 id.homework.number,
                 id.student.id.number,
                 event.teacher.id.number,
                 event.comment,
+                event.score?.value,
             )
             .returning()
             .coerce(HOMEWORK_FEEDBACK)
             .toMono()
             .map { it.toModel() }
             .awaitSingle()
+
+    override fun all(): Flow<Workspace.Id> =
+        database.execute
+            .selectFrom(HOMEWORK_SUBMISSION)
+            .where(HOMEWORK_SUBMISSION.ID.eq(HOMEWORK_SUBMISSION.ID))
+            .toFlux()
+            .map {
+                Workspace.Id(
+                    Homework.Id(it.homeworkId),
+                    Student(User.Id(it.studentId)),
+                )
+            }
+            .asFlow()
 }
diff --git a/botalka/src/main/resources/static/openapi/api.yml b/botalka/src/main/resources/static/openapi/api.yml
@@ -116,9 +116,14 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/StudentGrades'
+                type: object
+                properties:
+                  grades:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/StudentGrades'
+                required:
+                  - grades
   /user/{id}:
     get:
       tags: [ User ]

diff --git a/botalka/src/test/kotlin/ru/vityaman/lms/botalka/api/http/client/ApiClientSet.kt b/botalka/src/test/kotlin/ru/vityaman/lms/botalka/api/http/client/ApiClientSet.kt
@@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.stereotype.Component
 import ru.vityaman.lms.botalka.api.http.client.apis.HomeworkApi
 import ru.vityaman.lms.botalka.api.http.client.apis.MonitoringApi
+import ru.vityaman.lms.botalka.api.http.client.apis.RatingApi
 import ru.vityaman.lms.botalka.api.http.client.apis.UserApi
 
 @Component
@@ -18,4 +19,7 @@ class ApiClientSet {
 
     @Bean
     fun userApi() = UserApi(url)
+
+    @Bean
+    fun ratingApi() = RatingApi(url)
 }
diff --git a/botalka/src/test/kotlin/ru/vityaman/lms/botalka/api/http/client/HomeworkApiClient.kt b/botalka/src/test/kotlin/ru/vityaman/lms/botalka/api/http/client/HomeworkApiClient.kt
@@ -41,6 +41,7 @@ class HomeworkApiClient(
             WorkspaceFeedbackDraftMessage(
                 kind = WorkspaceEventKindMessage.feedback,
                 comment = draft.comment,
+                score = draft.score?.value?.toInt(),
             ),
         ).awaitSingle()
     }