Use cds id as key for groups

icpc · Sep 25, 2023 · 745be02 · 745be02
1 parent 3888e31
commit 745be02
Show file tree

Hide file tree

Showing 20 changed files with 1,236 additions and 477 deletions.
diff --git a/schemas/advanced.schema.json b/schemas/advanced.schema.json
@@ -286,14 +286,20 @@
                 }
             }
         },
-        "org.icpclive.api.tunning.GroupInfoOverride<kotlin.Boolean?,kotlin.Boolean?>": {
+        "org.icpclive.api.tunning.GroupInfoOverride<kotlin.String?,kotlin.Boolean?,kotlin.Boolean?,kotlin.Boolean?>": {
             "type": "object",
             "properties": {
+                "displayName": {
+                    "type": "string"
+                },
                 "isHidden": {
                     "type": "boolean"
                 },
                 "isOutOfContest": {
                     "type": "boolean"
+                },
+                "awardsGroupChampion": {
+                    "type": "boolean"
                 }
             },
             "additionalProperties": false,
@@ -304,18 +310,21 @@
             "type": "object",
             "patternProperties": {
                 ".*": {
-                    "$ref": "#/$defs/org.icpclive.api.tunning.GroupInfoOverride<kotlin.Boolean?,kotlin.Boolean?>"
+                    "$ref": "#/$defs/org.icpclive.api.tunning.GroupInfoOverride<kotlin.String?,kotlin.Boolean?,kotlin.Boolean?,kotlin.Boolean?>"
                 }
             }
         },
-        "org.icpclive.api.tunning.OrganizationInfoOverride<kotlin.String?,kotlin.String?>": {
+        "org.icpclive.api.tunning.OrganizationInfoOverride<kotlin.String?,kotlin.String?,org.icpclive.api.MediaType?>": {
             "type": "object",
             "properties": {
                 "displayName": {
                     "type": "string"
                 },
                 "fullName": {
                     "type": "string"
+                },
+                "logo": {
+                    "$ref": "#/$defs/org.icpclive.api.MediaType?<kotlin.String,kotlinx.serialization.Sealed<MediaType>>"
                 }
             },
             "additionalProperties": false,
@@ -326,7 +335,7 @@
             "type": "object",
             "patternProperties": {
                 ".*": {
-                    "$ref": "#/$defs/org.icpclive.api.tunning.OrganizationInfoOverride<kotlin.String?,kotlin.String?>"
+                    "$ref": "#/$defs/org.icpclive.api.tunning.OrganizationInfoOverride<kotlin.String?,kotlin.String?,org.icpclive.api.MediaType?>"
                 }
             }
         },

diff --git a/src/backend/src/main/kotlin/org/icpclive/admin/Info.kt b/src/backend/src/main/kotlin/org/icpclive/admin/Info.kt
@@ -1,12 +1,18 @@
 package org.icpclive.admin
 
 import kotlinx.coroutines.flow.first
+import org.icpclive.api.GroupInfo
 import org.icpclive.api.InefficientContestInfoApi
 import org.icpclive.data.DataBus
 
 @OptIn(InefficientContestInfoApi::class)
 suspend fun getTeams() = DataBus.contestInfoFlow.await().first().teamList.filterNot { it.isHidden }
 
-suspend fun getRegions() = getTeams().flatMap { it.groups }.distinct().sorted()
+@OptIn(InefficientContestInfoApi::class)
+suspend fun getRegions() : List<GroupInfo> {
+    val info = DataBus.contestInfoFlow.await().first()
+    val used = info.teamList.flatMap { it.groups }.toSet()
+    return info.groupList.filter { it.cdsId in used }
+}
 
 suspend fun getHashtags() = getTeams().filter { it.hashTag != null }.associateBy({ it.hashTag!! }, { it.id })
diff --git a/src/backend/src/main/kotlin/org/icpclive/data/Controllers.kt b/src/backend/src/main/kotlin/org/icpclive/data/Controllers.kt
@@ -15,7 +15,7 @@ object Controllers {
     val ticker = SingleWidgetController(TickerSettings(), WidgetManager, ::TickerWidget)
     val scoreboard = SingleWidgetController(ScoreboardSettings(), WidgetManager, ::ScoreboardWidget)
     val fullScreenClock = SingleWidgetController(FullScreenClockSettings(), WidgetManager, ::FullScreenClockWidget)
-    private val teamViews = TeamViewPosition.values().asList().associateWith { TeamViewController(WidgetManager, it) }
+    private val teamViews = TeamViewPosition.entries.associateWith { TeamViewController(WidgetManager, it) }
     fun teamView(position: TeamViewPosition): TeamViewController = teamViews[position]!!
 
     val locator = LocatorWidgetController(WidgetManager)

diff --git a/src/cds-converter/src/main/kotlin/org/icpclive/export/clics/ClicsExporter.kt b/src/cds-converter/src/main/kotlin/org/icpclive/export/clics/ClicsExporter.kt
@@ -35,22 +35,36 @@ private fun ProblemInfo.toClicsProblem() = Problem(
 )
 
 private fun GroupInfo.toClicsGroup() = Group(
-    id = name,
-    name = name,
+    id = cdsId,
+    name = displayName,
 )
 
 private fun OrganizationInfo.toClicsOrg() = Organization(
     id = cdsId,
     name = displayName,
     formal_name = fullName,
+    logo = listOfNotNull(logo?.toClicsMedia())
 )
 
+private fun MediaType.toClicsMedia() = when (this) {
+    is MediaType.Object -> null
+    is MediaType.Photo -> Media("image", url)
+    is MediaType.TaskStatus -> null
+    is MediaType.Video -> Media("video", url)
+    is MediaType.WebRTCGrabberConnection -> null
+    is MediaType.WebRTCProxyConnection -> null
+}
+
 private fun TeamInfo.toClicsTeam() = Team(
     id = contestSystemId,
     name = fullName,
     hidden = isHidden,
     group_ids = groups,
-    organization_id = organizationId
+    organization_id = organizationId,
+    photo = listOfNotNull(medias[TeamMediaType.PHOTO]?.toClicsMedia()),
+    video = listOfNotNull(medias[TeamMediaType.RECORD]?.toClicsMedia()),
+    desktop = listOfNotNull(medias[TeamMediaType.SCREEN]?.toClicsMedia()),
+    webcam = listOfNotNull(medias[TeamMediaType.CAMERA]?.toClicsMedia()),
 )
 
 
@@ -256,12 +270,12 @@ object ClicsExporter  {
             }
         }
         diff(problemsMap, newInfo.problemList, ProblemInfo::contestSystemId, ProblemInfo::toClicsProblem, Event::ProblemEvent)
-        diffChange(groupsMap, newInfo.groupList, GroupInfo::name, GroupInfo::toClicsGroup, Event::GroupsEvent)
+        diffChange(groupsMap, newInfo.groupList, GroupInfo::cdsId, GroupInfo::toClicsGroup, Event::GroupsEvent)
         diffChange(orgsMap, newInfo.organizationList, OrganizationInfo::cdsId, OrganizationInfo::toClicsOrg, Event::OrganizationEvent)
 
         diff(teamsMap, newInfo.teamList, TeamInfo::contestSystemId, TeamInfo::toClicsTeam, Event::TeamEvent)
 
-        diffRemove(groupsMap, newInfo.groupList, GroupInfo::name, Event::GroupsEvent)
+        diffRemove(groupsMap, newInfo.groupList, GroupInfo::cdsId, Event::GroupsEvent)
         diffRemove(orgsMap, newInfo.organizationList, OrganizationInfo::cdsId, Event::OrganizationEvent)
     }
 
@@ -470,7 +484,7 @@ object ClicsExporter  {
         for ((award, teams) in scoreboardSnapshot.awards) {
             val (id, citation) = when (award) {
                 is org.icpclive.api.Award.Medal -> "${award.medalType}-medal" to "${award.medalType.replaceFirstChar { it.uppercase() }} medal"
-                is org.icpclive.api.Award.GroupChampion -> "group-winner-${award.group}" to "${info.groups[award.group]!!.name} champion"
+                is org.icpclive.api.Award.GroupChampion -> "group-winner-${award.group}" to "${info.groups[award.group]!!.displayName} champion"
                 is org.icpclive.api.Award.Winner -> "Winner" to "${info.name} champion"
             }
             add(Award(id, citation, teams.map { info.teams[it]!!.contestSystemId }))

diff --git a/src/cds/src/main/kotlin/org/icpclive/api/ContestInfo.kt b/src/cds/src/main/kotlin/org/icpclive/api/ContestInfo.kt
@@ -180,7 +180,8 @@ public data class TeamInfo(
 
 @Serializable
 public data class GroupInfo(
-    val name: String,
+    val cdsId: String,
+    val displayName: String,
     val isHidden: Boolean,
     val isOutOfContest: Boolean,
     val awardsGroupChampion: Boolean = !isHidden,
@@ -191,6 +192,7 @@ public data class OrganizationInfo(
     val cdsId: String,
     val displayName: String,
     val fullName: String,
+    val logo: MediaType?,
 )
 
 @Serializable
@@ -266,7 +268,7 @@ public data class ContestInfo(
             ContestStatus.RUNNING -> (Clock.System.now() - startTime) * emulationSpeed
             ContestStatus.OVER, ContestStatus.FINALIZED -> contestLength
         }
-    val groups: Map<String, GroupInfo> by lazy { groupList.associateBy { it.name } }
+    val groups: Map<String, GroupInfo> by lazy { groupList.associateBy { it.cdsId } }
     val teams: Map<Int, TeamInfo> by lazy { teamList.associateBy { it.id } }
     val cdsTeams: Map<String, TeamInfo> by lazy { teamList.associateBy { it.contestSystemId } }
     val organizations: Map<String, OrganizationInfo> by lazy { organizationList.associateBy { it.cdsId } }

diff --git a/src/cds/src/main/kotlin/org/icpclive/api/tunning/Advanced.kt b/src/cds/src/main/kotlin/org/icpclive/api/tunning/Advanced.kt
@@ -55,13 +55,17 @@ public data class ProblemInfoOverride(
 )
 
 /**
+ * @param displayName Name of the group to be displayed in admin and export
  * @param isHidden Totally hide all teams from this group
  * @param isOutOfContest Teams from this group will be visible everywhere, but will not have any rank assigned to them in the leaderboard
+ * @param awardsGroupChampion If true, the group champion award would be generated for this group.
  */
 @Serializable
 public data class GroupInfoOverride(
+    val displayName: String? = null,
     val isHidden: Boolean? = null,
-    val isOutOfContest: Boolean? = null
+    val isOutOfContest: Boolean? = null,
+    val awardsGroupChampion: Boolean? = null
 )
 
 /**
@@ -79,10 +83,17 @@ public data class RankingSettings(
     public val penaltyRoundingMode: PenaltyRoundingMode? = null
 )
 
+
+/**
+ * @param displayName Name of the team shown in most places.
+ * @param fullName Full name of the organization. Will be mostly shown on admin pages.
+ * @param logo Organization logo. Not displayed anywhere for now, but can be exported to e.g., icpc resolved.
+ */
 @Serializable
 public data class OrganizationInfoOverride(
     val displayName: String? = null,
-    val fullName: String? = null
+    val fullName: String? = null,
+    val logo: MediaType? = null
 )
 
 /**
@@ -221,15 +232,18 @@ public fun ContestInfo.toAdvancedProperties(fields: Set<String>) : AdvancedPrope
             )
         },
         groupOverrides = groupList.associate {
-            it.name to GroupInfoOverride(
+            it.cdsId to GroupInfoOverride(
+                displayName = it.displayName.takeIfAsked("groupDisplayName"),
                 isHidden = it.isHidden.takeIfAsked("isHidden"),
-                isOutOfContest = it.isOutOfContest.takeIfAsked("isOutOfContest")
+                isOutOfContest = it.isOutOfContest.takeIfAsked("isOutOfContest"),
+                awardsGroupChampion = it.awardsGroupChampion.takeIfAsked("awardGroupChampion")
             )
         },
         organizationOverrides = organizationList.associate {
             it.cdsId to OrganizationInfoOverride(
                 displayName = it.displayName.takeIfAsked("orgDisplayName"),
-                fullName = it.fullName.takeIfAsked("orgFullName")
+                fullName = it.fullName.takeIfAsked("orgFullName"),
+                logo = it.logo.takeIfAsked("logo")
             )
         },
         scoreboardOverrides = RankingSettings(

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/adapters/AdvancedPropertiesAdapter.kt b/src/cds/src/main/kotlin/org/icpclive/cds/adapters/AdvancedPropertiesAdapter.kt
@@ -203,11 +203,11 @@ internal fun applyAdvancedProperties(
             override.groups?.let { addAll(it) }
         }
         for (group in info.groupList) {
-            remove(group.name)
+            remove(group.cdsId)
         }
     }
     val groups = mergeGroups(
-        info.groupList + newGroups.map { GroupInfo(it, isHidden = false, isOutOfContest = false) },
+        info.groupList + newGroups.map { GroupInfo(it, it, isHidden = false, isOutOfContest = false) },
         overrides.groupOverrides
     )
     val newOrganizations = buildSet {
@@ -222,7 +222,7 @@ internal fun applyAdvancedProperties(
         }
     }
     val organizations = mergeOrganizations(
-        info.organizationList + newOrganizations.map { OrganizationInfo(it, it, it) },
+        info.organizationList + newOrganizations.map { OrganizationInfo(it, it, it, null) },
         overrides.organizationOverrides
     )
 
@@ -278,6 +278,7 @@ private fun mergeOrganizations(
         cdsId = org.cdsId,
         displayName = override.displayName ?: org.displayName,
         fullName = override.fullName ?: org.fullName,
+        logo = override.logo ?: org.logo
     )
 }
 
@@ -287,13 +288,15 @@ private fun mergeGroups(
 ) = mergeOverrides(
     groups,
     overrides,
-    GroupInfo::name,
+    GroupInfo::cdsId,
     unusedMessage = { "No group for override: $it" }
 ) { group, override ->
     GroupInfo(
-        name = group.name,
+        cdsId = group.cdsId,
+        displayName = override.displayName ?: group.displayName,
         isHidden = override.isHidden ?: group.isHidden,
-        isOutOfContest = override.isOutOfContest ?: group.isOutOfContest
+        isOutOfContest = override.isOutOfContest ?: group.isOutOfContest,
+        awardsGroupChampion = override.awardsGroupChampion ?: group.awardsGroupChampion
     )
 }
 

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/cats/CATSDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/cats/CATSDataSource.kt
@@ -156,7 +156,7 @@ internal class CATSDataSource(val settings: CatsSettings) : FullReloadContestDat
                     fullName = team.name,
                     displayName = team.name,
                     contestSystemId = team.account_id.toString(),
-                    groups = listOf(),
+                    groups = emptyList(),
                     hashTag = null,
                     medias = mapOf(),
                     isHidden = false,

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsModel.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/ClicsModel.kt
@@ -51,7 +51,7 @@ internal class ClicsModel(
         return null
     }
 
-    private fun Group.toApi() : GroupInfo = GroupInfo(name, isHidden = false, isOutOfContest = false)
+    private fun Group.toApi() : GroupInfo = GroupInfo(id, name, isHidden = false, isOutOfContest = false, awardsGroupChampion = true)
 
     private fun Team.toApi(): TeamInfo {
         val teamOrganization = organization_id?.let { organisations[it] }
@@ -61,7 +61,7 @@ internal class ClicsModel(
             displayName = teamName(teamOrganization?.name, name),
             contestSystemId = id,
             isHidden = hidden,
-            groups = group_ids.mapNotNull { groups[it]?.name },
+            groups = group_ids.mapNotNull { groups[it]?.id },
             hashTag = teamOrganization?.hashtag,
             medias = buildMap {
                 photo.firstOrNull()?.mediaType()?.let { put(TeamMediaType.PHOTO, it) }
@@ -90,6 +90,7 @@ internal class ClicsModel(
         cdsId = id,
         displayName = name,
         fullName = formalName,
+        logo = logo
     )
 
     val contestInfo: ContestInfo
@@ -139,7 +140,7 @@ internal class ClicsModel(
                 id = organization.id,
                 name = organization.name,
                 formalName = organization.formal_name ?: organization.name,
-                logo = organization.logo.lastOrNull()?.href?.let { it },
+                logo = organization.logo.lastOrNull()?.mediaType(),
                 hashtag = organization.twitter_hashtag,
             )
         }

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/clics/model/ClicsOrganisationInfo.kt b/src/cds/src/main/kotlin/org/icpclive/cds/clics/model/ClicsOrganisationInfo.kt
@@ -1,9 +1,11 @@
 package org.icpclive.cds.clics.model
 
+import org.icpclive.api.MediaType
+
 internal data class ClicsOrganisationInfo(
     val id: String,
     val name: String,
     val formalName: String,
-    val logo: String?,
+    val logo: MediaType?,
     val hashtag: String?
 )
diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/cms/CmsDataSoruce.kt b/src/cds/src/main/kotlin/org/icpclive/cds/cms/CmsDataSoruce.kt
@@ -60,7 +60,8 @@ internal class CmsDataSource(val settings: CmsSettings) : FullReloadContestDataS
             OrganizationInfo(
                 cdsId = k,
                 displayName = v.name,
-                fullName = v.name
+                fullName = v.name,
+                logo = MediaType.Photo(settings.url)
             )
         }
         val teams = usersLoader.load().map {(k, v) ->

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/ejudge/EjudgeDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/ejudge/EjudgeDataSource.kt
@@ -42,7 +42,7 @@ internal class EjudgeDataSource(val settings: EjudgeSettings) : FullReloadContes
                 fullName = participantName,
                 displayName = participantName,
                 contestSystemId = participant.getAttribute("id"),
-                groups = listOf(),
+                groups = emptyList(),
                 hashTag = null,
                 medias = emptyMap(),
                 isOutOfContest = false,

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/pcms/PCMSDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/pcms/PCMSDataSource.kt
@@ -84,7 +84,7 @@ internal class PCMSDataSource(val settings: PCMSSettings) : FullReloadContestDat
                 freezeTime = freezeTime,
                 problemList = problems,
                 teamList = teams,
-                groupList = teams.flatMap { it.groups }.distinct().map { GroupInfo(it, isHidden = false, isOutOfContest = false) },
+                groupList = teams.flatMap { it.groups }.distinct().map { GroupInfo(it, it, isHidden = false, isOutOfContest = false, awardsGroupChampion = true) },
                 organizationList = emptyList(),
                 penaltyRoundingMode = when (resultType) {
                     ContestResultType.IOI -> PenaltyRoundingMode.ZERO

diff --git a/src/cds/src/main/kotlin/org/icpclive/cds/testsys/TestSysDataSource.kt b/src/cds/src/main/kotlin/org/icpclive/cds/testsys/TestSysDataSource.kt
@@ -48,7 +48,7 @@ internal class TestSysDataSource(val settings: TestSysSettings) : FullReloadCont
                 fullName = name,
                 displayName = name,
                 contestSystemId = id,
-                groups = listOf(),
+                groups = emptyList(),
                 hashTag = null,
                 medias = emptyMap(),
                 isOutOfContest = false,

diff --git a/src/cds/src/main/kotlin/org/icpclive/scoreboard/AbstractScoreboardCalculator.kt b/src/cds/src/main/kotlin/org/icpclive/scoreboard/AbstractScoreboardCalculator.kt
@@ -33,7 +33,7 @@ internal abstract class AbstractScoreboardCalculator : ScoreboardCalculator {
         val awards = buildMap<Award, MutableSet<Int>> {
             put(Award.Winner, mutableSetOf())
             info.medals.forEach { put(Award.Medal(it.name), mutableSetOf()) }
-            info.groupList.forEach { if (it.awardsGroupChampion) put(Award.GroupChampion(it.name), mutableSetOf()) }
+            info.groupList.forEach { if (it.awardsGroupChampion) put(Award.GroupChampion(it.cdsId), mutableSetOf()) }
         }
         val order = order_.map { it.first }
         val ranks = MutableList(order.size) { 0 }