PostsSystem/core
1
0
Fork 0
Code Issues Pull Requests1 Projects Releases Wiki Activity

fixes of todos

Browse Source
This commit is contained in:
InsanusMokrassar
2020-08-26 11:32:11 +06:00
parent 01ab884e68
commit 83fd9f264a
6 changed files with 74 additions and 53 deletions
ktor
common
src
commonMain
kotlin
com
insanusmokrassar
postssystem
ktor
HexConversations.kt
server
src
jvmMain
kotlin
com
insanusmokrassar
postssystem
ktor
server
ServerRoutingShortcuts.kt
utils/repos/ktor
client
src
commonMain
kotlin
com
insanusmokrassar
postssystem
utils
repos
ktor
client
KtorOneToManyKeyValueRepo.ktKtorReadStandardCrudRepo.kt
server
src
jvmMain
kotlin
com
insanusmokrassar
postssystem
utils
repos
ktor
server
KtorOneToManyKeyValueRepo.ktKtorReadStandardCrudRepo.kt

18
utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/KtorOneToManyKeyValueRepo.kt

@ -1,11 +1,9 @@
package com.insanusmokrassar.postssystem.utils.repos.ktor.client
import com.insanusmokrassar.postssystem.ktor.asUrlQueryParts
import com.insanusmokrassar.postssystem.ktor.buildStandardUrl
import com.insanusmokrassar.postssystem.ktor.*
import com.insanusmokrassar.postssystem.ktor.client.BodyPair
import com.insanusmokrassar.postssystem.ktor.client.uniget
import com.insanusmokrassar.postssystem.ktor.client.unipost
import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat
import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination
import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
import com.insanusmokrassar.postssystem.utils.repos.OneToManyKeyValueRepo
@ -31,8 +29,8 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
baseUrl,
getRoute,
mapOf(
keyParameterName to standardKtorSerialFormat.encodeToHexString(keySerializer, k),
reversedParameterName to standardKtorSerialFormat.encodeToHexString(reversed)
keyParameterName to k.toHex(keySerializer),
reversedParameterName to reversed.toHex(Boolean.serializer())
) + pagination.asUrlQueryParts
),
paginationValueResultSerializer
@ -43,7 +41,7 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
baseUrl,
keysRoute,
mapOf(
reversedParameterName to standardKtorSerialFormat.encodeToHexString(reversed)
reversedParameterName to reversed.toHex(Boolean.serializer())
) + pagination.asUrlQueryParts
),
paginationKeyResultSerializer
@ -53,7 +51,7 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
buildStandardUrl(
baseUrl,
containsByKeyRoute,
mapOf(keyParameterName to standardKtorSerialFormat.encodeToHexString(keySerializer, k))
mapOf(keyParameterName to k.toHex(keySerializer))
),
Boolean.serializer()
)
@ -63,8 +61,8 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
baseUrl,
containsByKeyValueRoute,
mapOf(
keyParameterName to standardKtorSerialFormat.encodeToHexString(keySerializer, k),
valueParameterName to standardKtorSerialFormat.encodeToHexString(valueSerializer, v),
keyParameterName to k.toHex(keySerializer),
valueParameterName to v.toHex(valueSerializer),
)
),
Boolean.serializer()
@ -75,7 +73,7 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
baseUrl,
countByKeyRoute,
mapOf(
keyParameterName to standardKtorSerialFormat.encodeToHexString(keySerializer, k) // TODO: Леша, придумай короче запись, типа keySerializer.toHexString(k)
keyParameterName to k.toHex(keySerializer)
)
),
Long.serializer()

4
utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/KtorReadStandardCrudRepo.kt

@ -30,7 +30,7 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
baseUrl,
getByIdRouting,
mapOf(
"id" to standardKtorSerialFormat.encodeToHexString(idsSerializer, id)
"id" to id.toHex(idsSerializer)
)
),
objectsSerializerNullable
@ -41,7 +41,7 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
baseUrl,
containsRouting,
mapOf(
"id" to standardKtorSerialFormat.encodeToHexString(idsSerializer, id)
"id" to id.toHex(idsSerializer)
)
),
Boolean.serializer()