Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

M5l5 graph db #33

Merged
merged 194 commits into from
Nov 16, 2023
Merged

M5l5 graph db #33

merged 194 commits into from
Nov 16, 2023

Conversation

svok
Copy link
Member

@svok svok commented Nov 3, 2023

No description provided.

svok and others added 30 commits January 8, 2023 19:59
@svok
m2l1 Маркетинговые и аналитические документы
27d24e6
add m1l3-oop module
3aabe46
number test files
85f54e9
Fix numbering
cf38e25
@svok
Merge pull request #1 from otuskotlin/add-m1l3-oop
3f9081a 
add m1l3-oop module
@svok
Merge remote-tracking branch 'origin/master' into m2l1-marketing
982d908
@svok
m2l1 fixes
ac07536
@svok
Fix gitignore and git cache clean up
865d418
@svok
Merge remote-tracking branch 'origin/master' into m2l1-marketing
87fa74d
@BarracudaPff
[m1l4-dsl] add dsl source code
86fcbcc
@BarracudaPff
[m1l4-dsl] improve project structure, upd kotlin to 1.8 version
51c13a1
@svok
m2l1 Readme
480aae5
@svok
Merge remote-tracking branch 'origin/m1l4-dsl' into m2l1-marketing
d4d7fc4 
# Conflicts:
#	README.md
@svok
m2l1 Добавлены пользовательские истории
960730f
@BarracudaPff
Merge pull request #2 from otuskotlin/m1l4-dsl
b2eb9f3 
M1l4 dsl
@svok
Merge remote-tracking branch 'origin/master' into m2l1-marketing
7111ef7
@Top4IkRu
Module 1, lecture 5: Coroutines
6f7a5f7
@Top4IkRu
Merge branch 'master' into m1l5-coroutines
6e85256 
# Conflicts:
#	gradle.properties
#	settings.gradle.kts
@Top4IkRu
Merge pull request #3 from otuskotlin/m1l5-coroutines
b5da204 
M1l5 coroutines
@Top4IkRu
Update README.md
b43e78d
@Top4IkRu
Merge pull request #4 from otuskotlin/fix-readme
4f8ac5e 
Update README.md
@svok
Merge remote-tracking branch 'origin/master' into m2l1-marketing
703a730 
# Conflicts:
#	README.md
@svok
m2l1 Эксп. с таблицами
17ff9d2
@svok
m2l1 Конкуренция, экономика, пользовательские истории
9399651
Add KMP part.
1902a8b
@evgnep
m1l6 - sequence, flow
8634d96
Add some TODOs for KMP part.
43db577
Add TODOs + Native example.
1ec8c80
@svok
Merge pull request #6 from otuskotlin/add-m1l7-kmp
54e991c 
Add m1l7 kmp
@evgnep
m1l6 - мелкие правки
4d7f855
svok added 29 commits May 13, 2023 10:07
@svok
Merge remote-tracking branch 'origin/m5l4-cassandra-init' into m5l5-g…
eace141 
…raph-db

