Skip to content

Commit 3ab32c9

Browse files
authored
Merge pull request #1875 from Tampere/fix-agent-naming-tre
Fix name order for finance decision agents to match child document agents (TRE)
2 parents f271fc8 + 597b015 commit 3ab32c9

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

service/src/main/kotlin/fi/tampere/trevaka/archival/TampereArchivalClient.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ internal fun createDecisionMakerAgent(firstName: String?, lastName: String?): Li
190190
listOf(
191191
Agent().apply {
192192
agentRole = "Päättäjä"
193-
agentName = "$firstName $lastName"
193+
// name order derives from evaka_user names
194+
agentName = "$lastName $firstName"
194195
// agent corporateName left empty
195196
},
196197
)

service/src/test/kotlin/fi/tampere/trevaka/archival/TampereArchivalClientTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,13 @@ private val testEvakaUser = EvakaUser(AuthenticatedUser.SystemInternalUser.evaka
364364

365365
private val testPreparerUser = EvakaUser(
366366
id = EvakaUserId(UUID.randomUUID()),
367-
name = "Esko Esivalmistelija",
367+
name = "Esivalmistelija Esko",
368368
EvakaUserType.EMPLOYEE,
369369
)
370370

371371
private val testDeciderUser = EvakaUser(
372372
id = EvakaUserId(UUID.randomUUID()),
373-
name = "Pänü Päättäjä",
373+
name = "Päättäjä Pänü",
374374
EvakaUserType.EMPLOYEE,
375375
)
376376

service/src/test/resources/archival-client/archival-post-record-request-child-document.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<ns2:created>2025-05-12</ns2:created>
1515
<ns2:agent>
1616
<ns2:agentRole>Laatija</ns2:agentRole>
17-
<ns2:agentName>Esko Esivalmistelija</ns2:agentName>
17+
<ns2:agentName>Esivalmistelija Esko</ns2:agentName>
1818
</ns2:agent>
1919
<ns2:agent>
2020
<ns2:agentRole>Päättäjä</ns2:agentRole>
21-
<ns2:agentName>Pänü Päättäjä</ns2:agentName>
21+
<ns2:agentName>Päättäjä Pänü</ns2:agentName>
2222
</ns2:agent>
2323
</ns3:metadata>
2424
<ns3:content>

service/src/test/resources/archival-client/archival-post-record-request-fee-decision-daycare.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ns2:created>2020-01-15</ns2:created>
1515
<ns2:agent>
1616
<ns2:agentRole>Päättäjä</ns2:agentRole>
17-
<ns2:agentName>Arto Asiakasmaksusihteeri</ns2:agentName>
17+
<ns2:agentName>Asiakasmaksusihteeri Arto</ns2:agentName>
1818
</ns2:agent>
1919
</ns3:metadata>
2020
<ns3:content>

service/src/test/resources/archival-client/archival-post-record-request-voucher-value-decision-daycare.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ns2:created>2020-01-15</ns2:created>
1515
<ns2:agent>
1616
<ns2:agentRole>Päättäjä</ns2:agentRole>
17-
<ns2:agentName>Marjo Maksumestari</ns2:agentName>
17+
<ns2:agentName>Maksumestari Marjo</ns2:agentName>
1818
</ns2:agent>
1919
</ns3:metadata>
2020
<ns3:content>

0 commit comments

Comments
 (0)