Merge pull request #511 from JetBrains/sessionize-video-url

Populate video recording URLs from Sessionize data

Author: zsmb13

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/di/ServiceModule.kt

@@ -3,13 +3,11 @@ package org.jetbrains.kotlinconf.backend.di
 import org.jetbrains.kotlinconf.backend.services.NewsService
 import org.jetbrains.kotlinconf.backend.services.SessionizeService
 import org.jetbrains.kotlinconf.backend.services.TimeService
-import org.jetbrains.kotlinconf.backend.services.VideoUrlService
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val serviceModule = module {
     singleOf(::TimeService)
     singleOf(::NewsService)
-    singleOf(::VideoUrlService)
     singleOf(::SessionizeService)
-}
+}

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/model/SessionizeData.kt

@@ -32,7 +32,9 @@ data class SessionData(
     val title: String,
     val roomId: Int?,
     val questionAnswers: List<QuestionAnswerData> = emptyList(),
-    val categoryItems: List<Int> = emptyList()
+    val categoryItems: List<Int> = emptyList(),
+    val liveUrl: String? = null,
+    val recordingUrl: String? = null,
 ) {
     val displayTitle: String = title.trim()
 

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/services/NewsService.kt

@@ -17,8 +17,8 @@ import org.slf4j.LoggerFactory
 
 class NewsService(private val client: HttpClient, config: ConferenceConfig): Closeable {
     private val log = LoggerFactory.getLogger("NewsService")
-    private val repo: String = config.dataRepo
-    private val branch: String = config.dataBranch
+    private val repo: String = config.newsRepo
+    private val branch: String = config.newsBranch
     private val folder: String = config.newsFolder
     private val updateInterval = config.sessionizeInterval
 
@@ -132,4 +132,4 @@ class NewsService(private val client: HttpClient, config: ConferenceConfig): Clo
     override fun close() {
         syncJob.cancel()
     }
-}
+}

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/services/SessionizeService.kt

@@ -5,6 +5,7 @@ package org.jetbrains.kotlinconf.backend.services
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsText
 import io.ktor.utils.io.core.Closeable
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
@@ -16,7 +17,6 @@ import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.kotlinconf.Conference
 import org.jetbrains.kotlinconf.EVENT_TIME_ZONE
 import org.jetbrains.kotlinconf.Session
-import org.jetbrains.kotlinconf.SessionId
 import org.jetbrains.kotlinconf.Speaker
 import org.jetbrains.kotlinconf.backend.model.CategoryItemData
 import org.jetbrains.kotlinconf.backend.model.SessionizeData
@@ -27,7 +27,6 @@ import kotlin.time.ExperimentalTime
 
 class SessionizeService(
     private val client: HttpClient,
-    private val videoUrlService: VideoUrlService,
     config: ConferenceConfig
 ): Closeable {
     private val conference = MutableSharedFlow<Conference>(replay = 1)
@@ -55,10 +54,9 @@ class SessionizeService(
     suspend fun synchronizeWithSessionize(
         sessionizeUrl: String,
     ) {
-        val sessionizeData = client.get(sessionizeUrl).body<SessionizeData>()
-        val videoUrls = videoUrlService.getVideoUrls()
-
-        val updatedValue = sessionizeData.toConference(videoUrls)
+        val updatedValue = client.get(sessionizeUrl)
+            .body<SessionizeData>()
+            .toConference()
 
         conference.emit(updatedValue)
     }
@@ -72,7 +70,7 @@ class SessionizeService(
 
     suspend fun getConferenceData(): Conference = conference.first()
 
-    private fun SessionizeData.toConference(videoUrls: Map<SessionId, String>): Conference {
+    private fun SessionizeData.toConference(): Conference {
         val tags: Map<Int, CategoryItemData> = categories
             .flatMap { it.items }
             .associateBy { it.id }
@@ -87,15 +85,15 @@ class SessionizeService(
             if ("Interview" in tags) return@mapNotNull null
 
             Session(
-                it.id,
-                it.displayTitle,
-                it.descriptionText ?: "",
-                it.speakers,
-                (it.roomId?.let<Int, String> { findRoom(it) } ?: "unknown").removeSuffix(" (Lightning talks)"),
-                startsAt.toLocalDateTime(EVENT_TIME_ZONE),
-                endsAt.toLocalDateTime(EVENT_TIME_ZONE),
-                tags,
-                videoUrls[it.id]
+                id = it.id,
+                title = it.displayTitle,
+                description = it.descriptionText ?: "",
+                speakerIds = it.speakers,
+                location = (it.roomId?.let<Int, String> { findRoom(it) } ?: "unknown").removeSuffix(" (Lightning talks)"),
+                startsAt = startsAt.toLocalDateTime(EVENT_TIME_ZONE),
+                endsAt = endsAt.toLocalDateTime(EVENT_TIME_ZONE),
+                tags = tags,
+                videoUrl = it.recordingUrl
             )
         }.mergeWorkshops()
 
@@ -131,8 +129,7 @@ class SessionizeService(
                 first.location,
                 startTime,
                 endTime,
-                first.tags,
-                first.videoUrl
+                first.tags
             )
         }
 

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/services/VideoUrlService.kt

@@ -9,8 +9,7 @@ class ConferenceConfig(config: ApplicationConfig) {
 
     val adminSecret: String = config.property("service.secret").getString()
 
-    val dataRepo: String = config.property("data.repo").getString()
-    val dataBranch: String = config.property("data.branch").getString()
-    val newsFolder: String = config.property("data.newsFolder").getString()
-    val videosFolder: String = config.property("data.videosFolder").getString()
-}
+    val newsRepo: String = config.property("news.repo").getString()
+    val newsBranch: String = config.property("news.branch").getString()
+    val newsFolder: String = config.property("news.folder").getString()
+}

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/utils/ConferenceConfig.kt

@@ -14,11 +14,10 @@ sessionize:
     imagesUrl: "https://sessionize.com/image/"
     interval: 60
 
-data:
+news:
     repo: "JetBrains/kotlinconf-app"
     branch: "main"
-    newsFolder: "data/news"
-    videosFolder: "data/videos"
+    folder: "news"
 
 database:
     host: "$DB0_HOST:"

backend/src/main/resources/application.yaml

@@ -14,11 +14,10 @@ sessionize:
     imagesUrl: "https://sessionize.com/image/"
     interval: 60
 
-data:
+news:
     repo: "JetBrains/kotlinconf-app"
-    branch: "backend-video-urls"
-    newsFolder: "data/news"
-    videosFolder: "data/videos"
+    branch: "e5l/news"
+    folder: "news"
 
 database:
     host: "$DB0_HOST:"