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

Updated models and APIs #253

Closed
wants to merge 1 commit into from
+791 −444
Closed

Updated models and APIs #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...inal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/api/raw/impl/RawTimeTableApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import com.icure.cardinal.sdk.api.raw.HttpResponse
import com.icure.cardinal.sdk.api.raw.RawTimeTableApi
import com.icure.cardinal.sdk.api.raw.wrap
import com.icure.cardinal.sdk.auth.services.AuthProvider
import com.icure.cardinal.sdk.crypto.AccessControlKeysHeadersProvider
import com.icure.cardinal.sdk.crypto.entities.EntityWithEncryptionMetadataTypeName
import com.icure.cardinal.sdk.model.ListOfIds
import com.icure.cardinal.sdk.model.ListOfIdsAndRev
import com.icure.cardinal.sdk.model.TimeTable
Expand Down
18 changes: 11 additions & 7 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/AccessLog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import com.icure.cardinal.sdk.serialization.InstantSerializer
import com.icure.cardinal.sdk.utils.DefaultValue
import kotlinx.datetime.Instant
import kotlinx.serialization.Serializable
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Long
import kotlin.String
import kotlin.collections.Map
Expand All @@ -38,9 +42,9 @@ sealed interface AccessLog :

override val medicalLocationId: String?

override val tags: Set<CodeStub>
override val tags: Set<CodeStubDto>

override val codes: Set<CodeStub>
override val codes: Set<CodeStubDto>

override val endOfLife: Long?

Expand All @@ -60,15 +64,15 @@ sealed interface AccessLog :

override val secretForeignKeys: Set<String>

override val cryptedForeignKeys: Map<String, Set<Delegation>>
override val cryptedForeignKeys: Map<String, Set<DelegationDto>>

override val delegations: Map<String, Set<Delegation>>
override val delegations: Map<String, Set<DelegationDto>>

override val encryptionKeys: Map<String, Set<Delegation>>
override val encryptionKeys: Map<String, Set<DelegationDto>>

override val encryptedSelf: Base64String?
override val encryptedSelf: Base64StringDto?

override val securityMetadata: SecurityMetadata?
override val securityMetadata: SecurityMetadataDto?
// region AccessLog-AccessLog

// endregion
Expand Down
18 changes: 11 additions & 7 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/Article.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import com.icure.cardinal.sdk.model.embed.SecurityMetadata
import com.icure.cardinal.sdk.model.specializations.Base64String
import com.icure.cardinal.sdk.utils.DefaultValue
import kotlinx.serialization.Serializable
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Long
import kotlin.String
import kotlin.collections.Map
Expand All @@ -36,9 +40,9 @@ sealed interface Article :

override val medicalLocationId: String?

override val tags: Set<CodeStub>
override val tags: Set<CodeStubDto>

override val codes: Set<CodeStub>
override val codes: Set<CodeStubDto>

override val endOfLife: Long?

Expand All @@ -50,15 +54,15 @@ sealed interface Article :

override val secretForeignKeys: Set<String>

override val cryptedForeignKeys: Map<String, Set<Delegation>>
override val cryptedForeignKeys: Map<String, Set<DelegationDto>>

override val delegations: Map<String, Set<Delegation>>
override val delegations: Map<String, Set<DelegationDto>>

override val encryptionKeys: Map<String, Set<Delegation>>
override val encryptionKeys: Map<String, Set<DelegationDto>>

override val encryptedSelf: Base64String?
override val encryptedSelf: Base64StringDto?

override val securityMetadata: SecurityMetadata?
override val securityMetadata: SecurityMetadataDto?
// region Article-Article

// endregion
Expand Down
43 changes: 31 additions & 12 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/CalendarItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import com.icure.cardinal.sdk.model.base.CodeStub
import com.icure.cardinal.sdk.model.base.HasEncryptionMetadata
import com.icure.cardinal.sdk.model.base.ICureDocument
import com.icure.cardinal.sdk.model.base.StoredDocument
import com.icure.cardinal.sdk.model.embed.Address
import com.icure.cardinal.sdk.model.embed.CalendarItemTag
import com.icure.cardinal.sdk.model.embed.DecryptedAddress
import com.icure.cardinal.sdk.model.embed.DecryptedCalendarItemTag
import com.icure.cardinal.sdk.model.embed.Delegation
Expand All @@ -17,6 +15,27 @@ import com.icure.cardinal.sdk.model.embed.SecurityMetadata
import com.icure.cardinal.sdk.model.specializations.Base64String
import com.icure.cardinal.sdk.utils.DefaultValue
import kotlinx.serialization.Serializable
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.AddressDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.CalendarItemTagDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.FlowItemDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Boolean
import kotlin.Long
import kotlin.String
import kotlin.collections.Map
import kotlin.collections.Set
import com.icure.cardinal.sdk.model.embed.Address
import com.icure.cardinal.sdk.model.embed.CalendarItemTag
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.AddressDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.CalendarItemTagDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.FlowItemDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Boolean
import kotlin.Long
import kotlin.String
Expand Down Expand Up @@ -44,9 +63,9 @@ sealed interface CalendarItem :

