Skip to content

Commit 181516b

Browse files
committed
document id
1 parent 30f0874 commit 181516b

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

frontend/src/employee-frontend/components/archive-metadata/MetadataSection.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ const DocumentMetadata = React.memo(function DocumentMetadata({
5959
</FixedSpaceRow>
6060
)
6161
},
62+
{
63+
label: i18n.metadata.documentId,
64+
value: document.documentId
65+
},
6266
{
6367
label: i18n.metadata.createdAt,
6468
value: document.createdAt?.format() ?? '-'

frontend/src/lib-common/generated/api-types/process.ts

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import HelsinkiDateTime from '../../helsinki-date-time'
88
import { ArchivedProcessId } from './shared'
99
import { EvakaUser } from './user'
1010
import { JsonOf } from '../../json'
11+
import { UUID } from '../../types'
1112

1213
/**
1314
* Generated from fi.espoo.evaka.process.ArchivedProcess
@@ -49,6 +50,7 @@ export interface DocumentMetadata {
4950
confidential: boolean | null
5051
createdAt: HelsinkiDateTime | null
5152
createdBy: EvakaUser | null
53+
documentId: UUID
5254
downloadPath: string | null
5355
name: string
5456
receivedBy: DocumentOrigin | null

frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -5146,6 +5146,7 @@ export const fi = {
51465146
archiveDurationMonths: 'Arkistointiaika',
51475147
primaryDocument: 'Ensisijainen asiakirja',
51485148
secondaryDocuments: 'Muut asiakirjat',
5149+
documentId: 'Asiakirjan tunniste',
51495150
name: 'Asiakirjan nimi',
51505151
createdAt: 'Laatimisajankohta',
51515152
createdBy: 'Laatija',

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

+16
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import fi.espoo.evaka.shared.security.AccessControl
2525
import fi.espoo.evaka.shared.security.Action
2626
import fi.espoo.evaka.user.EvakaUser
2727
import java.time.LocalDate
28+
import java.util.UUID
2829
import org.jdbi.v3.core.mapper.Nested
2930
import org.springframework.web.bind.annotation.GetMapping
3031
import org.springframework.web.bind.annotation.PathVariable
@@ -46,6 +47,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
4647
}
4748

4849
data class DocumentMetadata(
50+
val documentId: UUID,
4951
val name: String,
5052
val createdAt: HelsinkiDateTime?,
5153
@Nested("created_by") val createdBy: EvakaUser?,
@@ -348,6 +350,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
348350
sql(
349351
"""
350352
SELECT
353+
dt.id,
351354
dt.name,
352355
cd.created,
353356
e.id AS created_by_id,
@@ -364,6 +367,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
364367
}
365368
.map {
366369
DocumentMetadata(
370+
documentId = column("id"),
367371
name = column("name"),
368372
createdAt = column("created"),
369373
createdBy =
@@ -391,6 +395,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
391395
sql(
392396
"""
393397
SELECT
398+
d.id,
394399
d.created,
395400
e.id AS created_by_id,
396401
e.name AS created_by_name,
@@ -405,6 +410,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
405410
}
406411
.map {
407412
DocumentMetadata(
413+
documentId = column("id"),
408414
name = "Päätös tuesta varhaiskasvatuksessa",
409415
createdAt = column("created"),
410416
createdBy =
@@ -432,6 +438,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
432438
sql(
433439
"""
434440
SELECT
441+
d.id,
435442
d.created,
436443
e.id AS created_by_id,
437444
e.name AS created_by_name,
@@ -445,6 +452,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
445452
}
446453
.map {
447454
DocumentMetadata(
455+
documentId = column("id"),
448456
name = "Päätös tuesta esiopetuksessa",
449457
createdAt = column("created"),
450458
createdBy =
@@ -472,6 +480,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
472480
sql(
473481
"""
474482
SELECT
483+
a.id,
475484
a.type,
476485
a.sentdate,
477486
e.id AS created_by_id,
@@ -487,6 +496,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
487496
}
488497
.map {
489498
DocumentMetadata(
499+
documentId = column("id"),
490500
name =
491501
column<ApplicationType>("type").let { type ->
492502
when (type) {
@@ -542,6 +552,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
542552
sql(
543553
"""
544554
SELECT
555+
d.id,
545556
d.type,
546557
d.sent_date,
547558
e.id AS created_by_id,
@@ -556,6 +567,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
556567
}
557568
.map {
558569
DocumentMetadata(
570+
documentId = column("id"),
559571
name =
560572
column<DecisionType>("type").let {
561573
when (it) {
@@ -598,6 +610,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
598610
sql(
599611
"""
600612
SELECT
613+
d.id,
601614
d.created,
602615
e.id AS created_by_id,
603616
e.name AS created_by_name,
@@ -611,6 +624,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
611624
}
612625
.map {
613626
DocumentMetadata(
627+
documentId = column("id"),
614628
name = "Maksupäätös",
615629
createdAt = column("created"),
616630
createdBy =
@@ -636,6 +650,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
636650
sql(
637651
"""
638652
SELECT
653+
d.id,
639654
d.created,
640655
e.id AS created_by_id,
641656
e.name AS created_by_name,
@@ -649,6 +664,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
649664
}
650665
.map {
651666
DocumentMetadata(
667+
documentId = column("id"),
652668
name = "Arvopäätös",
653669
createdAt = column("created"),
654670
createdBy =

0 commit comments

Comments
 (0)