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.

Sign up for GitHub

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

Lisätään metatietoihin asiakirjan id ja (hakemuksen) saapumistapa #6407

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Lisätään metatietoihin asiakirjan id ja (hakemuksen) saapumistapa #6407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f0874
show application origin
Joosakur Feb 19, 2025
181516b
document id
Joosakur Feb 19, 2025
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
12 changes: 12 additions & 0 deletions frontend/src/employee-frontend/components/archive-metadata/MetadataSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ const DocumentMetadata = React.memo(function DocumentMetadata({
</FixedSpaceRow>
)
},
{
label: i18n.metadata.documentId,
value: document.documentId
},
{
label: i18n.metadata.createdAt,
value: document.createdAt?.format() ?? '-'
Expand All @@ -69,6 +73,14 @@ const DocumentMetadata = React.memo(function DocumentMetadata({
? `${document.createdBy.name} (${i18n.common.userTypes[document.createdBy.type]}) `
: '-'
},
...(document.receivedBy
? [
{
label: i18n.metadata.receivedBy.label,
value: i18n.metadata.receivedBy[document.receivedBy]
}
]
: []),
{
label: i18n.metadata.confidentiality,
value:
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lib-common/generated/api-types/process.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import HelsinkiDateTime from '../../helsinki-date-time'
import { ArchivedProcessId } from './shared'
import { EvakaUser } from './user'
import { JsonOf } from '../../json'
import { UUID } from '../../types'

/**
* Generated from fi.espoo.evaka.process.ArchivedProcess
Expand Down Expand Up @@ -49,10 +50,19 @@ export interface DocumentMetadata {
confidential: boolean | null
createdAt: HelsinkiDateTime | null
createdBy: EvakaUser | null
documentId: UUID
downloadPath: string | null
name: string
receivedBy: DocumentOrigin | null
}

/**
* Generated from fi.espoo.evaka.process.ProcessMetadataController.DocumentOrigin
*/
export type DocumentOrigin =
| 'ELECTRONIC'
| 'PAPER'

/**
* Generated from fi.espoo.evaka.process.ProcessMetadataController.ProcessMetadata
*/
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5146,6 +5146,7 @@ export const fi = {
archiveDurationMonths: 'Arkistointiaika',
primaryDocument: 'Ensisijainen asiakirja',
secondaryDocuments: 'Muut asiakirjat',
documentId: 'Asiakirjan tunniste',
name: 'Asiakirjan nimi',
createdAt: 'Laatimisajankohta',
createdBy: 'Laatija',
Expand All @@ -5154,6 +5155,11 @@ export const fi = {
confidential: 'Salassapidettävä',
public: 'Julkinen',
notSet: 'Asettamatta',
receivedBy: {
label: 'Saapumistapa',
PAPER: 'Paperilla',
ELECTRONIC: 'Sähköisesti'
},
history: 'Prosessin historia',
downloadPdf: 'Lataa PDF',
states: {
Expand Down
47 changes: 44 additions & 3 deletions service/src/main/kotlin/fi/espoo/evaka/process/ProcessMetadataController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package fi.espoo.evaka.process

import fi.espoo.evaka.Audit
import fi.espoo.evaka.AuditId
import fi.espoo.evaka.application.ApplicationOrigin
import fi.espoo.evaka.application.ApplicationType
import fi.espoo.evaka.decision.DecisionType
import fi.espoo.evaka.shared.ApplicationId
Expand All @@ -24,6 +25,7 @@ import fi.espoo.evaka.shared.security.AccessControl
import fi.espoo.evaka.shared.security.Action
import fi.espoo.evaka.user.EvakaUser
import java.time.LocalDate
import java.util.UUID
import org.jdbi.v3.core.mapper.Nested
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
Expand All @@ -39,12 +41,19 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
val secondaryDocuments: List<DocumentMetadata>,
)

enum class DocumentOrigin {
ELECTRONIC,
PAPER,
}

data class DocumentMetadata(
val documentId: UUID,
val name: String,
val createdAt: HelsinkiDateTime?,
@Nested("created_by") val createdBy: EvakaUser?,
val confidential: Boolean?,
val downloadPath: String?,
val receivedBy: DocumentOrigin?,
)

// wrapper that is needed because currently returning null
Expand Down Expand Up @@ -341,6 +350,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
dt.id,
dt.name,
cd.created,
e.id AS created_by_id,
Expand All @@ -357,6 +367,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name = column("name"),
createdAt = column("created"),
createdBy =
Expand All @@ -369,7 +380,10 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
},
confidential = column("confidential"),
downloadPath =
column<String?>("document_key")?.let { "/employee/child-documents/$it/pdf" },
column<String?>("document_key")?.let {
"/employee/child-documents/$it/pdf"
},
receivedBy = null,
)
}
.exactlyOne()
Expand All @@ -381,6 +395,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
d.id,
d.created,
e.id AS created_by_id,
e.name AS created_by_name,
Expand All @@ -395,6 +410,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name = "Päätös tuesta varhaiskasvatuksessa",
createdAt = column("created"),
createdBy =
Expand All @@ -410,6 +426,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
column<String?>("document_key")?.let {
"/employee/assistance-need-decision/$decisionId/pdf"
},
receivedBy = null,
)
}
.exactlyOne()
Expand All @@ -421,6 +438,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
d.id,
d.created,
e.id AS created_by_id,
e.name AS created_by_name,
Expand All @@ -434,6 +452,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name = "Päätös tuesta esiopetuksessa",
createdAt = column("created"),
createdBy =
Expand All @@ -449,6 +468,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
column<String?>("document_key")?.let {
"/employee/assistance-need-preschool-decisions/$decisionId/pdf"
},
receivedBy = null,
)
}
.exactlyOne()
Expand All @@ -460,12 +480,14 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
a.id,
a.type,
a.sentdate,
e.id AS created_by_id,
e.name AS created_by_name,
e.type AS created_by_type,
a.confidential AS confidential
a.confidential AS confidential,
a.origin
FROM application a
LEFT JOIN evaka_user e ON e.id = a.created_by
WHERE a.id = ${bind(applicationId)}
Expand All @@ -474,6 +496,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name =
column<ApplicationType>("type").let { type ->
when (type) {
Expand All @@ -496,6 +519,13 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
},
confidential = column("confidential"),
downloadPath = null,
receivedBy =
column<ApplicationOrigin>("origin").let {
when (it) {
ApplicationOrigin.ELECTRONIC -> DocumentOrigin.ELECTRONIC
ApplicationOrigin.PAPER -> DocumentOrigin.PAPER
}
},
)
}
.exactlyOne()
Expand All @@ -522,6 +552,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
d.id,
d.type,
d.sent_date,
e.id AS created_by_id,
Expand All @@ -536,6 +567,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name =
column<DecisionType>("type").let {
when (it) {
Expand Down Expand Up @@ -566,6 +598,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
column<String?>("document_key")?.let {
"/employee/decisions/$decisionId/download"
},
receivedBy = null,
)
}
.exactlyOne()
Expand All @@ -577,6 +610,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
d.id,
d.created,
e.id AS created_by_id,
e.name AS created_by_name,
Expand All @@ -590,6 +624,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name = "Maksupäätös",
createdAt = column("created"),
createdBy =
Expand All @@ -603,6 +638,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
confidential = true,
downloadPath =
column<String?>("document_key")?.let { "/employee/fee-decisions/pdf/$it" },
receivedBy = null,
)
}
.exactlyOne()
Expand All @@ -614,6 +650,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
sql(
"""
SELECT
d.id,
d.created,
e.id AS created_by_id,
e.name AS created_by_name,
Expand All @@ -627,6 +664,7 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
}
.map {
DocumentMetadata(
documentId = column("id"),
name = "Arvopäätös",
createdAt = column("created"),
createdBy =
Expand All @@ -639,7 +677,10 @@ class ProcessMetadataController(private val accessControl: AccessControl) {
},
confidential = true,
downloadPath =
column<String?>("document_key")?.let { "/employee/value-decisions/pdf/$it" },
column<String?>("document_key")?.let {
"/employee/value-decisions/pdf/$it"
},
receivedBy = null,
)
}
.exactlyOne()
Expand Down
Loading