@@ -25,6 +25,7 @@ import fi.espoo.evaka.shared.security.AccessControl
25
25
import fi.espoo.evaka.shared.security.Action
26
26
import fi.espoo.evaka.user.EvakaUser
27
27
import java.time.LocalDate
28
+ import java.util.UUID
28
29
import org.jdbi.v3.core.mapper.Nested
29
30
import org.springframework.web.bind.annotation.GetMapping
30
31
import org.springframework.web.bind.annotation.PathVariable
@@ -46,6 +47,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
46
47
}
47
48
48
49
data class DocumentMetadata (
50
+ val documentId : UUID ,
49
51
val name : String ,
50
52
val createdAt : HelsinkiDateTime ? ,
51
53
@Nested(" created_by" ) val createdBy : EvakaUser ? ,
@@ -348,6 +350,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
348
350
sql(
349
351
"""
350
352
SELECT
353
+ dt.id,
351
354
dt.name,
352
355
cd.created,
353
356
e.id AS created_by_id,
@@ -364,6 +367,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
364
367
}
365
368
.map {
366
369
DocumentMetadata (
370
+ documentId = column(" id" ),
367
371
name = column(" name" ),
368
372
createdAt = column(" created" ),
369
373
createdBy =
@@ -391,6 +395,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
391
395
sql(
392
396
"""
393
397
SELECT
398
+ d.id,
394
399
d.created,
395
400
e.id AS created_by_id,
396
401
e.name AS created_by_name,
@@ -405,6 +410,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
405
410
}
406
411
.map {
407
412
DocumentMetadata (
413
+ documentId = column(" id" ),
408
414
name = " Päätös tuesta varhaiskasvatuksessa" ,
409
415
createdAt = column(" created" ),
410
416
createdBy =
@@ -432,6 +438,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
432
438
sql(
433
439
"""
434
440
SELECT
441
+ d.id,
435
442
d.created,
436
443
e.id AS created_by_id,
437
444
e.name AS created_by_name,
@@ -445,6 +452,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
445
452
}
446
453
.map {
447
454
DocumentMetadata (
455
+ documentId = column(" id" ),
448
456
name = " Päätös tuesta esiopetuksessa" ,
449
457
createdAt = column(" created" ),
450
458
createdBy =
@@ -472,6 +480,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
472
480
sql(
473
481
"""
474
482
SELECT
483
+ a.id,
475
484
a.type,
476
485
a.sentdate,
477
486
e.id AS created_by_id,
@@ -487,6 +496,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
487
496
}
488
497
.map {
489
498
DocumentMetadata (
499
+ documentId = column(" id" ),
490
500
name =
491
501
column<ApplicationType >(" type" ).let { type ->
492
502
when (type) {
@@ -542,6 +552,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
542
552
sql(
543
553
"""
544
554
SELECT
555
+ d.id,
545
556
d.type,
546
557
d.sent_date,
547
558
e.id AS created_by_id,
@@ -556,6 +567,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
556
567
}
557
568
.map {
558
569
DocumentMetadata (
570
+ documentId = column(" id" ),
559
571
name =
560
572
column<DecisionType >(" type" ).let {
561
573
when (it) {
@@ -598,6 +610,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
598
610
sql(
599
611
"""
600
612
SELECT
613
+ d.id,
601
614
d.created,
602
615
e.id AS created_by_id,
603
616
e.name AS created_by_name,
@@ -611,6 +624,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
611
624
}
612
625
.map {
613
626
DocumentMetadata (
627
+ documentId = column(" id" ),
614
628
name = " Maksupäätös" ,
615
629
createdAt = column(" created" ),
616
630
createdBy =
@@ -636,6 +650,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
636
650
sql(
637
651
"""
638
652
SELECT
653
+ d.id,
639
654
d.created,
640
655
e.id AS created_by_id,
641
656
e.name AS created_by_name,
@@ -649,6 +664,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
649
664
}
650
665
.map {
651
666
DocumentMetadata (
667
+ documentId = column(" id" ),
652
668
name = " Arvopäätös" ,
653
669
createdAt = column(" created" ),
654
670
createdBy =
0 commit comments