override val medicalLocationId: String?

override val tags: Set<CodeStub>
override val tags: Set<CodeStubDto>

override val codes: Set<CodeStub>
override val codes: Set<CodeStubDto>

override val endOfLife: Long?

Expand All @@ -68,7 +87,7 @@ sealed interface CalendarItem :

public val placeId: String?

public val address: Address?
public val address: AddressDto?

public val addressText: String?

Expand Down Expand Up @@ -96,21 +115,21 @@ sealed interface CalendarItem :

public val recurrenceId: String?

public val meetingTags: Set<CalendarItemTag>
public val meetingTags: Set<CalendarItemTagDto>

public val flowItem: FlowItem?
public val flowItem: FlowItemDto?

override val secretForeignKeys: Set<String>

override val cryptedForeignKeys: Map<String, Set<Delegation>>
override val cryptedForeignKeys: Map<String, Set<DelegationDto>>

override val delegations: Map<String, Set<Delegation>>
override val delegations: Map<String, Set<DelegationDto>>

override val encryptionKeys: Map<String, Set<Delegation>>
override val encryptionKeys: Map<String, Set<DelegationDto>>

override val encryptedSelf: Base64String?
override val encryptedSelf: Base64StringDto?

override val securityMetadata: SecurityMetadata?
override val securityMetadata: SecurityMetadataDto?
// region CalendarItem-CalendarItem

