Skip to content

Commit d982f97

Browse files
JoosakurJoosakur
authored
Merge pull request #6155 from espoon-voltti/fix-metadata-when-createdby-is-null
Korjaus metadatan hakemiseen
2 parents 257c80b + 7ab6489 commit d982f97

File tree

1 file changed

+50
-35
lines changed

1 file changed

+50
-35
lines changed

‎service/src/main/kotlin/fi/espoo/evaka/process/ProcessMetadataController.kt

+50-35
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import fi.espoo.evaka.shared.AssistanceNeedDecisionId
1313
import fi.espoo.evaka.shared.AssistanceNeedPreschoolDecisionId
1414
import fi.espoo.evaka.shared.ChildDocumentId
1515
import fi.espoo.evaka.shared.DecisionId
16+
import fi.espoo.evaka.shared.EvakaUserId
1617
import fi.espoo.evaka.shared.FeeDecisionId
1718
import fi.espoo.evaka.shared.VoucherValueDecisionId
1819
import fi.espoo.evaka.shared.auth.AuthenticatedUser
@@ -359,11 +360,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
359360
name = column("name"),
360361
createdAt = column("created"),
361362
createdBy =
362-
EvakaUser(
363-
id = column("created_by_id"),
364-
name = column("created_by_name"),
365-
type = column("created_by_type"),
366-
),
363+
column<EvakaUserId?>("created_by_id")?.let {
364+
EvakaUser(
365+
id = it,
366+
name = column("created_by_name"),
367+
type = column("created_by_type"),
368+
)
369+
},
367370
confidential = column("confidential"),
368371
downloadPath =
369372
column<String?>("document_key")?.let { "/employee/child-documents/$it/pdf" },
@@ -395,11 +398,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
395398
name = "Päätös tuesta varhaiskasvatuksessa",
396399
createdAt = column("created"),
397400
createdBy =
398-
EvakaUser(
399-
id = column("created_by_id"),
400-
name = column("created_by_name"),
401-
type = column("created_by_type"),
402-
),
401+
column<EvakaUserId?>("created_by_id")?.let {
402+
EvakaUser(
403+
id = it,
404+
name = column("created_by_name"),
405+
type = column("created_by_type"),
406+
)
407+
},
403408
confidential = true,
404409
downloadPath =
405410
column<String?>("document_key")?.let {
@@ -432,11 +437,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
432437
name = "Päätös tuesta esiopetuksessa",
433438
createdAt = column("created"),
434439
createdBy =
435-
EvakaUser(
436-
id = column("created_by_id"),
437-
name = column("created_by_name"),
438-
type = column("created_by_type"),
439-
),
440+
column<EvakaUserId?>("created_by_id")?.let {
441+
EvakaUser(
442+
id = it,
443+
name = column("created_by_name"),
444+
type = column("created_by_type"),
445+
)
446+
},
440447
confidential = true,
441448
downloadPath =
442449
column<String?>("document_key")?.let {
@@ -480,11 +487,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
480487
createdAt =
481488
column<LocalDate>("sentdate").let { HelsinkiDateTime.atStartOfDay(it) },
482489
createdBy =
483-
EvakaUser(
484-
id = column("created_by_id"),
485-
name = column("created_by_name"),
486-
type = column("created_by_type"),
487-
),
490+
column<EvakaUserId?>("created_by_id")?.let {
491+
EvakaUser(
492+
id = it,
493+
name = column("created_by_name"),
494+
type = column("created_by_type"),
495+
)
496+
},
488497
confidential = column("confidential"),
489498
downloadPath = null,
490499
)
@@ -545,11 +554,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
545554
createdAt =
546555
column<LocalDate>("sent_date").let { HelsinkiDateTime.atStartOfDay(it) },
547556
createdBy =
548-
EvakaUser(
549-
id = column("created_by_id"),
550-
name = column("created_by_name"),
551-
type = column("created_by_type"),
552-
),
557+
column<EvakaUserId?>("created_by_id")?.let {
558+
EvakaUser(
559+
id = it,
560+
name = column("created_by_name"),
561+
type = column("created_by_type"),
562+
)
563+
},
553564
confidential = true,
554565
downloadPath =
555566
column<String?>("document_key")?.let {
@@ -582,11 +593,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
582593
name = "Maksupäätös",
583594
createdAt = column("created"),
584595
createdBy =
585-
EvakaUser(
586-
id = column("created_by_id"),
587-
name = column("created_by_name"),
588-
type = column("created_by_type"),
589-
),
596+
column<EvakaUserId?>("created_by_id")?.let {
597+
EvakaUser(
598+
id = it,
599+
name = column("created_by_name"),
600+
type = column("created_by_type"),
601+
)
602+
},
590603
confidential = true,
591604
downloadPath =
592605
column<String?>("document_key")?.let { "/employee/fee-decisions/pdf/$it" },
@@ -617,11 +630,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
617630
name = "Arvopäätös",
618631
createdAt = column("created"),
619632
createdBy =
620-
EvakaUser(
621-
id = column("created_by_id"),
622-
name = column("created_by_name"),
623-
type = column("created_by_type"),
624-
),
633+
column<EvakaUserId?>("created_by_id")?.let {
634+
EvakaUser(
635+
id = it,
636+
name = column("created_by_name"),
637+
type = column("created_by_type"),
638+
)
639+
},
625640
confidential = true,
626641
downloadPath =
627642
column<String?>("document_key")?.let { "/employee/value-decisions/pdf/$it" },

0 commit comments

Comments
 (0)