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.

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 #259

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ public interface RawAnonymousApi {
): HttpResponse<PaginatedList<AnonymousMedicalLocation>>
// endregion

// region anonymous healthcareparty endpoints

suspend fun listHealthcarePartiesInGroup(groupId: String): HttpResponse<List<UserAndHealthcareParty>>
// endregion

// region anonymous calendaritem endpoints

suspend fun listAppointmentTypesForUser(
Expand All @@ -51,4 +46,9 @@ public interface RawAnonymousApi {
limit: Int? = null,
): HttpResponse<List<Long>>
// endregion

// region anonymous healthcareparty endpoints

suspend fun listHealthcarePartiesInGroup(groupId: String): HttpResponse<List<UserAndHealthcareParty>>
// endregion
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@ class RawAnonymousApiImpl(
timeout: Duration? = null,
json: Json,
) : BaseRawApi(httpClient, additionalHeaders, timeout, json), RawAnonymousApi {
// region anonymous healthcareparty endpoints

override suspend fun listHealthcarePartiesInGroup(groupId: String): HttpResponse<List<UserAndHealthcareParty>> =
get {
url {
takeFrom(apiUrl)
appendPathSegments("rest", "v2", "aa", "hcparty", "inGroup", groupId)
parameter("ts", GMTDate().timestamp)
}
accept(Application.Json)
}.wrap()

// endregion

// region anonymous medicallocation endpoints

override suspend fun getPublicMedicalLocationsByGroupId(
Expand Down Expand Up @@ -117,4 +103,18 @@ class RawAnonymousApiImpl(
}.wrap()

// endregion

// region anonymous healthcareparty endpoints

override suspend fun listHealthcarePartiesInGroup(groupId: String): HttpResponse<List<UserAndHealthcareParty>> =
get {
url {
takeFrom(apiUrl)
appendPathSegments("rest", "v2", "aa", "hcparty", "inGroup", groupId)
parameter("ts", GMTDate().timestamp)
}
accept(Application.Json)
}.wrap()

// endregion
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ data class PatientByDataOwnerTagFilter(
public val tagCode: String? = null,
) : AbstractFilter<Patient> {
// region PatientByDataOwnerTagFilter-PatientByDataOwnerTagFilter

// endregion
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ internal object AnyAbstractFilterSerializer :
@Suppress("UNCHECKED_CAST")
override fun getSerializerBySerialName(serialName: String): KSerializer<out AbstractFilter<*>>? =
when (serialName) {
"UnionFilter" -> UnionFilterSerializer(this as KSerializer<AbstractFilter<Identifiable<String>>>)
"ComplementFilter" ->
ComplementFilterSerializer(
this as
Expand All @@ -153,7 +154,6 @@ internal object AnyAbstractFilterSerializer :
this as
KSerializer<AbstractFilter<Identifiable<String>>>,
)
"UnionFilter" -> UnionFilterSerializer(this as KSerializer<AbstractFilter<Identifiable<String>>>)
else ->
AgendaAbstractFilterSerializer.getSerializerBySerialName(serialName)
?: CalendarItemAbstractFilterSerializer.getSerializerBySerialName(serialName)
Expand All @@ -180,6 +180,11 @@ internal object AnyAbstractFilterSerializer :
@Suppress("UNCHECKED_CAST")
override fun getSerializerByClass(kclass: KClass<out AbstractFilter<*>>): KSerializer<out AbstractFilter<*>>? =
when (kclass) {
UnionFilter::class ->
UnionFilterSerializer(
this as
KSerializer<AbstractFilter<Identifiable<String>>>,
)
ComplementFilter::class ->
ComplementFilterSerializer(
this as
Expand All @@ -190,11 +195,6 @@ internal object AnyAbstractFilterSerializer :
this as
KSerializer<AbstractFilter<Identifiable<String>>>,
)
UnionFilter::class ->
UnionFilterSerializer(
this as
KSerializer<AbstractFilter<Identifiable<String>>>,
)
else ->
AgendaAbstractFilterSerializer.getSerializerByClass(
kclass as
Expand Down
Loading