Skip to content

Commit

Permalink
Merge pull request #75 from icure/ci/bump-common-and-kmehr-1.0.102-g8…
Browse files Browse the repository at this point in the history
…17ceaef6d-202501231408

Bumped kmehr module to 1.0.102-g817ceaef6d and kraken-common
  • Loading branch information
TestaDiRapa authored Jan 23, 2025
2 parents a687dbe + 008ceea commit c675d91
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion kraken-common
Submodule kraken-common updated 83 files
+30 −30 core/src/main/kotlin/org/taktik/icure/asyncdao/impl/EntityTemplateDAOImpl.kt
+38 −16 core/src/main/kotlin/org/taktik/icure/asyncdao/impl/GenericDAOImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/base/impl/EntityWithEncryptionMetadataLogic.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/AccessLogLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/AgendaLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/ArticleLogicImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/CalendarItemLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/CalendarItemTypeLogicImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/ClassificationLogicImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/ClassificationTemplateLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/CodeLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/ContactLogicImpl.kt
+112 −11 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/DataOwnerLogicImpl.kt
+4 −4 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/DeviceLogicImpl.kt
+6 −6 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/DocumentLogicImpl.kt
+3 −3 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/DocumentTemplateLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/EntityTemplateLogicImpl.kt
+8 −4 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/FixerImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/FormLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/FormTemplateLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/GenericLogicImpl.kt
+3 −3 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/HealthElementLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/HealthcarePartyLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/InsuranceLogicImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/InvoiceLogicImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/KeywordLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/MaintenanceTaskLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/MedicalLocationLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/MessageLogicImpl.kt
+21 −4 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/PatientLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/PlaceLogicImpl.kt
+2 −2 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/TarificationLogicImpl.kt
+1 −1 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/TimeTableLogicImpl.kt
+4 −3 core/src/main/kotlin/org/taktik/icure/asynclogic/impl/UserLogicImpl.kt
+47 −4 core/src/main/kotlin/org/taktik/icure/services/external/rest/v2/controllers/core/DataOwnerController.kt
+4 −4 core/src/main/kotlin/org/taktik/icure/spring/encoder/PaginatedCollectingJackson2JsonEncoder.kt
+41 −0 core/src/main/kotlin/org/taktik/icure/utils/PeekChannel.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/AccessLog.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Agenda.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/ApplicationSettings.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Article.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/CalendarItem.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Classification.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/ClassificationTemplate.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Contact.kt
+1 −0 domain/src/main/kotlin/org/taktik/icure/entities/CryptoActorStub.kt
+3 −3 domain/src/main/kotlin/org/taktik/icure/entities/Device.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Document.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/DocumentTemplate.kt
+1 −1 domain/src/main/kotlin/org/taktik/icure/entities/EntityTemplate.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Form.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/HealthElement.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/HealthElementTemplate.kt
+1 −1 domain/src/main/kotlin/org/taktik/icure/entities/HealthcareParty.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Invoice.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Keyword.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/MaintenanceTask.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Message.kt
+3 −2 domain/src/main/kotlin/org/taktik/icure/entities/Patient.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/Receipt.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/TimeTable.kt
+4 −1 domain/src/main/kotlin/org/taktik/icure/entities/base/CryptoActor.kt
+1 −1 domain/src/main/kotlin/org/taktik/icure/entities/embed/Annotation.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/embed/PlanOfAction.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/embed/PlanOfActionTemplate.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/embed/Service.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/entities/embed/SubContact.kt
+2 −2 domain/src/main/kotlin/org/taktik/icure/validation/AutoFix.kt
+1 −1 domain/src/main/kotlin/org/taktik/icure/validation/NotNull.kt
+1 −1 domain/src/main/kotlin/org/taktik/icure/validation/aspect/Fixer.kt
+2 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v1/dto/CryptoActorStubDto.kt
+1 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v1/dto/DeviceDto.kt
+1 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v1/dto/HealthcarePartyDto.kt
+2 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v1/dto/PatientDto.kt
+3 −0 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v1/dto/base/CryptoActorDto.kt
+1 −0 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v2/dto/CryptoActorStubDto.kt
+1 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v2/dto/DeviceDto.kt
+1 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v2/dto/HealthcarePartyDto.kt
+2 −1 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v2/dto/PatientDto.kt
+3 −0 dto/src/main/kotlin/org/taktik/icure/services/external/rest/v2/dto/base/CryptoActorDto.kt
+13 −0 logic/src/main/kotlin/org/taktik/icure/asynclogic/DataOwnerLogic.kt
+2 −2 logic/src/main/kotlin/org/taktik/icure/asynclogic/base/AutoFixableLogic.kt
+15 −0 service/src/main/kotlin/org/taktik/icure/asyncservice/DataOwnerService.kt
2 changes: 1 addition & 1 deletion libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
sonarqube = "3.3"
kmehr = "1.0.100-gd0d401a3c5"
kmehr = "1.0.102-g817ceaef6d"

[libraries]
reactorCore = { group = "io.projectreactor", name = "reactor-core" }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.taktik.icure.asyncservice.impl

import kotlinx.coroutines.flow.Flow
import org.springframework.stereotype.Service
import org.taktik.icure.asynclogic.DataOwnerLogic
import org.taktik.icure.asyncservice.DataOwnerService
Expand All @@ -11,8 +12,10 @@ class DataOwnerServiceImpl(
private val dataOwnerLogic: DataOwnerLogic
) : DataOwnerService {
override suspend fun getCryptoActorStub(dataOwnerId: String): CryptoActorStubWithType? = dataOwnerLogic.getCryptoActorStub(dataOwnerId)

override fun getCryptoActorStubs(dataOwnerIds: List<String>): Flow<CryptoActorStubWithType> = dataOwnerLogic.getCryptoActorStubs(dataOwnerIds)
override suspend fun getDataOwner(dataOwnerId: String): DataOwnerWithType? = dataOwnerLogic.getDataOwner(dataOwnerId)

override fun getDataOwners(dataOwnerIds: List<String>): Flow<DataOwnerWithType> = dataOwnerLogic.getDataOwners(dataOwnerIds)
override suspend fun modifyCryptoActor(modifiedCryptoActor: CryptoActorStubWithType): CryptoActorStubWithType = dataOwnerLogic.modifyCryptoActor(modifiedCryptoActor)
override fun getCryptoActorHierarchy(dataOwnerId: String): Flow<DataOwnerWithType> = dataOwnerLogic.getCryptoActorHierarchy(dataOwnerId)
override fun getCryptoActorHierarchyStub(dataOwnerId: String): Flow<CryptoActorStubWithType> = dataOwnerLogic.getCryptoActorHierarchyStub(dataOwnerId)
}

0 comments on commit c675d91

Please sign in to comment.