generated from ministryofjustice/template-repository
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
825242e
commit 22bd573
Showing
14 changed files
with
434 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
...lius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CreateAppointmentIntTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package uk.gov.justice.digital.hmpps | ||
|
|
||
| import org.hamcrest.MatcherAssert.assertThat | ||
| import org.hamcrest.Matchers.equalTo | ||
| import org.junit.jupiter.api.Assertions.assertNotNull | ||
| import org.junit.jupiter.api.Test | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc | ||
| import org.springframework.boot.test.context.SpringBootTest | ||
| import org.springframework.data.domain.PageRequest | ||
| import org.springframework.test.web.servlet.MockMvc | ||
| import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post | ||
| import org.springframework.test.web.servlet.result.MockMvcResultMatchers | ||
| import uk.gov.justice.digital.hmpps.api.model.CreateAppointment | ||
| import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator | ||
| import uk.gov.justice.digital.hmpps.entity.AlertRepository | ||
| import uk.gov.justice.digital.hmpps.entity.AppointmentRepository | ||
| import uk.gov.justice.digital.hmpps.test.CustomMatchers.isCloseTo | ||
| import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withJson | ||
| import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withToken | ||
| import java.time.ZonedDateTime | ||
|
|
||
| @AutoConfigureMockMvc | ||
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) | ||
| internal class CreateAppointmentIntTests { | ||
| @Autowired | ||
| internal lateinit var mockMvc: MockMvc | ||
|
|
||
| @Autowired | ||
| internal lateinit var appointmentRepository: AppointmentRepository | ||
|
|
||
| @Autowired | ||
| internal lateinit var alertRepository: AlertRepository | ||
|
|
||
| @Test | ||
| fun `create appointment when offender does not exist retuns a 404 response`() { | ||
| mockMvc.perform( | ||
| post("/appointments/D123456") | ||
| .withToken() | ||
| .withJson( | ||
| CreateAppointment( | ||
| CreateAppointment.Type.Accommodation, | ||
| ZonedDateTime.now().plusDays(1), | ||
| ZonedDateTime.now().plusDays(1) | ||
| ) | ||
| ) | ||
| ).andExpect(MockMvcResultMatchers.status().isNotFound) | ||
| } | ||
|
|
||
| @Test | ||
| fun `create appointment retuns a 409 when conflicting appointment`() { | ||
| val start = ZonedDateTime.now().plusDays(7).plusMinutes(10) | ||
| mockMvc.perform( | ||
| post("/appointments/${PersonGenerator.CREATE_APPOINTMENT.crn}") | ||
| .withToken() | ||
| .withJson( | ||
| CreateAppointment(CreateAppointment.Type.Health, start, start.plusMinutes(30)) | ||
| ) | ||
| ).andExpect(MockMvcResultMatchers.status().isConflict) | ||
| } | ||
|
|
||
| @Test | ||
| fun `create appointment ending before start returns bad request`() { | ||
| val start = ZonedDateTime.now().plusDays(7).plusMinutes(10) | ||
| mockMvc.perform( | ||
| post("/appointments/${PersonGenerator.CREATE_APPOINTMENT.crn}") | ||
| .withToken() | ||
| .withJson( | ||
| CreateAppointment(CreateAppointment.Type.Finance, start, start.minusSeconds(1)) | ||
| ) | ||
| ).andExpect(MockMvcResultMatchers.status().isBadRequest) | ||
| } | ||
|
|
||
| @Test | ||
| fun `create a new appointment`() { | ||
| val person = PersonGenerator.CREATE_APPOINTMENT | ||
| val start = ZonedDateTime.now().plusDays(1) | ||
| val notes = "Resettlement Passport Notes" | ||
| val create = CreateAppointment(CreateAppointment.Type.SkillsAndWork, start, start.plusHours(1), notes) | ||
|
|
||
| mockMvc.perform( | ||
| post("/appointments/${person.crn}") | ||
| .withToken() | ||
| .withJson(create) | ||
| ).andExpect(MockMvcResultMatchers.status().isCreated) | ||
|
|
||
| val appointment = appointmentRepository.findAppointmentsFor( | ||
| person.crn, | ||
| start.toLocalDate(), | ||
| start.toLocalDate(), | ||
| PageRequest.of(0, 1) | ||
| ).first() | ||
|
|
||
| assertThat(appointment.type.code, equalTo(create.type.code)) | ||
| assertThat(appointment.date, equalTo(start.toLocalDate())) | ||
| assertThat(appointment.startTime, isCloseTo(start)) | ||
| assertThat(appointment.notes, equalTo(notes)) | ||
| assertThat(appointment.externalReference, equalTo(create.urn)) | ||
|
|
||
| val alert = alertRepository.findAll().firstOrNull { it.contactId == appointment.id } | ||
| assertNotNull(alert) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...rt-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/CreateAppointment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package uk.gov.justice.digital.hmpps.api.model | ||
|
|
||
| import java.time.ZonedDateTime | ||
| import java.util.* | ||
|
|
||
| data class CreateAppointment( | ||
| val type: Type, | ||
| val start: ZonedDateTime, | ||
| val end: ZonedDateTime, | ||
| val notes: String? = null, | ||
| val uuid: UUID = UUID.randomUUID() | ||
| ) { | ||
| val urn = URN_PREFIX + uuid | ||
|
|
||
| enum class Type(val code: String) { | ||
| Accommodation("RP1"), | ||
| ThinkingAndBehaviour("RP2"), | ||
| FamilyAndCommunity("RP3"), | ||
| DrugsAndAlcohol("RP4"), | ||
| SkillsAndWork("RP5"), | ||
| Finance("RP6"), | ||
| Health("RP7"), | ||
| Benefits("RP8") | ||
| } | ||
|
|
||
| companion object { | ||
| const val URN_PREFIX = "urn:uk:gov:hmpps:resettlement-passport-service:appointment:" | ||
| } | ||
| } |
Oops, something went wrong.