add content

server/build.gradle

@@ -18,6 +18,7 @@ dependencies {
     api project(":postssystem.features.auth.server")
     api project(":postssystem.features.roles.server")
     api project(":postssystem.features.roles.manager.server")
+    api project(":postssystem.features.content.server")
     api "io.ktor:ktor-server-netty:$ktor_version"
     api "io.ktor:ktor-websockets:$ktor_version"
     api "org.jetbrains.exposed:exposed-jdbc:$kotlin_exposed_version"

server/src/main/java/dev/inmo/postssystem/server/DI.kt

@@ -3,8 +3,6 @@ package dev.inmo.postssystem.server
 import dev.inmo.postssystem.features.auth.server.AuthenticationRoutingConfigurator
 import dev.inmo.postssystem.features.auth.server.SessionAuthenticationConfigurator
 import dev.inmo.postssystem.features.auth.server.tokens.*
-import dev.inmo.postssystem.features.common.common.getAllDistinct
-import dev.inmo.postssystem.features.common.common.singleWithBinds
 import dev.inmo.postssystem.features.common.server.sessions.ApplicationAuthenticationConfigurator
 import dev.inmo.postssystem.features.files.common.*
 import dev.inmo.postssystem.features.files.common.storage.*
@@ -21,10 +19,15 @@ import dev.inmo.postssystem.features.status.server.StatusRoutingConfigurator
 import dev.inmo.postssystem.features.users.common.ExposedUsersStorage
 import dev.inmo.postssystem.features.users.server.UsersStorageServerRoutesConfigurator
 import dev.inmo.micro_utils.coroutines.LinkedSupervisorScope
+import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
+import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.configurators.*
 import dev.inmo.micro_utils.ktor.server.createKtorServer
 import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo
+import dev.inmo.postssystem.features.common.common.*
+import dev.inmo.postssystem.features.content.common.ContentSerializersModuleConfigurator
+import dev.inmo.postssystem.features.content.common.OtherContentSerializerModuleConfigurator
 import io.ktor.application.featureOrNull
 import io.ktor.application.log
 import io.ktor.routing.Route
@@ -33,8 +36,11 @@ import io.ktor.server.engine.ApplicationEngine
 import io.ktor.server.netty.Netty
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.serialization.BinaryFormat
 import kotlinx.serialization.StringFormat
+import kotlinx.serialization.cbor.Cbor
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.SerializersModule
 import org.jetbrains.exposed.sql.Database
 import org.koin.core.module.Module
 import org.koin.core.parameter.ParametersHolder
@@ -54,21 +60,36 @@ fun getDIModule(
     vararg args: String,
     baseScope: CoroutineScope = CoroutineScope(Dispatchers.IO)
 ): Module {
-    val json = Json {
+    val configJson = Json {
         ignoreUnknownKeys = true
     }
-    val config = json.decodeFromString(Config.serializer(), File(args.first()).readText())
+    val config = configJson.decodeFromString(Config.serializer(), File(args.first()).readText())
 
     val originalFilesMetasKeyValueRepoQualifier = StringQualifier("OriginalFilesMetaKV")
     val filesMetasKeyValueRepoQualifier = StringQualifier("FilesMetaKV")
     val filesFolderQualifier = StringQualifier("filesFolder")
-    val reviewVersionsQualifier = StringQualifier("reviewVersions")
-    val releaseVersionsQualifier = StringQualifier("releaseVersions")
     val usersRolesKeyValueFactoryQualifier = StringQualifier("usersRolesKeyValueFactory")
 
     return module {
-        single { json }
+        singleWithRandomQualifier<ContentSerializersModuleConfigurator.Element> { OtherContentSerializerModuleConfigurator }
+        singleWithRandomQualifier<SerializersModuleConfigurator.Element> { ContentSerializersModuleConfigurator(getAll()) }
+        single { SerializersModuleConfigurator(getAll()) }
+
+        single {
+            Json {
+                ignoreUnknownKeys = true
+                serializersModule = SerializersModule { get<SerializersModuleConfigurator>().apply { invoke() } }
+            }
+        }
         single<StringFormat> { get<Json>() }
+        single<BinaryFormat> {
+            Cbor {
+                serializersModule = SerializersModule { get<SerializersModuleConfigurator>().apply { invoke() } }
+            }
+        }
+
+        single { UnifiedRouter(get()) }
+
         singleWithBinds { config }
         singleWithBinds { get<Config>().databaseConfig }
         singleWithBinds { get<Config>().authConfig }
@@ -111,11 +132,11 @@ fun getDIModule(
         factory<CoroutineScope> { baseScope.LinkedSupervisorScope() }
 
         // Routing configurators
-        singleWithBinds { FilesRoutingConfigurator(get(), null) }
+        singleWithBinds { FilesRoutingConfigurator(get(), null, get()) }
         singleWithBinds { StatusRoutingConfigurator }
-        singleWithBinds { UsersStorageServerRoutesConfigurator(get()) }
-        singleWithBinds { UsersRolesStorageReadServerRoutesConfigurator<UserRole>(get(), UserRoleSerializer) }
-        singleWithBinds { RolesManagerUsersRolesStorageServerRoutesConfigurator(get()) }
+        singleWithBinds { UsersStorageServerRoutesConfigurator(get(), get()) }
+        singleWithBinds { UsersRolesStorageReadServerRoutesConfigurator<UserRole>(get(), UserRoleSerializer, get()) }
+        singleWithBinds { RolesManagerUsersRolesStorageServerRoutesConfigurator(get(), get()) }
 
         singleWithBinds { ClientStaticRoutingConfiguration(get<Config>().clientStatic) }
         singleWithBinds {
@@ -137,7 +158,7 @@ fun getDIModule(
                 get()
             )
         }
-        singleWithBinds { AuthenticationRoutingConfigurator(get(), get()) }
+        singleWithBinds { AuthenticationRoutingConfigurator(get(), get(), get()) }
 
         if (config.debugMode) {
             single<ApplicationRoutingConfigurator.Element>(StringQualifier("Tracer")) { ApplicationRoutingConfigurator.Element {(this as Routing).trace { application.log.trace(it.buildText()) } } }