Skip to content

Commit 3441c03

Browse files
committed
convention edits to enum
1 parent 91d49aa commit 3441c03

File tree

4 files changed

+16
-37
lines changed

4 files changed

+16
-37
lines changed

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/HmppsMessage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
22

33
data class HmppsMessage(
44
val messageId: String,
5-
val eventType: String,
5+
val eventType: HmppsMessageEventType,
66
val description: String? = null,
77
val messageAttributes: Map<String, String> = emptyMap(),
88
)
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
22

3-
enum class HmppsMessageEventType {
4-
ExpressionOfInterestCreated,
3+
enum class HmppsMessageEventType(
4+
val type: String,
5+
val eventTypeCoe: String,
6+
val description: String,
7+
) {
8+
EXPRESSION_OF_INTEREST_CREATED(
9+
type = "mjma-jobs-board.job.created",
10+
eventTypeCoe = "ExpressionOfInterestCreated",
11+
description = "An expression of interest has been created",
12+
),
513
}

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/PutExpressionInterestService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class PutExpressionInterestService(
2727
objectMapper.writeValueAsString(
2828
HmppsMessage(
2929
messageId = UUID.randomUUID().toString(),
30-
eventType = HmppsMessageEventType.ExpressionOfInterestCreated.name,
30+
eventType = HmppsMessageEventType.EXPRESSION_OF_INTEREST_CREATED,
3131
messageAttributes =
3232
mapOf(
3333
"jobId" to expressionOfInterest.jobId,

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/PutExpressionInterestServiceTest.kt

+4-33
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class PutExpressionInterestServiceTest :
7979
val expectedMessage =
8080
HmppsMessage(
8181
messageId = "1",
82-
eventType = HmppsMessageEventType.ExpressionOfInterestCreated.name,
82+
eventType = HmppsMessageEventType.EXPRESSION_OF_INTEREST_CREATED,
8383
messageAttributes =
8484
mapOf(
8585
"jobId" to "12345",
@@ -95,7 +95,7 @@ class PutExpressionInterestServiceTest :
9595
assert(deserializedMap.containsKey("messageAttributes"))
9696
assert(deserializedMap.containsKey("eventType"))
9797
assertEquals(
98-
expected = "ExpressionOfInterestCreated",
98+
expected = "EXPRESSION_OF_INTEREST_CREATED",
9999
actual = eventType,
100100
)
101101

@@ -109,7 +109,7 @@ class PutExpressionInterestServiceTest :
109109
val expectedMessage =
110110
HmppsMessage(
111111
messageId = "1",
112-
eventType = HmppsMessageEventType.ExpressionOfInterestCreated.name,
112+
eventType = HmppsMessageEventType.EXPRESSION_OF_INTEREST_CREATED,
113113
messageAttributes =
114114
mapOf(
115115
"jobId" to "12345",
@@ -122,7 +122,7 @@ class PutExpressionInterestServiceTest :
122122
val eventType = deserializedMap["eventType"]
123123

124124
assertEquals(
125-
expected = "ExpressionOfInterestCreated",
125+
expected = "EXPRESSION_OF_INTEREST_CREATED",
126126
actual = eventType,
127127
)
128128

@@ -138,34 +138,5 @@ class PutExpressionInterestServiceTest :
138138
},
139139
)
140140
}
141-
142-
it("allows messages of any type and anybody to be sent") {
143-
val externalType = "externalType"
144-
145-
val expectedMessage =
146-
HmppsMessage(
147-
messageId = "1",
148-
eventType = externalType,
149-
messageAttributes =
150-
mapOf(
151-
"personId" to "12345",
152-
"entityNumber" to "H1234",
153-
),
154-
)
155-
156-
val serializedJson = objectMapper.writeValueAsString(expectedMessage)
157-
158-
val deserializedMap: Map<String, Any?> = objectMapper.readValue(serializedJson)
159-
val eventType = deserializedMap["eventType"]
160-
161-
assertEquals(
162-
expected = externalType,
163-
actual = eventType,
164-
)
165-
166-
val messageAttributes = deserializedMap["messageAttributes"] as? Map<String, String>
167-
messageAttributes?.containsKey("personId")?.let { assert(it) }
168-
messageAttributes?.containsKey("entityNumber")?.let { assert(it) }
169-
}
170141
}
171142
})

0 commit comments

Comments
 (0)