# Conflicts:
#	gradle.properties
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	settings.gradle.kts
@svok
Merge remote-tracking branch 'origin/master' into m5l5-graph-db
87addc1 
# Conflicts:
#	README.md
#	gradle.properties
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/getDatabaseConf.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDadtabaseConf.kt
#	ok-marketplace-app-ktor/src/nativeMain/kotlin/plugins/getDadtabaseConf.kt
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	settings.gradle.kts
@svok
m5l5 Fix docker
738ac70
@svok
m5l5 Fix docker
ac009f1
@svok
m5l5 Fix dependencies
f5ef150
@svok
Merge remote-tracking branch 'old/m5l2' into m5l2-concurrent-db
3f4a606 
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/test.yml
#	.gitignore
#	README.md
#	build.gradle.kts
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	m1l3-oop/src/test/kotlin/01-cashTest.kt
#	m1l3-oop/src/test/kotlin/05-delegationTest.kt
#	m1l3-oop/src/test/kotlin/exercise1KtTest.kt
#	m1l5-coroutines/build.gradle.kts
#	m1l7-kmp/build.gradle.kts
#	m1l7-kmp/src/commonMain/kotlin/ApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/Logger.kt
#	m1l7-kmp/src/commonMain/kotlin/Service.kt
#	m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt
#	m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/UserTest.kt
#	m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/jsMain/kotlin/Logger.kt
#	m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt
#	m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt
#	m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt
#	m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt
#	m1l7-kmp/src/jvmMain/kotlin/UtilName.kt
#	m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt
#	m1l7-kmp/src/nativeInterop/cinterop/libcurl.def
#	m1l7-kmp/src/nativeMain/kotlin/Main.kt
#	m2l3-testing/build.gradle.kts
#	ok-marketplace-api-log1/build.gradle.kts
#	ok-marketplace-api-v1-jackson/build.gradle.kts
#	ok-marketplace-api-v2-kmp/build.gradle.kts
#	ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt
#	ok-marketplace-app-kafka/build.gradle.kts
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt
#	ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt
#	ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg
#	ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt
#	ok-marketplace-app-rabbit/build.gradle.kts
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt
#	ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt
#	ok-marketplace-app-serverless/build.gradle.kts
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt
#	ok-marketplace-app-spring/build.gradle.kts
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt
#	ok-marketplace-biz/build.gradle.kts
#	ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt
#	ok-marketplace-biz/src/commonTest/kotlin/repo/BizRepoDeleteTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/repo/BizRepoUpdateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt
#	ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadId.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadTitle.kt
#	ok-marketplace-common/build.gradle.kts
#	ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt
#	ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt
#	ok-marketplace-common/src/commonMain/kotlin/repo/DbAdIdRequest.kt
#	ok-marketplace-lib-cor/build.gradle.kts
#	ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt
#	ok-marketplace-lib-logging-common/build.gradle.kts
#	ok-marketplace-lib-logging-kermit/build.gradle.kts
#	ok-marketplace-mappers-log1/build.gradle.kts
#	ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt
#	ok-marketplace-mappers-v2/build.gradle.kts
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt
#	ok-marketplace-repo-in-memory/build.gradle.kts
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/model/AdEntity.kt
#	ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt
#	ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryUpdateTest.kt
#	ok-marketplace-repo-stubs/build.gradle.kts
#	ok-marketplace-repo-tests/build.gradle.kts
#	ok-marketplace-repo-tests/src/commonMain/kotlin/BaseInitAds.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdCreateTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt
#	ok-marketplace-stubs/build.gradle.kts
#	ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt
#	settings.gradle.kts
#	specs/specs-ad-log.yaml
#	specs/specs-ad-v2.yaml
@svok
m5l2 Добавление блокировки в репозиторий
3d37bf9
@svok
Merge remote-tracking branch 'old/m5l3-fix' into m5l3-sql
69ac2f3 
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/test.yml
#	.gitignore
#	README.md
#	build.gradle.kts
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	m1l3-oop/src/test/kotlin/01-cashTest.kt
#	m1l3-oop/src/test/kotlin/05-delegationTest.kt
#	m1l3-oop/src/test/kotlin/exercise1KtTest.kt
#	m1l5-coroutines/build.gradle.kts
#	m1l7-kmp/build.gradle.kts
#	m1l7-kmp/src/commonMain/kotlin/ApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/Logger.kt
#	m1l7-kmp/src/commonMain/kotlin/Service.kt
#	m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt
#	m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/UserTest.kt
#	m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/jsMain/kotlin/Logger.kt
#	m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt
#	m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt
#	m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt
#	m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt
#	m1l7-kmp/src/jvmMain/kotlin/UtilName.kt
#	m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt
#	m1l7-kmp/src/nativeInterop/cinterop/libcurl.def
#	m1l7-kmp/src/nativeMain/kotlin/Main.kt
#	m2l3-testing/build.gradle.kts
#	ok-marketplace-api-log1/build.gradle.kts
#	ok-marketplace-api-v1-jackson/build.gradle.kts
#	ok-marketplace-api-v2-kmp/build.gradle.kts
#	ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt
#	ok-marketplace-app-kafka/build.gradle.kts
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt
#	ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt
#	ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg
#	ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt
#	ok-marketplace-app-rabbit/build.gradle.kts
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt
#	ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt
#	ok-marketplace-app-serverless/build.gradle.kts
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt
#	ok-marketplace-app-spring/Dockerfile
#	ok-marketplace-app-spring/build.gradle.kts
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt
#	ok-marketplace-app-spring/src/main/resources/application.yml
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/ApplicationTests.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt
#	ok-marketplace-biz/build.gradle.kts
#	ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt
#	ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt
#	ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt
#	ok-marketplace-common/build.gradle.kts
#	ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt
#	ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt
#	ok-marketplace-common/src/commonMain/kotlin/repo/DbAdResponse.kt
#	ok-marketplace-lib-cor/build.gradle.kts
#	ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt
#	ok-marketplace-lib-logging-common/build.gradle.kts
#	ok-marketplace-lib-logging-kermit/build.gradle.kts
#	ok-marketplace-mappers-log1/build.gradle.kts
#	ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt
#	ok-marketplace-mappers-v2/build.gradle.kts
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt
#	ok-marketplace-repo-in-memory/build.gradle.kts
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt
#	ok-marketplace-repo-stubs/build.gradle.kts
#	ok-marketplace-repo-tests/build.gradle.kts
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt
#	ok-marketplace-stubs/build.gradle.kts
#	ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt
#	settings.gradle.kts
#	specs/specs-ad-log.yaml
#	specs/specs-ad-v2.yaml
@svok
m5l3 Исправления, связанные с SQL
861d7cc
@svok
m5l3 Исправления, связанные с SQL: удален лишний from с дублирующимся…
a657378 
… кодом
@svok
m5l3 Исправления, связанные с SQL: мелкие правки
bb8bd20
@svok
m5l3 Исправления, связанные с SQL: Вынесено соединение из синглтона в…
5bb05a9 
… репозиторий
@svok
m5l3 Исправления, связанные с SQL: удаление дебажных вставок
cfcdd19
@svok
m5l3 Исправления, связанные с SQL: заменил тип description на text в …
f4cf8d4 
…схеме PG.
@svok
Merge remote-tracking branch 'old/m5l4-cassandra' into main
830e797 
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/test.yml
#	.gitignore
#	README.md
#	build.gradle.kts
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	m1l3-oop/src/test/kotlin/01-cashTest.kt
#	m1l3-oop/src/test/kotlin/05-delegationTest.kt
#	m1l3-oop/src/test/kotlin/exercise1KtTest.kt
#	m1l5-coroutines/build.gradle.kts
#	m1l7-kmp/build.gradle.kts
#	m1l7-kmp/src/commonMain/kotlin/ApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/Logger.kt
#	m1l7-kmp/src/commonMain/kotlin/Service.kt
#	m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt
#	m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/UserTest.kt
#	m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/jsMain/kotlin/Logger.kt
#	m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt
#	m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt
#	m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt
#	m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt
#	m1l7-kmp/src/jvmMain/kotlin/UtilName.kt
#	m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt
#	m1l7-kmp/src/nativeInterop/cinterop/libcurl.def
#	m1l7-kmp/src/nativeMain/kotlin/Main.kt
#	m2l3-testing/build.gradle.kts
#	ok-marketplace-api-log1/build.gradle.kts
#	ok-marketplace-api-v1-jackson/build.gradle.kts
#	ok-marketplace-api-v2-kmp/build.gradle.kts
#	ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt
#	ok-marketplace-app-kafka/build.gradle.kts
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt
#	ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt
#	ok-marketplace-app-ktor/src/commonMain/resources/application.yaml
#	ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg
#	ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt
#	ok-marketplace-app-ktor/src/commonTest/kotlin/V2AdStubApiTest.kt
#	ok-marketplace-app-ktor/src/commonTest/kotlin/inmemory/V2AdInmemoryApiTest.kt
#	ok-marketplace-app-ktor/src/commonTest/resources/application.yaml
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/configs/PostgresConfig.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt
#	ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml
#	ok-marketplace-app-rabbit/build.gradle.kts
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt
#	ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt
#	ok-marketplace-app-serverless/build.gradle.kts
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt
#	ok-marketplace-app-spring/Dockerfile
#	ok-marketplace-app-spring/build.gradle.kts
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SqlPropertiesEx.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/ApplicationTests.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt
#	ok-marketplace-biz/build.gradle.kts
#	ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt
#	ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt
#	ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt
#	ok-marketplace-common/build.gradle.kts
#	ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt
#	ok-marketplace-lib-cor/build.gradle.kts
#	ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt
#	ok-marketplace-lib-logging-common/build.gradle.kts
#	ok-marketplace-lib-logging-kermit/build.gradle.kts
#	ok-marketplace-mappers-log1/build.gradle.kts
#	ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt
#	ok-marketplace-mappers-v2/build.gradle.kts
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt
#	ok-marketplace-repo-in-memory/build.gradle.kts
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt
#	ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/AdTable.kt
#	ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQL.kt
#	ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlProperties.kt
#	ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQLTest.kt
#	ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlTestCompanion.kt
#	ok-marketplace-repo-stubs/build.gradle.kts
#	ok-marketplace-repo-tests/build.gradle.kts
#	ok-marketplace-repo-tests/src/commonMain/kotlin/runRepoTest.kt
#	ok-marketplace-stubs/build.gradle.kts
#	ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt
#	settings.gradle.kts
#	specs/specs-ad-log.yaml
#	specs/specs-ad-v2.yaml
@svok
m5l4 Репозиторий с Кассандрой
cc43e0f
@svok
m5l4 Исправление логики оптимистичных блокировок
bc51e27
@svok
m5l4 Косметические правки
f473a1e
@svok
Merge remote-tracking branch 'old/m5l5-graph-db' into m5l5-graph-db
b86f07a 
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/test.yml
#	.gitignore
#	README.md
#	build.gradle.kts
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	m1l3-oop/src/test/kotlin/01-cashTest.kt
#	m1l3-oop/src/test/kotlin/05-delegationTest.kt
#	m1l3-oop/src/test/kotlin/exercise1KtTest.kt
#	m1l5-coroutines/build.gradle.kts
#	m1l7-kmp/build.gradle.kts
#	m1l7-kmp/src/commonMain/kotlin/ApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/commonMain/kotlin/Logger.kt
#	m1l7-kmp/src/commonMain/kotlin/Service.kt
#	m1l7-kmp/src/commonTest/kotlin/ApiServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/LoggerTest.kt
#	m1l7-kmp/src/commonTest/kotlin/ServiceTest.kt
#	m1l7-kmp/src/commonTest/kotlin/UserTest.kt
#	m1l7-kmp/src/jsMain/kotlin/CommonApiService.kt
#	m1l7-kmp/src/jsMain/kotlin/Logger.kt
#	m1l7-kmp/src/jsMain/kotlin/js/InteroperabilityJS.kt
#	m1l7-kmp/src/jsMain/kotlin/js/big-decimal.module_js-big-decimal.kt
#	m1l7-kmp/src/jsMain/kotlin/js/roundingModes.module_js-big-decimal.kt
#	m1l7-kmp/src/jsTest/kotlin/js/InteroperabilityJSTest.kt
#	m1l7-kmp/src/jvmMain/kotlin/UtilName.kt
#	m1l7-kmp/src/jvmMain/kotlin/jvm/InteroperabilityJava.kt
#	m1l7-kmp/src/nativeInterop/cinterop/libcurl.def
#	m1l7-kmp/src/nativeMain/kotlin/Main.kt
#	m2l3-testing/build.gradle.kts
#	ok-marketplace-api-log1/build.gradle.kts
#	ok-marketplace-api-v1-jackson/build.gradle.kts
#	ok-marketplace-api-v2-kmp/build.gradle.kts
#	ok-marketplace-api-v2-kmp/src/commonMain/kotlin/apiV2Mapper.kt
#	ok-marketplace-app-kafka/build.gradle.kts
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConfig.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/AppKafkaConsumer.kt
#	ok-marketplace-app-kafka/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/kafka/kafkaUtils.kt
#	ok-marketplace-app-kafka/src/test/kotlin/KafkaControllerTest.kt
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/Application.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/MkplAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitPlugins.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/AdController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/ControllerHelperV2.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/OfferController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/WsController.kt
#	ok-marketplace-app-ktor/src/commonMain/kotlin/v2/rest.kt
#	ok-marketplace-app-ktor/src/commonMain/resources/application.yaml
#	ok-marketplace-app-ktor/src/commonMain/resources/static/ktor_logo.svg
#	ok-marketplace-app-ktor/src/commonTest/kotlin/ApplicationTest.kt
#	ok-marketplace-app-ktor/src/commonTest/kotlin/V2AdStubApiTest.kt
#	ok-marketplace-app-ktor/src/commonTest/kotlin/inmemory/V2AdInmemoryApiTest.kt
#	ok-marketplace-app-ktor/src/commonTest/resources/application.yaml
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/ApplicationJvm.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/AdController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/ControllerHelperV1.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/OfferController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/WsController.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/v1/rest.kt
#	ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml
#	ok-marketplace-app-rabbit/build.gradle.kts
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/Application.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitProcessorBase.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/controller/RabbitController.kt
#	ok-marketplace-app-rabbit/src/main/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/processor/RabbitDirectProcessorV2.kt
#	ok-marketplace-app-rabbit/src/test/kotlin/ru/otus/otuskotlin/marketplace/app/rabbit/RabbitMqTest.kt
#	ok-marketplace-app-serverless/build.gradle.kts
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/IHandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/RoutingHandler.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/utils/conversions.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v1/routing.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/IV1HandleStrategy.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/handlers.kt
#	ok-marketplace-app-serverless/src/main/kotlin/ru/otus/otuskotlin/marketplace/serverlessapp/api/v2/routing.kt
#	ok-marketplace-app-spring/Dockerfile
#	ok-marketplace-app-spring/build.gradle.kts
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/Application.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SqlPropertiesEx.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/SwaggerConfiguration.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ControllerHelperV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WebSocketConfigV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v1/ws/WsAdHandlerV1.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/AdControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ControllerHelperV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/OfferControllerV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WebSocketConfigV2.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/controllers/v2/ws/WsAdHandlerV2.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/ApplicationTests.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/WsControllerTest.kt
#	ok-marketplace-biz/build.gradle.kts
#	ok-marketplace-biz/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/biz/MkplAdProcessor.kt
#	ok-marketplace-biz/src/commonTest/kotlin/repo/RepoByIdTests.kt
#	ok-marketplace-biz/src/commonTest/kotlin/statemachine/SMAdStateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdCreateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdDeleteStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdOffersStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdReadStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdSearchStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/stub/AdUpdateStubTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationCreateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationDeleteTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/BizValidationUpdateTest.kt
#	ok-marketplace-biz/src/commonTest/kotlin/validation/ValidationBadDescription.kt
#	ok-marketplace-common/build.gradle.kts
#	ok-marketplace-common/src/commonMain/kotlin/MkplContext.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplAd.kt
#	ok-marketplace-common/src/commonMain/kotlin/models/MkplCommand.kt
#	ok-marketplace-lib-cor/build.gradle.kts
#	ok-marketplace-lib-cor/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/cor/CorBaseTest.kt
#	ok-marketplace-lib-logging-common/build.gradle.kts
#	ok-marketplace-lib-logging-kermit/build.gradle.kts
#	ok-marketplace-mappers-log1/build.gradle.kts
#	ok-marketplace-mappers-log1/src/commonMain/kotlin/MkplContext2Log.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1FromTransport.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt
#	ok-marketplace-mappers-v2/build.gradle.kts
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2FromTransport.kt
#	ok-marketplace-mappers-v2/src/commonMain/kotlin/MappersV2ToTransport.kt
#	ok-marketplace-repo-cassandra/build.gradle.kts
#	ok-marketplace-repo-cassandra/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/cassandra/AdCassandraDAO.kt
#	ok-marketplace-repo-cassandra/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/cassandra/RepoAdCassandra.kt
#	ok-marketplace-repo-cassandra/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/cassandra/model/AdCassandraDTO.kt
#	ok-marketplace-repo-in-memory/build.gradle.kts
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	ok-marketplace-repo-in-memory/src/commonTest/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemoryCreateTest.kt
#	ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/AdTable.kt
#	ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQL.kt
#	ok-marketplace-repo-postgresql/src/main/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlProperties.kt
#	ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/RepoAdSQLTest.kt
#	ok-marketplace-repo-postgresql/src/test/kotlin/ru/otus/otuskotlin/marketplace/backend/repo/sql/SqlTestCompanion.kt
#	ok-marketplace-repo-stubs/build.gradle.kts
#	ok-marketplace-repo-tests/build.gradle.kts
#	ok-marketplace-repo-tests/src/commonMain/kotlin/BaseInitAds.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdCreateTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/runRepoTest.kt
#	ok-marketplace-stubs/build.gradle.kts
#	ok-marketplace-stubs/src/commonMain/kotlin/MkplAdStub.kt
#	settings.gradle.kts
#	specs/specs-ad-log.yaml
#	specs/specs-ad-v2.yaml
@svok
m5l5 Подготовка Гремлина
2f65cbc
@svok
m5l2 Исправлен маппинг: добалена блокировка в api-v1
f5a8939
@svok
Merge branch 'm5l2-concurrent-db' into m5l3-sql
cdba398 
# Conflicts:
#	gradle.properties
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdPostgresApiTest.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt
#	ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt
#	settings.gradle.kts
@svok
Merge branch 'm5l2-concurrent-db' into m5l4-cassandra
daaf9f7 
# Conflicts:
#	gradle.properties
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdPostgresApiTest.kt
#	ok-marketplace-app-spring/src/main/kotlin/ru/otus/otuskotlin/markeplace/springapp/config/CorConfig.kt
#	ok-marketplace-app-spring/src/test/kotlin/ru/otus/otuskotlin/markeplace/springapp/api/v1/controller/AdControllerTest.kt
#	ok-marketplace-common/src/commonMain/kotlin/helpers/MkplErrorsHelpers.kt
#	ok-marketplace-repo-in-memory/src/commonMain/kotlin/ru/otus/otuskotlin/marketplace/repo/inmemory/AdRepoInMemory.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdUpdateTest.kt
#	settings.gradle.kts
@svok
Merge branch 'm5l3-sql' into m5l4-cassandra
e5e6228 
# Conflicts:
#	README.md
#	gradle.properties
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt
#	settings.gradle.kts
@svok
Merge branch 'm5l3-sql' into m5l5-graph-db
8793459 
# Conflicts:
#	README.md
#	gradle.properties
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt
#	ok-marketplace-app-ktor/src/jvmTest/kotlin/ru/otus/otuskotlin/marketplace/app/repo/V1AdGremlinApiTest.kt
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt
#	ok-marketplace-repo-tests/src/commonMain/kotlin/RepoAdDeleteTest.kt
#	settings.gradle.kts
@svok
Merge branch 'm5l4-cassandra' into m5l5-graph-db
953e34a 
# Conflicts:
#	README.md
#	gradle.properties
#	ok-marketplace-app-ktor/build.gradle.kts
#	ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt
#	ok-marketplace-app-ktor/src/jvmMain/kotlin/plugins/getDatabaseConf.kt
#	ok-marketplace-app-ktor/src/jvmMain/resources/application.yaml
#	ok-marketplace-mappers-v1/src/main/kotlin/MappersV1ToTransport.kt
#	settings.gradle.kts
@svok
m5l5 Добавлен интеграционный тест в ктор
38d7b19
@svok
m5l5 Fix таймаут при инициализации контейнера
890a800
@svok
m5l5 Fix мелкие правки
5d5bb5d
@svok svok merged commit a876559 into main Nov 16, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@svok @BarracudaPff @Top4IkRu @evgnep @tano