Skip to content

Commit 129a8f4

Browse files
flexable777flexable777
committed
Minor changes in events.
1 parent 3842ede commit 129a8f4

File tree

6 files changed

+99
-67
lines changed

6 files changed

+99
-67
lines changed

‎src/main/kotlin/no/nav/klage/dokument/service/DokumentUnderArbeidService.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class DokumentUnderArbeidService(
174174
publishInternalEvent(
175175
data = objectMapper.writeValueAsString(
176176
DocumentsAddedEvent(
177-
actor = BaseEvent.Actor(
177+
actor = Employee(
178178
navIdent = innloggetIdent,
179179
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
180180
),
@@ -229,7 +229,7 @@ class DokumentUnderArbeidService(
229229
publishInternalEvent(
230230
data = objectMapper.writeValueAsString(
231231
DocumentsChangedEvent(
232-
actor = BaseEvent.Actor(
232+
actor = Employee(
233233
navIdent = innloggetIdent,
234234
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
235235
),
@@ -345,7 +345,7 @@ class DokumentUnderArbeidService(
345345
publishInternalEvent(
346346
data = objectMapper.writeValueAsString(
347347
DocumentsAddedEvent(
348-
actor = BaseEvent.Actor(
348+
actor = Employee(
349349
navIdent = innloggetIdent,
350350
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
351351
),
@@ -403,7 +403,7 @@ class DokumentUnderArbeidService(
403403
publishInternalEvent(
404404
data = objectMapper.writeValueAsString(
405405
DocumentsAddedEvent(
406-
actor = BaseEvent.Actor(
406+
actor = Employee(
407407
navIdent = innloggetIdent,
408408
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
409409
),
@@ -607,7 +607,7 @@ class DokumentUnderArbeidService(
607607
publishInternalEvent(
608608
data = objectMapper.writeValueAsString(
609609
DocumentsChangedEvent(
610-
actor = BaseEvent.Actor(
610+
actor = Employee(
611611
navIdent = innloggetIdent,
612612
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
613613
),
@@ -671,7 +671,7 @@ class DokumentUnderArbeidService(
671671
publishInternalEvent(
672672
data = objectMapper.writeValueAsString(
673673
DocumentsChangedEvent(
674-
actor = BaseEvent.Actor(
674+
actor = Employee(
675675
navIdent = innloggetIdent,
676676
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
677677
),
@@ -740,7 +740,7 @@ class DokumentUnderArbeidService(
740740
publishInternalEvent(
741741
data = objectMapper.writeValueAsString(
742742
DocumentsChangedEvent(
743-
actor = BaseEvent.Actor(
743+
actor = Employee(
744744
navIdent = innloggetIdent,
745745
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
746746
),
@@ -966,7 +966,7 @@ class DokumentUnderArbeidService(
966966
publishInternalEvent(
967967
data = objectMapper.writeValueAsString(
968968
DocumentsChangedEvent(
969-
actor = BaseEvent.Actor(
969+
actor = Employee(
970970
navIdent = innloggetIdent,
971971
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
972972
),
@@ -1169,7 +1169,7 @@ class DokumentUnderArbeidService(
11691169
publishInternalEvent(
11701170
data = objectMapper.writeValueAsString(
11711171
DocumentsRemovedEvent(
1172-
actor = BaseEvent.Actor(
1172+
actor = Employee(
11731173
navIdent = innloggetIdent,
11741174
navn = saksbehandlerService.getNameForIdent(innloggetIdent),
11751175
),

‎src/main/kotlin/no/nav/klage/dokument/service/FerdigstillDokumentService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import no.nav.klage.dokument.api.mapper.DokumentMapper
66
import no.nav.klage.dokument.domain.dokumenterunderarbeid.DokumentUnderArbeidAsHoveddokument
77
import no.nav.klage.oppgave.clients.saf.SafFacade
88
import no.nav.klage.oppgave.domain.events.DokumentFerdigstiltAvSaksbehandler
9-
import no.nav.klage.oppgave.domain.kafka.BaseEvent
109
import no.nav.klage.oppgave.domain.kafka.DocumentFinishedEvent
10+
import no.nav.klage.oppgave.domain.kafka.Employee
1111
import no.nav.klage.oppgave.domain.kafka.InternalBehandlingEvent
1212
import no.nav.klage.oppgave.domain.kafka.InternalEventType
1313
import no.nav.klage.oppgave.service.BehandlingService
@@ -81,7 +81,7 @@ class FerdigstillDokumentService(
8181
publishInternalEvent(
8282
data = objectMapper.writeValueAsString(
8383
DocumentFinishedEvent(
84-
actor = BaseEvent.Actor(
84+
actor = Employee(
8585
navIdent = updatedDokument.markertFerdigBy!!,
8686
navn = saksbehandlerService.getNameForIdent(updatedDokument.markertFerdigBy!!),
8787
),

‎src/main/kotlin/no/nav/klage/oppgave/domain/kafka/InternalBehandlingEvent.kt

+30-28
Original file line numberDiff line numberDiff line change
@@ -41,41 +41,43 @@ enum class InternalEventType {
4141
TILDELING,
4242
}
4343

44+
data class Employee(
45+
val navIdent: String,
46+
val navn: String,
47+
)
48+
4449
abstract class BaseEvent(
45-
open val actor: Actor,
50+
open val actor: Employee,
4651
open val timestamp: LocalDateTime,
47-
) {
48-
data class Actor(
49-
val navIdent: String,
50-
val navn: String,
51-
)
52-
}
52+
)
5353

5454
data class MedunderskriverEvent(
55-
override val actor: Actor,
55+
override val actor: Employee,
5656
override val timestamp: LocalDateTime,
57+
val medunderskriver: Employee?,
5758
val navIdent: String?,
5859
val name: String?,
5960
val flowState: FlowState,
6061
) : BaseEvent(actor = actor, timestamp = timestamp)
6162

6263
data class RolEvent(
63-
override val actor: Actor,
64+
override val actor: Employee,
6465
override val timestamp: LocalDateTime,
66+
val rol: Employee?,
6567
val navIdent: String?,
6668
val name: String?,
6769
val flowState: FlowState,
6870
val returnDate: LocalDateTime?,
6971
) : BaseEvent(actor = actor, timestamp = timestamp)
7072

7173
data class KlagerEvent(
72-
override val actor: Actor,
74+
override val actor: Employee,
7375
override val timestamp: LocalDateTime,
7476
val part: Part,
7577
) : BaseEvent(actor = actor, timestamp = timestamp)
7678

7779
data class FullmektigEvent(
78-
override val actor: Actor,
80+
override val actor: Employee,
7981
override val timestamp: LocalDateTime,
8082
val part: Part?,
8183
) : BaseEvent(actor = actor, timestamp = timestamp)
@@ -88,44 +90,44 @@ data class Part(
8890
)
8991

9092
data class MeldingEvent(
91-
override val actor: Actor,
93+
override val actor: Employee,
9294
override val timestamp: LocalDateTime,
9395
val id: String,
9496
val text: String,
9597
) : BaseEvent(actor = actor, timestamp = timestamp)
9698

9799
data class UtfallEvent(
98-
override val actor: Actor,
100+
override val actor: Employee,
99101
override val timestamp: LocalDateTime,
100102
val utfallId: String?,
101103
) : BaseEvent(actor = actor, timestamp = timestamp)
102104

103105
data class ExtraUtfallEvent(
104-
override val actor: Actor,
106+
override val actor: Employee,
105107
override val timestamp: LocalDateTime,
106108
val utfallIdList: List<String>,
107109
) : BaseEvent(actor = actor, timestamp = timestamp)
108110

109111
data class InnsendingshjemlerEvent(
110-
override val actor: Actor,
112+
override val actor: Employee,
111113
override val timestamp: LocalDateTime,
112114
val hjemmelIdSet: Set<String>,
113115
) : BaseEvent(actor = actor, timestamp = timestamp)
114116

115117
data class RegistreringshjemlerEvent(
116-
override val actor: Actor,
118+
override val actor: Employee,
117119
override val timestamp: LocalDateTime,
118120
val hjemmelIdSet: Set<String>,
119121
) : BaseEvent(actor = actor, timestamp = timestamp)
120122

121123
data class MottattVedtaksinstansEvent(
122-
override val actor: Actor,
124+
override val actor: Employee,
123125
override val timestamp: LocalDateTime,
124126
val mottattVedtaksinstans: LocalDate,
125127
) : BaseEvent(actor = actor, timestamp = timestamp)
126128

127129
data class DocumentsChangedEvent(
128-
override val actor: Actor,
130+
override val actor: Employee,
129131
override val timestamp: LocalDateTime,
130132
val documents: List<DocumentChanged>,
131133
) : BaseEvent(actor = actor, timestamp = timestamp) {
@@ -139,48 +141,48 @@ data class DocumentsChangedEvent(
139141
}
140142

141143
data class DocumentFinishedEvent(
142-
override val actor: Actor,
144+
override val actor: Employee,
143145
override val timestamp: LocalDateTime,
144146
val id: String,
145147
val journalpostList: List<DokumentReferanse>,
146148
) : BaseEvent(actor = actor, timestamp = timestamp)
147149

148150
data class DocumentsRemovedEvent(
149-
override val actor: Actor,
151+
override val actor: Employee,
150152
override val timestamp: LocalDateTime,
151153
val idList: List<String>,
152154
) : BaseEvent(actor = actor, timestamp = timestamp)
153155

154156
data class DocumentsAddedEvent(
155-
override val actor: Actor,
157+
override val actor: Employee,
156158
override val timestamp: LocalDateTime,
157159
val documents: List<DokumentView>,
158160
) : BaseEvent(actor = actor, timestamp = timestamp)
159161

160162
data class JournalfoertDocumentModified(
161-
override val actor: Actor,
163+
override val actor: Employee,
162164
override val timestamp: LocalDateTime,
163165
val journalpostId: String,
164166
val dokumentInfoId: String,
165167
val tittel: String,
166168
) : BaseEvent(actor = actor, timestamp = timestamp)
167169

168170
data class FeilregistreringEvent(
169-
override val actor: Actor,
171+
override val actor: Employee,
170172
override val timestamp: LocalDateTime,
171173
val registered: LocalDateTime,
172174
val reason: String,
173175
val fagsystemId: String,
174176
) : BaseEvent(actor = actor, timestamp = timestamp)
175177

176178
data class BehandlingFerdigstiltEvent(
177-
override val actor: Actor,
179+
override val actor: Employee,
178180
override val timestamp: LocalDateTime,
179181
val avsluttetAvSaksbehandlerDate: LocalDateTime,
180182
) : BaseEvent(actor = actor, timestamp = timestamp)
181183

182184
data class SattPaaVentEvent(
183-
override val actor: Actor,
185+
override val actor: Employee,
184186
override val timestamp: LocalDateTime,
185187
val sattPaaVent: SattPaaVent?,
186188
) : BaseEvent(actor = actor, timestamp = timestamp) {
@@ -192,9 +194,9 @@ data class SattPaaVentEvent(
192194
}
193195

194196
data class TildelingEvent(
195-
override val actor: Actor,
197+
override val actor: Employee,
196198
override val timestamp: LocalDateTime,
197-
val navIdent: String?,
198-
val name: String?,
199+
val saksbehandler: Employee?,
199200
val fradelingReasonId: String?,
201+
val hjemmelIdList: List<String>,
200202
) : BaseEvent(actor = actor, timestamp = timestamp)

0 commit comments

Comments
 (0)