companion object {
Expand Down
18 changes: 11 additions & 7 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/Classification.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import com.icure.cardinal.sdk.model.embed.SecurityMetadata
import com.icure.cardinal.sdk.model.specializations.Base64String
import com.icure.cardinal.sdk.utils.DefaultValue
import kotlinx.serialization.Serializable
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Long
import kotlin.String
import kotlin.collections.Map
Expand All @@ -36,9 +40,9 @@ sealed interface Classification :

override val medicalLocationId: String?

override val tags: Set<CodeStub>
override val tags: Set<CodeStubDto>

override val codes: Set<CodeStub>
override val codes: Set<CodeStubDto>

override val endOfLife: Long?

Expand All @@ -52,15 +56,15 @@ sealed interface Classification :

override val secretForeignKeys: Set<String>

override val cryptedForeignKeys: Map<String, Set<Delegation>>
override val cryptedForeignKeys: Map<String, Set<DelegationDto>>

override val delegations: Map<String, Set<Delegation>>
override val delegations: Map<String, Set<DelegationDto>>

override val encryptionKeys: Map<String, Set<Delegation>>
override val encryptionKeys: Map<String, Set<DelegationDto>>

override val encryptedSelf: Base64String?
override val encryptedSelf: Base64StringDto?

override val securityMetadata: SecurityMetadata?
override val securityMetadata: SecurityMetadataDto?
// region Classification-Classification

// endregion
Expand Down
59 changes: 42 additions & 17 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/Contact.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import com.icure.cardinal.sdk.model.base.ICureDocument
import com.icure.cardinal.sdk.model.base.Identifier
import com.icure.cardinal.sdk.model.base.ParticipantType
import com.icure.cardinal.sdk.model.base.StoredDocument
import com.icure.cardinal.sdk.model.embed.Address
import com.icure.cardinal.sdk.model.embed.Annotation
import com.icure.cardinal.sdk.model.embed.DecryptedAddress
import com.icure.cardinal.sdk.model.embed.DecryptedService
Expand All @@ -17,11 +16,37 @@ import com.icure.cardinal.sdk.model.embed.EncryptedAddress
import com.icure.cardinal.sdk.model.embed.EncryptedService
import com.icure.cardinal.sdk.model.embed.EncryptedSubContact
import com.icure.cardinal.sdk.model.embed.SecurityMetadata
import com.icure.cardinal.sdk.model.embed.Service
import com.icure.cardinal.sdk.model.embed.SubContact
import com.icure.cardinal.sdk.model.specializations.Base64String
import com.icure.cardinal.sdk.utils.DefaultValue
import kotlinx.serialization.Serializable
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.base.IdentifierDto
import org.taktik.icure.services.`external`.rest.v2.dto.base.ParticipantTypeDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.AddressDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.AnnotationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.ServiceDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SubContactDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Long
import kotlin.String
import kotlin.collections.List
import kotlin.collections.Map
import kotlin.collections.Set
import com.icure.cardinal.sdk.model.embed.Address
import com.icure.cardinal.sdk.model.embed.Service
import com.icure.cardinal.sdk.model.embed.SubContact
import org.taktik.icure.services.`external`.rest.v2.dto.base.CodeStubDto
import org.taktik.icure.services.`external`.rest.v2.dto.base.IdentifierDto
import org.taktik.icure.services.`external`.rest.v2.dto.base.ParticipantTypeDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.AddressDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.AnnotationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.DelegationDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SecurityMetadataDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.ServiceDto
import org.taktik.icure.services.`external`.rest.v2.dto.embed.SubContactDto
import org.taktik.icure.services.`external`.rest.v2.dto.specializations.Base64StringDto
import kotlin.Long
import kotlin.String
import kotlin.collections.List
Expand Down Expand Up @@ -49,11 +74,11 @@ sealed interface Contact :

override val medicalLocationId: String?

override val tags: Set<CodeStub>
override val tags: Set<CodeStubDto>

override val codes: Set<CodeStub>
override val codes: Set<CodeStubDto>

public val identifier: List<Identifier>
public val identifier: List<IdentifierDto>

override val endOfLife: Long?

Expand All @@ -71,33 +96,33 @@ sealed interface Contact :

public val externalId: String?

public val encounterType: CodeStub?
public val encounterType: CodeStubDto?

public val encounterLocation: Address?
public val encounterLocation: AddressDto?

public val subContacts: Set<SubContact>
public val subContacts: Set<SubContactDto>

public val services: Set<Service>
public val services: Set<ServiceDto>

public val participants: Map<ParticipantType, String>
public val participants: Map<ParticipantTypeDto, String>

public val healthcarePartyId: String?

public val modifiedContactId: String?

override val secretForeignKeys: Set<String>

override val cryptedForeignKeys: Map<String, Set<Delegation>>
override val cryptedForeignKeys: Map<String, Set<DelegationDto>>

override val delegations: Map<String, Set<Delegation>>
override val delegations: Map<String, Set<DelegationDto>>

override val encryptionKeys: Map<String, Set<Delegation>>
override val encryptionKeys: Map<String, Set<DelegationDto>>

override val encryptedSelf: Base64String?
override val encryptedSelf: Base64StringDto?

override val securityMetadata: SecurityMetadata?
override val securityMetadata: SecurityMetadataDto?

public val notes: List<Annotation>
public val notes: List<AnnotationDto>
// region Contact-Contact
companion object {
const val KRAKEN_QUALIFIED_NAME = "org.taktik.icure.entities.Contact"
Expand Down
1 change: 1 addition & 0 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/CryptoActorStub.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ data class CryptoActorStub(
@DefaultValue("emptySet()")
override val tags: Set<CodeStub> = emptySet(),
override val parentId: String? = null,
override val cryptoActorProperties: Set<DecryptedPropertyStub>? = null,
) : Versionable<String>, CryptoActor, HasTags {
// region CryptoActorStub-CryptoActorStub

Expand Down
6 changes: 4 additions & 2 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/DataOwnerWithType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package com.icure.cardinal.sdk.model

import com.icure.cardinal.sdk.model.base.CryptoActor
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import org.taktik.icure.services.`external`.rest.v2.dto.base.CryptoActorDto
import com.icure.cardinal.sdk.model.base.CryptoActor
import org.taktik.icure.services.`external`.rest.v2.dto.base.CryptoActorDto

// WARNING: This file is auto-generated. If you change it manually, your changes will be lost.
// If you want to change the way this class is generated, see [this repo](https://github.com/icure/sdk-codegen).

@Serializable
sealed interface DataOwnerWithType {
public val dataOwner: CryptoActor
public val dataOwner: CryptoActorDto

@Serializable
@SerialName("hcp")
Expand Down
1 change: 1 addition & 0 deletions cardinal-sdk/src/commonMain/kotlin/com/icure/cardinal/sdk/model/Device.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ data class Device(
override val publicKey: SpkiHexString? = null,
@DefaultValue("emptySet()")
override val publicKeysForOaepWithSha256: Set<SpkiHexString> = emptySet(),
override val cryptoActorProperties: Set<DecryptedPropertyStub>? = null,
) : StoredDocument, ICureDocument<String>, Named, CryptoActor, DataOwner {
// region Device-Device
companion object {
Expand Down
Loading
Loading