fix configuration variable for local indexing + invoke local + remote indexing

Author: kxmpxtxnt

challenges-service.example.json

@@ -1,7 +1,7 @@
 {
   "indexing": {
     "local": {
-      "paths": "./challenges/local/",
+      "path": "./challenges/local/",
       "updateOnChange": true,
       "updateTimePeriod": null
     },

src/main/kotlin/org/developerden/codosseum/ChallengesService.kt

@@ -5,6 +5,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.server.cio.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import org.developerden.codosseum.indexing.Indexed
 import kotlin.coroutines.CoroutineContext
 
 object ChallengesService {
@@ -15,6 +16,7 @@ object ChallengesService {
   val coroutineContext: CoroutineContext
     get() = Dispatchers.Default + job
 
+  val indexed: MutableSet<Indexed> = mutableSetOf()
 }
 
 fun main(args: Array<String>) = EngineMain.main(args)

src/main/kotlin/org/developerden/codosseum/ServiceConfiguration.kt

@@ -16,7 +16,7 @@ data class ServiceConfiguration(
 
     @Serializable
     data class Local(
-      val paths: String,
+      val path: String,
       val updateOnChange: Boolean = true,
       val updateTimePeriod: Long? = null
     )

src/main/kotlin/org/developerden/codosseum/indexing/Indexing.kt

@@ -1,5 +1,8 @@
 package org.developerden.codosseum.indexing
 
+import org.developerden.codosseum.ChallengesService
+import org.developerden.codosseum.ServiceConfiguration
+import org.developerden.codosseum.indexing.git.RemoteIndexing
 import java.nio.file.Path
 import kotlin.io.path.Path
 import kotlin.io.path.exists
@@ -22,8 +25,21 @@ abstract class Indexing<F> {
   }
 }
 
-
 data class Indexed(
   val schema: Path? = null,
   val challengeDirectory: Path,
-)
+)
+
+suspend fun indexChallenges(indexing: ServiceConfiguration.Indexing) {
+  indexing.remote.repositories.map {
+    ChallengesService.logger.debug { "Indexing repo '${it.name}'..." }
+    ChallengesService.indexed.addAll(RemoteIndexing.collectIndexedPaths(it))
+  }
+
+  ChallengesService.logger.debug { "Indexing local path '${indexing.local.path}'..." }
+  val localIndexing = object : Indexing<Path>() {
+    override suspend fun index(source: Path): Path = source
+  }
+
+  ChallengesService.indexed.addAll(localIndexing.collectIndexedPaths(Path(indexing.local.path)))
+}

src/main/kotlin/org/developerden/codosseum/indexing/git/RemoteIndexing.kt

@@ -10,7 +10,7 @@ import kotlin.io.path.createParentDirectories
 import kotlin.io.path.notExists
 import org.developerden.codosseum.indexing.git.Repository as GitSource
 
-class RemoteIndexing : Indexing<GitSource>() {
+object RemoteIndexing : Indexing<GitSource>() {
 
   override suspend fun index(source: GitSource): Path {
     val repositoryPath = Path("./challenges/git/${source.name}/")

src/main/kotlin/org/developerden/codosseum/server/Server.kt

@@ -9,22 +9,26 @@ import io.ktor.server.plugins.swagger.*
 import io.ktor.server.resources.*
 import io.ktor.server.routing.*
 import io.ktor.server.sse.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.contextual
 import org.developerden.codosseum.ChallengesService
 import org.developerden.codosseum.ServiceConfiguration
+import org.developerden.codosseum.indexing.indexChallenges
+import org.developerden.codosseum.serializers.UUIDSerializer
+import org.developerden.codosseum.serializers.ValidationErrorSerializer
 import org.developerden.codosseum.server.generated.sandkasten
 import org.developerden.codosseum.server.generated.templatespiler
 import org.developerden.codosseum.server.koin.FixedKoin
 import org.developerden.codosseum.server.routes.challenges.randomChallenge
 import org.developerden.codosseum.server.routes.event.EventBus
 import org.developerden.codosseum.server.routes.event.events
 import org.developerden.codosseum.server.routes.validation.validationSummary
-import org.developerden.codosseum.serializers.UUIDSerializer
-import org.developerden.codosseum.serializers.ValidationErrorSerializer
 import org.developerden.codosseum.validation.SolutionValidationService
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
@@ -74,12 +78,19 @@ fun Application.server() {
       single { sandkasten(json) }
       single { templatespiler(json) }
 
-      factory {
-        json.decodeFromStream<ServiceConfiguration>(
-          Paths.get(System.getenv()["CONFIGURATION_PATH"] ?: "./challenges-service.json").inputStream()
-        )
+      val configuration: ServiceConfiguration = json.decodeFromStream<ServiceConfiguration>(
+        Paths.get(System.getenv()["CONFIGURATION_PATH"] ?: "./challenges-service.json").inputStream()
+      )
+
+      runBlocking {
+        CoroutineScope(ChallengesService.coroutineContext).async {
+          indexChallenges(configuration.indexing)
+        }.await()
       }
 
+
+      single { configuration }
+
       singleOf(::EventBus)
       singleOf(::SolutionValidationService)