formatting

Author: gbmojo

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

@@ -1,10 +1,12 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
-import java.util.UUID
-
 data class ExpressionOfInterestMessage(
-  val messageId: String = UUID.randomUUID().toString(),
+  val messageId: String,
   val jobId: String,
   val prisonNumber: String,
-  val eventType: MessageType = MessageType.EXPRESSION_OF_INTEREST_CREATED,
-)
+  val eventType: EventType = EventType.EXPRESSION_OF_INTEREST_MESSAGE_CREATED,
+) {
+  enum class EventType {
+    EXPRESSION_OF_INTEREST_MESSAGE_CREATED,
+  }
+}

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

@@ -8,6 +8,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ExpressionO
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ExpressionOfInterestMessage
 import uk.gov.justice.hmpps.sqs.HmppsQueue
 import uk.gov.justice.hmpps.sqs.HmppsQueueService
+import java.util.UUID
 
 @Component
 class PutExpressionInterestService(
@@ -23,6 +24,7 @@ class PutExpressionInterestService(
       val messageBody =
         objectMapper.writeValueAsString(
           ExpressionOfInterestMessage(
+            messageId = UUID.randomUUID().toString(),
             jobId = expressionOfInterest.jobId,
             prisonNumber = expressionOfInterest.prisonNumber,
           ),

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

@@ -18,9 +18,9 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.exception.MessageFailedE
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.MockMvcExtensions.objectMapper
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ExpressionOfInterest
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ExpressionOfInterestMessage
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.MessageType
 import uk.gov.justice.hmpps.sqs.HmppsQueue
 import uk.gov.justice.hmpps.sqs.HmppsQueueService
+import kotlin.test.assertEquals
 
 class PutExpressionInterestServiceTest :
   DescribeSpec({
@@ -46,9 +46,9 @@ class PutExpressionInterestServiceTest :
         val expressionOfInterest = ExpressionOfInterest(jobId = "12345", prisonNumber = "H1234")
         val expectedMessage =
           ExpressionOfInterestMessage(
+            messageId = "1",
             jobId = "12345",
             prisonNumber = "H1234",
-            eventType = MessageType.EXPRESSION_OF_INTEREST_CREATED,
           )
         val messageBody = objectMapper.writeValueAsString(expectedMessage)
 
@@ -87,16 +87,21 @@ class PutExpressionInterestServiceTest :
             messageId = "1",
             jobId = "12345",
             prisonNumber = "H1234",
-            eventType = MessageType.EXPRESSION_OF_INTEREST_CREATED,
           )
 
         val serializedJson = objectMapper.writeValueAsString(expectedMessage)
+
         val deserializedMap: Map<String, Any?> = objectMapper.readValue(serializedJson)
+        val eventType = deserializedMap["eventType"]
 
         assert(deserializedMap.containsKey("messageId"))
         assert(deserializedMap.containsKey("jobId"))
         assert(deserializedMap.containsKey("prisonNumber"))
         assert(deserializedMap.containsKey("eventType"))
+        assertEquals(
+          expected = ExpressionOfInterestMessage.EventType.EXPRESSION_OF_INTEREST_MESSAGE_CREATED.name,
+          actual = eventType,
+        )
       }
     }
   })