Skip to content

Commit

Permalink
fix query result mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
msavolainen-gofore committed Sep 25, 2024
1 parent d127f89 commit 77942cd
Showing 1 changed file with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import fi.espoo.evaka.shared.domain.NotFound
import fi.espoo.evaka.user.EvakaUser
import fi.espoo.evaka.user.EvakaUserType
import java.time.LocalDate
import java.util.UUID
import org.jdbi.v3.core.mapper.Nested

fun Database.Read.getPlacement(id: PlacementId): Placement? {
Expand Down Expand Up @@ -413,7 +414,7 @@ fun Database.Read.getDaycarePlacement(id: PlacementId): DaycarePlacement? {
u.provider_type,
u.enabled_pilot_features,
u.language,
a.name AS area_name
a.name AS area_name,
p.modified_at,
e.id AS modified_by_id,
e.name AS modified_by_name,
Expand All @@ -422,7 +423,7 @@ fun Database.Read.getDaycarePlacement(id: PlacementId): DaycarePlacement? {
JOIN daycare u ON p.unit_id = u.id
JOIN person c ON p.child_id = c.id
JOIN care_area a ON u.care_area_id = a.id
Left JOIN evaka_user e ON p.modified_by = e.id
LEFT JOIN evaka_user e ON p.modified_by = e.id
WHERE p.id = ${bind(id)}
"""
)
Expand Down Expand Up @@ -770,11 +771,13 @@ private val toDaycarePlacement: Row.() -> DaycarePlacement = {
type = column("placement_type"),
modifiedAt = column("modified_at"),
modifiedBy =
EvakaUser(
EvakaUserId(column("modified_by_id")),
column("modified_by_name"),
EvakaUserType.valueOf(column("modified_by_type")),
),
column<UUID?>("modified_by_id")?.let {
EvakaUser(
EvakaUserId(column("modified_by_id")),
column("modified_by_name"),
EvakaUserType.valueOf(column("modified_by_type")),
)
},
)
}

Expand Down

0 comments on commit 77942cd

Please sign in to comment.