Formatting changes

ministryofjustice · Dec 16, 2024 · 3255032 · 3255032
1 parent b07c6ed
commit 3255032
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 22 deletions.
diff --git a/...us/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/OffenderManagerGenerator.kt b/...us/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/OffenderManagerGenerator.kt
@@ -19,7 +19,17 @@ object OffenderManagerGenerator {
     val STAFF_TEAM = ContactStaffTeam(StaffTeamLinkId(STAFF_1.id, TEAM))
 
     val DEFAULT_LOCATION =
-        Location(IdGenerator.getAndIncrement(), "B20", "1 Birmingham Street", "Bham House", "1", "Birmingham Street", "Birmingham", "West Midlands", "B20 3BA")
+        Location(
+            IdGenerator.getAndIncrement(),
+            "B20",
+            "1 Birmingham Street",
+            "Bham House",
+            "1",
+            "Birmingham Street",
+            "Birmingham",
+            "West Midlands",
+            "B20 3BA"
+        )
 
     val TEAM_OFFICE = TeamOfficeLink(TeamOfficeLinkId(TEAM.id, DEFAULT_LOCATION))
 

diff --git a/...elius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/SentencesIntegrationTest.kt b/...elius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/SentencesIntegrationTest.kt
@@ -31,7 +31,6 @@ class SentencesIntegrationTest {
     @Autowired
     lateinit var mockMvc: MockMvc
 
-
     @Test
     fun `unauthorized status returned`() {
         mockMvc
@@ -42,7 +41,9 @@ class SentencesIntegrationTest {
     @Test
     fun `no active sentences`() {
         val response = mockMvc
-            .perform(MockMvcRequestBuilders.get("/sentences/${PersonDetailsGenerator.PERSONAL_DETAILS.crn}").withToken())
+            .perform(
+                MockMvcRequestBuilders.get("/sentences/${PersonDetailsGenerator.PERSONAL_DETAILS.crn}").withToken()
+            )
             .andExpect(MockMvcResultMatchers.status().isOk)
             .andReturn().response.contentAsJson<MinimalSentenceOverview>()
 
@@ -75,7 +76,8 @@ class SentencesIntegrationTest {
                     ),
                     requirements = listOf(
                         MinimalRequirement(REQUIREMENT.id, "1 days RAR, 1 completed"),
-                        MinimalRequirement(REQUIREMENT_UNPAID_WORK.id, "Unpaid Work - Intensive"))
+                        MinimalRequirement(REQUIREMENT_UNPAID_WORK.id, "Unpaid Work - Intensive")
+                    )
                 )
             )
         )

diff --git a/...us/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/UserLocationIntegrationTest.kt b/...us/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/UserLocationIntegrationTest.kt
@@ -43,17 +43,25 @@ class UserLocationIntegrationTest {
 
     @Test
     fun `get user locations`() {
-         val response = mockMvc.perform(MockMvcRequestBuilders.get("/user/peter-parker/locations").withToken())
-             .andDo(print())
-             .andExpect(MockMvcResultMatchers.status().isOk)
-             .andReturn().response.contentAsJson<UserOfficeLocation>()
+        val response = mockMvc.perform(MockMvcRequestBuilders.get("/user/peter-parker/locations").withToken())
+            .andDo(print())
+            .andExpect(MockMvcResultMatchers.status().isOk)
+            .andReturn().response.contentAsJson<UserOfficeLocation>()
 
-        val expected =  UserOfficeLocation(
+        val expected = UserOfficeLocation(
             Name(STAFF_USER_1.forename, surname = STAFF_USER_1.surname),
-            listOf(LocationDetails(
-                DEFAULT_LOCATION.id,
-                DEFAULT_LOCATION.description,
-                Address(DEFAULT_LOCATION.buildingNumber, DEFAULT_LOCATION.streetName, DEFAULT_LOCATION.townCity, DEFAULT_LOCATION.county, DEFAULT_LOCATION.postcode))
+            listOf(
+                LocationDetails(
+                    DEFAULT_LOCATION.id,
+                    DEFAULT_LOCATION.description,
+                    Address(
+                        DEFAULT_LOCATION.buildingNumber,
+                        DEFAULT_LOCATION.streetName,
+                        DEFAULT_LOCATION.townCity,
+                        DEFAULT_LOCATION.county,
+                        DEFAULT_LOCATION.postcode
+                    )
+                )
             )
         )
         assertEquals(expected, response)

diff --git a/...s/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/appointment/CreateAppointment.kt b/...s/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/appointment/CreateAppointment.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import java.time.ZonedDateTime
 import java.util.*
 
-data class CreateAppointment (
+data class CreateAppointment(
     val user: User,
     val type: Type,
     val start: ZonedDateTime,
@@ -21,7 +21,7 @@ data class CreateAppointment (
     @JsonIgnore
     val urn = URN_PREFIX + uuid
 
-    enum class Type (val code: String) {
+    enum class Type(val code: String) {
         HomeVisitToCaseNS("CHVS"),
         InitialAppointmentInOfficeNS("COAI"),
         PlannedOfficeVisitNS("COAP"),
@@ -40,12 +40,12 @@ data class CreateAppointment (
     }
 }
 
-data class User (
+data class User(
     val username: String,
     val locationId: Long
 )
 
-data class OverlappingAppointment (
+data class OverlappingAppointment(
     val start: String,
     val end: String,
 )
diff --git a/...ius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/UserOfficeLocation.kt b/...ius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/UserOfficeLocation.kt
@@ -7,9 +7,10 @@ data class UserOfficeLocation(
 
 data class Name(
     val forename: String,
-    val middleName: String? = null ,
+    val middleName: String? = null,
     val surname: String
 )
+
 data class LocationDetails(
     val id: Long,
     val description: String,

diff --git a/...otlin/uk/gov/justice/digital/hmpps/integrations/delius/sentence/entity/OffenderManager.kt b/...otlin/uk/gov/justice/digital/hmpps/integrations/delius/sentence/entity/OffenderManager.kt
@@ -84,7 +84,7 @@ class StaffUser(
     val forename2: String? = null,
 
     val surname: String
-    ) {
+) {
     @Transient
     var email: String? = null
 
@@ -101,7 +101,7 @@ interface StaffUserRepository : JpaRepository<StaffUser, Long> {
             WHERE UPPER(u.username) = UPPER(:username)
         """
     )
-    fun findByUsername(username: String) : StaffUser?
+    fun findByUsername(username: String): StaffUser?
 
     @Query(
         """

diff --git a/...delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/SentenceAppointmentService.kt b/...delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/SentenceAppointmentService.kt
@@ -45,7 +45,10 @@ class SentenceAppointmentService(
             checkForConflicts(createAppointment)
 
             val userAndLocation =
-                staffUserRepository.getUserAndLocation(createAppointment.user.username, createAppointment.user.locationId)
+                staffUserRepository.getUserAndLocation(
+                    createAppointment.user.username,
+                    createAppointment.user.locationId
+                )
             val createAppointments: ArrayList<CreateAppointment> = arrayListOf()
 
             createAppointment.let {

diff --git a/...on-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/UserLocationService.kt b/...on-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/UserLocationService.kt
@@ -19,7 +19,7 @@ class UserLocationService(private val staffUserRepository: StaffUserRepository)
 
         return UserOfficeLocation(
             Name(user.forename, user.forename2, user.surname),
-            userLocations.map { it.toLocationDetails()}
+            userLocations.map { it.toLocationDetails() }
         )
     }