mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2024-12-02 15:00:08 +00:00
Compare commits
No commits in common. "04cf8c3d9a95e920763c7b0166ef480b9af7ff7f" and "b7966202678797c9e739e647821e01963d94ee2b" have entirely different histories.
04cf8c3d9a
...
b796620267
@ -1,11 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## 0.11.1
|
|
||||||
|
|
||||||
* `Repos`
|
|
||||||
* `Ktor`
|
|
||||||
* In `configureReadKeyValueRepoRoutes` and `configureReadKeyValuesRepoRoutes` configurators fixed requiring of `reversed` property
|
|
||||||
|
|
||||||
## 0.11.0
|
## 0.11.0
|
||||||
|
|
||||||
* `Versions`
|
* `Versions`
|
||||||
|
@ -14,5 +14,5 @@ crypto_js_version=4.1.1
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.11.1
|
version=0.11.0
|
||||||
android_code_version=125
|
android_code_version=124
|
||||||
|
@ -13,7 +13,6 @@ import io.ktor.http.content.streamProvider
|
|||||||
import io.ktor.server.application.call
|
import io.ktor.server.application.call
|
||||||
import io.ktor.server.request.receiveMultipart
|
import io.ktor.server.request.receiveMultipart
|
||||||
import io.ktor.server.response.respond
|
import io.ktor.server.response.respond
|
||||||
import io.ktor.server.response.respondText
|
|
||||||
import io.ktor.server.routing.Route
|
import io.ktor.server.routing.Route
|
||||||
import io.ktor.server.routing.post
|
import io.ktor.server.routing.post
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
@ -112,7 +111,7 @@ class TemporalFilesRoutingConfigurator(
|
|||||||
temporalFilesMutex.withLock {
|
temporalFilesMutex.withLock {
|
||||||
temporalFilesMap[fileId] = file
|
temporalFilesMap[fileId] = file
|
||||||
}
|
}
|
||||||
call.respondText(fileId.string)
|
call.respond(fileId.string)
|
||||||
launchSafelyWithoutExceptions { filesFlow.emit(fileId) }
|
launchSafelyWithoutExceptions { filesFlow.emit(fileId) }
|
||||||
} ?: call.respond(HttpStatusCode.BadRequest)
|
} ?: call.respond(HttpStatusCode.BadRequest)
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package dev.inmo.micro_utils.repos.ktor.client.crud
|
package dev.inmo.micro_utils.repos.ktor.client.crud
|
||||||
|
|
||||||
import dev.inmo.micro_utils.ktor.common.*
|
import dev.inmo.micro_utils.ktor.common.*
|
||||||
import dev.inmo.micro_utils.pagination.PaginationResult
|
|
||||||
import dev.inmo.micro_utils.repos.*
|
import dev.inmo.micro_utils.repos.*
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
import io.ktor.http.ContentType
|
import io.ktor.http.ContentType
|
||||||
@ -20,14 +19,14 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
|||||||
inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
|
inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
|
||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
|
objectTypeInfo: TypeInfo,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
noinline idSerializer: suspend (IdType) -> String
|
noinline idSerializer: suspend (IdType) -> String
|
||||||
) = KtorCRUDRepoClient(
|
) = KtorCRUDRepoClient(
|
||||||
KtorReadCRUDRepoClient(
|
KtorReadCRUDRepoClient(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
typeInfo<ObjectType>(),
|
objectTypeInfo,
|
||||||
typeInfo<PaginationResult<ObjectType>>(),
|
|
||||||
contentType,
|
contentType,
|
||||||
idSerializer
|
idSerializer
|
||||||
),
|
),
|
||||||
@ -42,17 +41,33 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
|
|||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
subpart: String,
|
subpart: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
|
objectTypeInfo: TypeInfo,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
noinline idSerializer: suspend (IdType) -> String
|
noinline idSerializer: suspend (IdType) -> String
|
||||||
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
||||||
buildStandardUrl(baseUrl, subpart),
|
buildStandardUrl(baseUrl, subpart),
|
||||||
httpClient,
|
httpClient,
|
||||||
|
objectTypeInfo,
|
||||||
contentType,
|
contentType,
|
||||||
idSerializer
|
idSerializer
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
|
||||||
|
baseUrl: String,
|
||||||
|
httpClient: HttpClient,
|
||||||
|
contentType: ContentType,
|
||||||
|
noinline idSerializer: suspend (IdType) -> String
|
||||||
|
) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
|
||||||
|
baseUrl,
|
||||||
|
httpClient,
|
||||||
|
typeInfo<ObjectType>(),
|
||||||
|
contentType,
|
||||||
|
idSerializer
|
||||||
|
)
|
||||||
|
|
||||||
inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
|
inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
|
||||||
baseUrl: String,
|
baseUrl: String,
|
||||||
httpClient: HttpClient,
|
httpClient: HttpClient,
|
||||||
|
@ -18,7 +18,6 @@ class KtorReadCRUDRepoClient<ObjectType, IdType> (
|
|||||||
private val baseUrl: String,
|
private val baseUrl: String,
|
||||||
private val httpClient: HttpClient,
|
private val httpClient: HttpClient,
|
||||||
private val objectType: TypeInfo,
|
private val objectType: TypeInfo,
|
||||||
private val paginationObjectType: TypeInfo,
|
|
||||||
private val contentType: ContentType,
|
private val contentType: ContentType,
|
||||||
private val idSerializer: suspend (IdType) -> String
|
private val idSerializer: suspend (IdType) -> String
|
||||||
) : ReadCRUDRepo<ObjectType, IdType> {
|
) : ReadCRUDRepo<ObjectType, IdType> {
|
||||||
@ -26,7 +25,7 @@ class KtorReadCRUDRepoClient<ObjectType, IdType> (
|
|||||||
buildStandardUrl(baseUrl, getByPaginationRouting, pagination.asUrlQueryParts)
|
buildStandardUrl(baseUrl, getByPaginationRouting, pagination.asUrlQueryParts)
|
||||||
) {
|
) {
|
||||||
contentType(contentType)
|
contentType(contentType)
|
||||||
}.body(paginationObjectType)
|
}.body()
|
||||||
|
|
||||||
override suspend fun getById(id: IdType): ObjectType? = httpClient.get(
|
override suspend fun getById(id: IdType): ObjectType? = httpClient.get(
|
||||||
buildStandardUrl(
|
buildStandardUrl(
|
||||||
@ -71,7 +70,6 @@ inline fun <reified ObjectType, IdType> KtorReadCRUDRepoClient(
|
|||||||
baseUrl,
|
baseUrl,
|
||||||
httpClient,
|
httpClient,
|
||||||
typeInfo<ObjectType>(),
|
typeInfo<ObjectType>(),
|
||||||
typeInfo<PaginationResult<ObjectType>>(),
|
|
||||||
contentType,
|
contentType,
|
||||||
idSerializer
|
idSerializer
|
||||||
)
|
)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
openapi: "3.0.0"
|
swagger: "2.0"
|
||||||
info:
|
info:
|
||||||
description: "This is a template for the KeyValue repositories from [microutils](https://github.com/InsanusMokrassar/MicroUtils/tree/master/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/value)"
|
description: "This is a template for the KeyValue repositories from [microutils](https://github.com/InsanusMokrassar/MicroUtils/tree/master/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/value)"
|
||||||
version: "0.11.1"
|
version: "0.11.0"
|
||||||
title: "KeyValue Repo"
|
title: "KeyValue Repo"
|
||||||
contact:
|
contact:
|
||||||
email: "ovsyannikov.alexey95@gmail.com"
|
email: "ovsyannikov.alexey95@gmail.com"
|
||||||
@ -11,46 +11,64 @@ tags:
|
|||||||
- name: "Write"
|
- name: "Write"
|
||||||
description: "Operations with `post` request in most cases"
|
description: "Operations with `post` request in most cases"
|
||||||
|
|
||||||
components:
|
|
||||||
parameters:
|
parameters:
|
||||||
KeyInQuery:
|
KeyInQuery:
|
||||||
in: "query"
|
in: "query"
|
||||||
name: "key"
|
name: "key"
|
||||||
schema:
|
allOf:
|
||||||
$ref: "#/components/schemas/Key"
|
- $ref: "#/definitions/Key"
|
||||||
|
KeysInBody:
|
||||||
|
in: "body"
|
||||||
|
name: "body"
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/definitions/Key"
|
||||||
|
ValuesInBody:
|
||||||
|
in: "body"
|
||||||
|
name: "body"
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/definitions/Value"
|
||||||
PaginationInQueryPage:
|
PaginationInQueryPage:
|
||||||
in: "query"
|
in: "query"
|
||||||
|
type: integer
|
||||||
name: "ppage"
|
name: "ppage"
|
||||||
description: "Page of pagination"
|
description: "Page of pagination"
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
required: false
|
required: false
|
||||||
PaginationInQuerySize:
|
PaginationInQuerySize:
|
||||||
in: "query"
|
in: "query"
|
||||||
|
type: integer
|
||||||
name: "psize"
|
name: "psize"
|
||||||
description: "Size of each page in pagination"
|
description: "Size of each page in pagination"
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
required: false
|
required: false
|
||||||
ReversedInQuery:
|
ReversedInQuery:
|
||||||
in: "query"
|
in: "query"
|
||||||
|
type: boolean
|
||||||
name: "reversed"
|
name: "reversed"
|
||||||
description: "If passed, will tell to reverse the result pages"
|
description: "If passed, will tell to reverse the result pages"
|
||||||
schema:
|
|
||||||
type: boolean
|
|
||||||
required: false
|
required: false
|
||||||
ValueInQuery:
|
ValueInQuery:
|
||||||
in: "query"
|
in: "query"
|
||||||
name: "value"
|
name: "value"
|
||||||
schema:
|
allOf:
|
||||||
$ref: "#/components/schemas/Value"
|
- $ref: "#/definitions/Value"
|
||||||
schemas:
|
MapInBody:
|
||||||
|
in: "body"
|
||||||
|
name: "body"
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/definitions/Map"
|
||||||
|
|
||||||
|
|
||||||
|
definitions:
|
||||||
Key:
|
Key:
|
||||||
type: integer
|
type: integer
|
||||||
description: "REWRITE THIS TYPE AS KEY IN SWAGGER FILE"
|
description: "REWRITE THIS TYPE AS KEY IN SWAGGER FILE"
|
||||||
Value:
|
Value:
|
||||||
type: integer
|
type: integer
|
||||||
description: "REWRITE THIS TYPE AS VALUE IN SWAGGER FILE"
|
description: "REWRITE THIS TYPE AS VALUE IN SWAGGER FILE"
|
||||||
|
Map:
|
||||||
|
type: object
|
||||||
|
description: "Map of objects"
|
||||||
PaginationResult:
|
PaginationResult:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
@ -75,16 +93,13 @@ paths:
|
|||||||
tags:
|
tags:
|
||||||
- "Read"
|
- "Read"
|
||||||
parameters:
|
parameters:
|
||||||
- allOf:
|
- $ref: "#/parameters/KeyInQuery"
|
||||||
- $ref: "#/components/parameters/KeyInQuery"
|
required: true
|
||||||
- required: true
|
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Element by key"
|
description: "Element by key"
|
||||||
content:
|
|
||||||
"*/*":
|
|
||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/Value"
|
$ref: "#/definitions/Value"
|
||||||
"204":
|
"204":
|
||||||
description: "No value by id"
|
description: "No value by id"
|
||||||
/values:
|
/values:
|
||||||
@ -92,55 +107,49 @@ paths:
|
|||||||
tags:
|
tags:
|
||||||
- "Read"
|
- "Read"
|
||||||
parameters:
|
parameters:
|
||||||
- $ref: "#/components/parameters/PaginationInQueryPage"
|
- $ref: "#/parameters/PaginationInQueryPage"
|
||||||
- $ref: "#/components/parameters/PaginationInQuerySize"
|
- $ref: "#/parameters/PaginationInQuerySize"
|
||||||
- $ref: "#/components/parameters/ReversedInQuery"
|
- $ref: "#/parameters/ReversedInQuery"
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Pagination with elements"
|
description: "Pagination with elements"
|
||||||
content:
|
|
||||||
"*/*":
|
|
||||||
schema:
|
schema:
|
||||||
allOf:
|
allOf:
|
||||||
- $ref: "#/components/schemas/PaginationResult"
|
- $ref: "#/definitions/PaginationResult"
|
||||||
- properties:
|
- properties:
|
||||||
results:
|
results:
|
||||||
items:
|
items:
|
||||||
$ref: "#/components/schemas/Value"
|
$ref: "#/definitions/Value"
|
||||||
/keys:
|
/keys:
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
- "Read"
|
- "Read"
|
||||||
parameters:
|
parameters:
|
||||||
- $ref: "#/components/parameters/PaginationInQueryPage"
|
- $ref: "#/parameters/PaginationInQueryPage"
|
||||||
- $ref: "#/components/parameters/PaginationInQuerySize"
|
- $ref: "#/parameters/PaginationInQuerySize"
|
||||||
- $ref: "#/components/parameters/ReversedInQuery"
|
- $ref: "#/parameters/ReversedInQuery"
|
||||||
- $ref: "#/components/parameters/ValueInQuery"
|
- $ref: "#/parameters/ValueInQuery"
|
||||||
required: false
|
required: false
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Pagination with elements"
|
description: "Pagination with elements"
|
||||||
content:
|
|
||||||
"*/*":
|
|
||||||
schema:
|
schema:
|
||||||
allOf:
|
allOf:
|
||||||
- $ref: "#/components/schemas/PaginationResult"
|
- $ref: "#/definitions/PaginationResult"
|
||||||
- properties:
|
- properties:
|
||||||
results:
|
results:
|
||||||
items:
|
items:
|
||||||
$ref: "#/components/schemas/Key"
|
$ref: "#/definitions/Key"
|
||||||
/contains:
|
/contains:
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
- "Read"
|
- "Read"
|
||||||
parameters:
|
parameters:
|
||||||
- $ref: "#/components/parameters/KeyInQuery"
|
- $ref: "#/parameters/KeyInQuery"
|
||||||
required: true
|
required: true
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Object with id availability in repo"
|
description: "Object with id availability in repo"
|
||||||
content:
|
|
||||||
"*/*":
|
|
||||||
schema:
|
schema:
|
||||||
type: boolean
|
type: boolean
|
||||||
/count:
|
/count:
|
||||||
@ -150,8 +159,6 @@ paths:
|
|||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Amount of objects in repo"
|
description: "Amount of objects in repo"
|
||||||
content:
|
|
||||||
"*/*":
|
|
||||||
schema:
|
schema:
|
||||||
type: integer
|
type: integer
|
||||||
|
|
||||||
@ -160,13 +167,11 @@ paths:
|
|||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
- "Write"
|
- "Write"
|
||||||
requestBody:
|
parameters:
|
||||||
content:
|
- allOf:
|
||||||
"*/*":
|
- $ref: "#/parameters/MapInBody"
|
||||||
schema:
|
- additionalProperties:
|
||||||
type: object
|
$ref: "#/definitions/Value"
|
||||||
additionalProperties:
|
|
||||||
$ref: "#/components/schemas/Value"
|
|
||||||
description: "Map with new elements to set. Use keys as a keys of this map"
|
description: "Map with new elements to set. Use keys as a keys of this map"
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
@ -175,13 +180,8 @@ paths:
|
|||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
- "Write"
|
- "Write"
|
||||||
requestBody:
|
parameters:
|
||||||
content:
|
- $ref: "#/parameters/KeysInBody"
|
||||||
"*/*":
|
|
||||||
schema:
|
|
||||||
type: array
|
|
||||||
items:
|
|
||||||
$ref: "#/components/schemas/Key"
|
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Objects with keys from body has been unset"
|
description: "Objects with keys from body has been unset"
|
||||||
@ -189,13 +189,8 @@ paths:
|
|||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
- "Write"
|
- "Write"
|
||||||
requestBody:
|
parameters:
|
||||||
content:
|
- $ref: "#/parameters/ValuesInBody"
|
||||||
"*/*":
|
|
||||||
schema:
|
|
||||||
type: array
|
|
||||||
items:
|
|
||||||
$ref: "#/components/schemas/Value"
|
|
||||||
responses:
|
responses:
|
||||||
"200":
|
"200":
|
||||||
description: "Objects with values from body has been unset"
|
description: "Objects with values from body has been unset"
|
||||||
|
@ -51,7 +51,7 @@ inline fun <reified Key, reified Value> Route.configureReadKeyValueRepoRoutes (
|
|||||||
|
|
||||||
get(keysRoute) {
|
get(keysRoute) {
|
||||||
val pagination = call.request.queryParameters.extractPagination
|
val pagination = call.request.queryParameters.extractPagination
|
||||||
val reversed = call.getQueryParameter(reversedParameterName) ?.toBoolean() ?: false
|
val reversed = call.getQueryParameterOrSendError(reversedParameterName) ?.toBoolean() ?: false
|
||||||
val value = call.getQueryParameter(valueParameterName) ?.let {
|
val value = call.getQueryParameter(valueParameterName) ?.let {
|
||||||
valueDeserializer(it)
|
valueDeserializer(it)
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ inline fun <reified Key, reified Value> Route.configureReadKeyValuesRepoRoutes (
|
|||||||
|
|
||||||
get(keysRoute) {
|
get(keysRoute) {
|
||||||
val pagination = call.request.queryParameters.extractPagination
|
val pagination = call.request.queryParameters.extractPagination
|
||||||
val reversed = call.getQueryParameter(reversedParameterName) ?.toBoolean() ?: false
|
val reversed = call.getQueryParameterOrSendError(reversedParameterName) ?.toBoolean() ?: false
|
||||||
val value = call.getQueryParameter(valueParameterName) ?.let {
|
val value = call.getQueryParameter(valueParameterName) ?.let {
|
||||||
valueDeserializer(it)
|
valueDeserializer(it)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user