Merge pull request #1194 from ministryofjustice/changelog-fix-timestamp

to fix date on change log
ministryofjustice · Sep 14, 2022 · cb53f27 · cb53f27
2 parents a20a6a0 + f2b653f
commit cb53f27
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...n/kotlin/uk/gov/justice/digital/hmpps/hmppsinterventionsservice/dto/ChangelogValuesDTO.kt b/...n/kotlin/uk/gov/justice/digital/hmpps/hmppsinterventionsservice/dto/ChangelogValuesDTO.kt
@@ -29,13 +29,13 @@ data class ChangelogValuesDTO(
       AmendTopic.NEEDS_AND_REQUIREMENTS_INTERPRETER_REQUIRED, "Interpreter required was changed"
     )
     fun from(changelog: Changelog, userDetail: UserDetail): ChangelogValuesDTO {
-      val dateTimeFormatter = DateTimeFormatter.ofPattern("dd MMM yyyy 'at' h.mm a")
+      val dateTimeFormatter = DateTimeFormatter.ofPattern("dd MMM yyyy 'at' h.mma")
       return ChangelogValuesDTO(
         changelogId = changelog.id,
         referralId = changelog.referralId,
         topic = changelog.topic,
         description = amendTopicDescription[changelog.topic]!!,
-        changedAt = changelog.changedAt.format(dateTimeFormatter),
+        changedAt = changelog.changedAt.format(dateTimeFormatter).replace("AM", "am").replace("PM", "pm"),
         name = userDetail.firstName + ' ' + userDetail.lastName,
         reasonForChange = changelog.reasonForChange
       )