Addressed comments in PR #460

dres-dev · Mar 8, 2024 · 58bdd6f · 58bdd6f
1 parent fd3c387
commit 58bdd6f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/backend/src/main/kotlin/dev/dres/DRES.kt b/backend/src/main/kotlin/dev/dres/DRES.kt
@@ -1,21 +1,20 @@
 package dev.dres
 
-import com.github.kokorin.jaffree.ffmpeg.FFmpeg
 import dev.dres.api.cli.Cli
 import dev.dres.api.cli.OpenApiCommand
 import dev.dres.api.rest.RestApi
-import dev.dres.data.model.config.Config
 import dev.dres.data.model.admin.DbRole
 import dev.dres.data.model.admin.DbUser
+import dev.dres.data.model.config.Config
 import dev.dres.data.model.media.*
+import dev.dres.data.model.run.*
+import dev.dres.data.model.submissions.*
 import dev.dres.data.model.template.DbEvaluationTemplate
 import dev.dres.data.model.template.task.*
 import dev.dres.data.model.template.task.options.*
 import dev.dres.data.model.template.team.DbTeam
 import dev.dres.data.model.template.team.DbTeamAggregator
 import dev.dres.data.model.template.team.DbTeamGroup
-import dev.dres.data.model.run.*
-import dev.dres.data.model.submissions.*
 import dev.dres.mgmt.MediaCollectionManager
 import dev.dres.mgmt.TemplateManager
 import dev.dres.mgmt.admin.UserManager
@@ -30,10 +29,6 @@ import kotlinx.dnq.util.initMetaData
 import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
-import kotlin.io.path.exists
-import kotlin.io.path.isDirectory
-import kotlin.io.path.isExecutable
-import kotlin.io.path.listDirectoryEntries
 import kotlin.system.exitProcess
 
 
@@ -47,7 +42,7 @@ import kotlin.system.exitProcess
  */
 object DRES {
     /** Version of DRES. */
-    const val VERSION = "2.0.0-RC5"
+    const val VERSION = "2.0.0"
 
     /** Application root; should be relative to JAR file or classes path. */
     val APPLICATION_ROOT: Path =

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/RestApi.kt b/backend/src/main/kotlin/dev/dres/api/rest/RestApi.kt
@@ -1,7 +1,5 @@
 package dev.dres.api.rest
 
-import GetTaskHintHandler
-import com.fasterxml.jackson.databind.node.ObjectNode
 import dev.dres.DRES
 import dev.dres.api.rest.handler.*
 import dev.dres.api.rest.handler.collection.*
@@ -20,34 +18,34 @@ import dev.dres.api.rest.handler.judgement.*
 import dev.dres.api.rest.handler.log.QueryLogHandler
 import dev.dres.api.rest.handler.log.ResultLogHandler
 import dev.dres.api.rest.handler.preview.*
-import dev.dres.api.rest.handler.template.*
 import dev.dres.api.rest.handler.scores.ListEvaluationScoreHandler
 import dev.dres.api.rest.handler.submission.SubmissionHandler
 import dev.dres.api.rest.handler.system.CurrentTimeHandler
 import dev.dres.api.rest.handler.system.InfoHandler
 import dev.dres.api.rest.handler.system.LoginHandler
 import dev.dres.api.rest.handler.system.LogoutHandler
+import dev.dres.api.rest.handler.template.*
 import dev.dres.api.rest.handler.users.*
 import dev.dres.api.rest.types.status.ErrorStatus
 import dev.dres.api.rest.types.users.ApiRole
 import dev.dres.data.model.config.Config
 import dev.dres.mgmt.cache.CacheManager
-import dev.dres.run.RunExecutor
 import dev.dres.utilities.NamedThreadFactory
 import io.javalin.Javalin
 import io.javalin.apibuilder.ApiBuilder.*
-import io.javalin.http.staticfiles.Location
 import io.javalin.community.ssl.SslPlugin
 import io.javalin.http.Cookie
 import io.javalin.http.HttpStatus
 import io.javalin.http.SameSite
+import io.javalin.http.staticfiles.Location
 import io.javalin.openapi.CookieAuth
 import io.javalin.openapi.OpenApiContact
 import io.javalin.openapi.OpenApiLicense
-import io.javalin.openapi.plugin.*
+import io.javalin.openapi.plugin.OpenApiPlugin
+import io.javalin.openapi.plugin.SecurityComponentConfiguration
 import io.javalin.openapi.plugin.swagger.SwaggerPlugin
 import jetbrains.exodus.database.TransientEntityStore
-import org.eclipse.jetty.server.*
+import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.util.thread.QueuedThreadPool
 import org.slf4j.LoggerFactory
 import org.slf4j.MarkerFactory

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/handler/evaluation/scores/TeamGroupScoreHandler.kt b/backend/src/main/kotlin/dev/dres/api/rest/handler/evaluation/scores/TeamGroupScoreHandler.kt
@@ -42,13 +42,10 @@ class TeamGroupScoreHandler : AbstractScoreHandler(), GetRestHandler<List<ApiTea
         if (!manager.runProperties.participantCanView && ctx.isParticipant()) {
             throw ErrorStatusException(403, "Access denied.", ctx)
         }
-
-
-//            val rac = ctx.runActionContext()
-            /* TODO: Not suite sure where the teamGroupAggregator got lost.*/
-            //val aggregators = manager.currentTask(rac)?.teamGroupAggregators ?: throw ErrorStatusException(404, "No active task in evaluation ${ctx.evaluationId()}.", ctx)
-            //val teamGroups = manager.template.teamsGroups.toList()
-            //teamGroups.map { ApiTeamGroupValue(it.name, aggregators[it.teamGroupId]?.lastValue ?: 0.0) }
+            val rac = ctx.runActionContext()
+            val aggregators = manager.currentTask(rac)?.teamGroupAggregators ?: throw ErrorStatusException(404, "No active task in evaluation ${ctx.evaluationId()}.", ctx)
+            val teamGroups = manager.template.teamGroups.toList()
+            teamGroups.map { ApiTeamGroupValue(it.name!!, aggregators[it.id]?.lastValue ?: 0.0) }
             return emptyList()
 
     }

diff --git a/backend/src/main/kotlin/dev/dres/api/rest/handler/evaluation/viewer/GetTaskHintHandler.kt b/backend/src/main/kotlin/dev/dres/api/rest/handler/evaluation/viewer/GetTaskHintHandler.kt
@@ -1,3 +1,5 @@
+package dev.dres.api.rest.handler.evaluation.viewer
+
 import dev.dres.DRES
 import dev.dres.api.rest.handler.GetRestHandler
 import dev.dres.api.rest.handler.evaluation.viewer.AbstractEvaluationViewerHandler