Cas2bail/main #2641
+15,296
−3
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
Empty file.
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,175 @@ | ||
| package uk.gov.justice.digital.hmpps.approvedpremisesapi.controller.cas2bail | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper | ||
| import jakarta.transaction.Transactional | ||
| import org.springframework.http.ResponseEntity | ||
| import org.springframework.stereotype.Service | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.cas2bail.ApplicationsCas2bailDelegate | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.* | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.jpa.entity.cas2bail.Cas2BailApplicationEntity | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.jpa.entity.cas2bail.Cas2BailApplicationSummaryEntity | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.BadRequestProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.ConflictProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.ForbiddenProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.NotFoundProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.results.AuthorisableActionResult | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.results.ValidatableActionResult | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.HttpAuthService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.NomisUserService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2.OffenderService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2bail.Cas2BailApplicationService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.transformer.cas2bail.Cas2BailApplicationsTransformer | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.util.PageCriteria | ||
| import java.net.URI | ||
| import java.util.* | ||
|
|
||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.Cas2ApplicationSummary as ModelCas2ApplicationSummary | ||
|
|
||
| @Service( | ||
| "uk.gov.justice.digital.hmpps.approvedpremisesapi.controller.cas2bail" + | ||
| ".Cas2BailApplicationsController", | ||
| ) | ||
| class Cas2BailApplicationController( | ||
| private val httpAuthService: HttpAuthService, | ||
| private val cas2BailApplicationService: Cas2BailApplicationService, | ||
| private val cas2BailApplicationsTransformer: Cas2BailApplicationsTransformer, | ||
| private val objectMapper: ObjectMapper, | ||
| private val offenderService: OffenderService, | ||
| private val userService: NomisUserService, | ||
| ) : ApplicationsCas2bailDelegate { | ||
|
|
||
| override fun applicationsGet( | ||
| isSubmitted: Boolean?, | ||
| page: Int?, | ||
| prisonCode: String?, | ||
| ): ResponseEntity<List<ModelCas2ApplicationSummary>> { | ||
| val user = userService.getUserForRequest() | ||
|
|
||
| prisonCode?.let { if (prisonCode != user.activeCaseloadId) throw ForbiddenProblem() } | ||
|
|
||
| val pageCriteria = PageCriteria("createdAt", SortDirection.desc, page) | ||
|
|
||
| val (applications, metadata) = cas2BailApplicationService.getCas2BailApplications(prisonCode, isSubmitted, user, pageCriteria) | ||
|
|
||
| return ResponseEntity.ok().headers( | ||
| metadata?.toHeaders(), | ||
| ).body(getPersonNamesAndTransformToSummaries(applications)) | ||
| } | ||
|
|
||
| override fun applicationsApplicationIdGet(applicationId: UUID): ResponseEntity<Application> { | ||
| val user = userService.getUserForRequest() | ||
|
|
||
| val application = when ( | ||
| val applicationResult = cas2BailApplicationService | ||
| .getCas2BailApplicationForUser( | ||
| applicationId, | ||
| user | ||
| ) | ||
|
|
||
| ) { | ||
| is AuthorisableActionResult.NotFound -> null | ||
|
There was a problem hiding this comment. I think there's an open question as to whether we should be adding more use of deprecated code (in this case using AuthorisableActionResult instead of CasResult). I'm not sure what the answer is, i'll get back to you. There was a problem hiding this comment. my position is we shouldn't use deprecated code, and use the latest pattern we have. please can we do this? |
||
| is AuthorisableActionResult.Unauthorised -> throw ForbiddenProblem() | ||
| is AuthorisableActionResult.Success -> applicationResult.entity | ||
| } | ||
|
|
||
| if (application != null) { | ||
| return ResponseEntity.ok(getPersonDetailAndTransform(application)) | ||
| } | ||
| throw NotFoundProblem(applicationId, "Application") | ||
|
There was a problem hiding this comment. I appreciate that you've copied this code, but this NotFoundProblem can be moved into line 70 |
||
| } | ||
|
|
||
| @Transactional | ||
| override fun applicationsPost(body: NewApplication): ResponseEntity<Application> { | ||
| val nomisPrincipal = httpAuthService.getNomisPrincipalOrThrow() | ||
| val user = userService.getUserForRequest() | ||
|
|
||
| val personInfo = offenderService.getFullInfoForPersonOrThrow(body.crn) | ||
|
|
||
| val applicationResult = cas2BailApplicationService.createCas2BailApplication( | ||
| body.crn, | ||
| user, | ||
| nomisPrincipal.token.tokenValue, | ||
| ) | ||
|
|
||
| val application = when (applicationResult) { | ||
| is ValidatableActionResult.GeneralValidationError -> throw BadRequestProblem(errorDetail = applicationResult.message) | ||
| is ValidatableActionResult.FieldValidationError -> throw BadRequestProblem(invalidParams = applicationResult.validationMessages) | ||
| is ValidatableActionResult.ConflictError -> throw ConflictProblem(id = applicationResult.conflictingEntityId, conflictReason = applicationResult.message) | ||
| is ValidatableActionResult.Success -> applicationResult.entity | ||
| } | ||
|
|
||
| return ResponseEntity | ||
| .created(URI.create("/cas2/applications/${application.id}")) | ||
|
There was a problem hiding this comment. should this be /cas2bail? |
||
| .body(cas2BailApplicationsTransformer.transformJpaToApi(application, personInfo)) | ||
| } | ||
|
|
||
| @Transactional | ||
| override fun applicationsApplicationIdPut( | ||
| applicationId: UUID, | ||
| body: UpdateApplication, | ||
| ): ResponseEntity<Application> { | ||
| val user = userService.getUserForRequest() | ||
|
|
||
| val serializedData = objectMapper.writeValueAsString(body.data) | ||
|
|
||
| val applicationResult = cas2BailApplicationService.updateCas2BailApplication( | ||
| applicationId = | ||
| applicationId, | ||
| data = serializedData, | ||
| user, | ||
| ) | ||
|
|
||
| val validationResult = when (applicationResult) { | ||
| is AuthorisableActionResult.NotFound -> throw NotFoundProblem(applicationId, "Application") | ||
| is AuthorisableActionResult.Unauthorised -> throw ForbiddenProblem() | ||
| is AuthorisableActionResult.Success -> applicationResult.entity | ||
| } | ||
|
|
||
| val updatedApplication = when (validationResult) { | ||
| is ValidatableActionResult.GeneralValidationError -> throw BadRequestProblem(errorDetail = validationResult.message) | ||
| is ValidatableActionResult.FieldValidationError -> throw BadRequestProblem(invalidParams = validationResult.validationMessages) | ||
| is ValidatableActionResult.ConflictError -> throw ConflictProblem(id = validationResult.conflictingEntityId, conflictReason = validationResult.message) | ||
| is ValidatableActionResult.Success -> validationResult.entity | ||
| } | ||
|
|
||
| return ResponseEntity.ok(getPersonDetailAndTransform(updatedApplication)) | ||
| } | ||
|
|
||
| @Transactional | ||
| override fun applicationsApplicationIdAbandonPut(applicationId: UUID): ResponseEntity<Unit> { | ||
| val user = userService.getUserForRequest() | ||
|
|
||
| val validationResult = when (val applicationResult = cas2BailApplicationService.abandonCas2BailApplication(applicationId, user)) { | ||
| is AuthorisableActionResult.NotFound -> throw NotFoundProblem(applicationId, "Application") | ||
| is AuthorisableActionResult.Unauthorised -> throw ForbiddenProblem() | ||
| is AuthorisableActionResult.Success -> applicationResult.entity | ||
| } | ||
|
|
||
| when (validationResult) { | ||
| is ValidatableActionResult.GeneralValidationError -> throw BadRequestProblem(errorDetail = validationResult.message) | ||
| is ValidatableActionResult.FieldValidationError -> throw BadRequestProblem(invalidParams = validationResult.validationMessages) | ||
| is ValidatableActionResult.ConflictError -> throw ConflictProblem(id = validationResult.conflictingEntityId, conflictReason = validationResult.message) | ||
| is ValidatableActionResult.Success -> validationResult.entity | ||
| } | ||
|
|
||
| return ResponseEntity.ok(Unit) | ||
| } | ||
|
|
||
| private fun getPersonNamesAndTransformToSummaries(applicationSummaries: List<Cas2BailApplicationSummaryEntity>): List<uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.Cas2ApplicationSummary> { | ||
|
There was a problem hiding this comment. no need for full path on Cas2ApplicationSummary, can import it |
||
| val crns = applicationSummaries.map { it.crn } | ||
|
|
||
| val personNamesMap = offenderService.getMapOfPersonNamesAndCrns(crns) | ||
|
|
||
| return applicationSummaries.map { application -> | ||
| cas2BailApplicationsTransformer.transformJpaSummaryToSummary(application, personNamesMap[application.crn]!!) | ||
| } | ||
| } | ||
|
|
||
| private fun getPersonDetailAndTransform( | ||
| application: Cas2BailApplicationEntity, | ||
| ): Application { | ||
| val personInfo = offenderService.getFullInfoForPersonOrThrow(application.crn) | ||
|
|
||
| return cas2BailApplicationsTransformer.transformJpaToApi(application, personInfo) | ||
| } | ||
| } | ||
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,116 @@ | ||
| package uk.gov.justice.digital.hmpps.approvedpremisesapi.controller.cas2bail | ||
|
|
||
| import org.springframework.http.HttpStatus | ||
| import org.springframework.http.ResponseEntity | ||
| import org.springframework.stereotype.Service | ||
| import org.zalando.problem.AbstractThrowableProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.cas2bail.AssessmentsCas2bailDelegate | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.api.model.* | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.jpa.entity.Cas2ApplicationNoteEntity | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.ConflictProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.ForbiddenProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.problem.NotFoundProblem | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.results.CasResult | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.ExternalUserService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2bail.Cas2BailApplicationNoteService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2bail.Cas2BailAssessmentService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.service.cas2bail.Cas2BailStatusUpdateService | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.transformer.cas2.ApplicationNotesTransformer | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.transformer.cas2bail.Cas2BailAssessmentsTransformer | ||
| import uk.gov.justice.digital.hmpps.approvedpremisesapi.util.extractEntityFromCasResult | ||
| import java.net.URI | ||
| import java.util.* | ||
|
|
||
| @Service("Cas2BailAssessmentsController") | ||
| class Cas2BailAssessmentsController ( | ||
|
There was a problem hiding this comment. because the class name is unique within the project, you shouldn't need to specify a value in the @service annotation. Same goes for all other controllers |
||
| private val cas2BailAssessmentService: Cas2BailAssessmentService, | ||
| private val cas2BailApplicationNoteService: Cas2BailApplicationNoteService, | ||
| private val cas2BailAssessmentsTransformer: Cas2BailAssessmentsTransformer, | ||
| private val applicationNotesTransformer: ApplicationNotesTransformer, | ||
| private val cas2BailStatusUpdateService: Cas2BailStatusUpdateService, | ||
| private val externalUserService: ExternalUserService, | ||
| ) : AssessmentsCas2bailDelegate { | ||
|
|
||
| override fun assessmentsAssessmentIdGet(assessmentId: UUID): ResponseEntity<Cas2Assessment> { | ||
| val assessment = when ( | ||
| val assessmentResult = cas2BailAssessmentService.getAssessment(assessmentId) | ||
| ) { | ||
| is CasResult.NotFound -> throw NotFoundProblem(assessmentId, "Cas2BailAssessment") | ||
| is CasResult.Unauthorised -> throw ForbiddenProblem() | ||
| is CasResult.Success -> assessmentResult | ||
| is CasResult.ConflictError<*> -> throw ConflictProblem(assessmentId, "Cas2BailAssessment conflict by assessmentId") | ||
| is CasResult.FieldValidationError<*> -> CasResult.FieldValidationError(mapOf("$.reason" to "doesNotExist")) | ||
| is CasResult.GeneralValidationError<*> -> CasResult.GeneralValidationError("General Validation Error") | ||
| } | ||
|
|
||
| val cas2BailAssessmentEntity = extractEntityFromCasResult(assessment) | ||
| return ResponseEntity.ok(cas2BailAssessmentsTransformer.transformJpaToApiRepresentation(cas2BailAssessmentEntity)) | ||
| } | ||
|
|
||
| override fun assessmentsAssessmentIdPut( | ||
| assessmentId: UUID, | ||
| updateCas2Assessment: UpdateCas2Assessment, | ||
| ): ResponseEntity<Cas2Assessment> { | ||
| val assessmentResult = cas2BailAssessmentService.updateAssessment(assessmentId, updateCas2Assessment) | ||
| when (assessmentResult) { | ||
| is CasResult.NotFound -> throw NotFoundProblem(assessmentId, "Assessment") | ||
| is CasResult.Unauthorised -> throw ForbiddenProblem() | ||
| is CasResult.Success -> assessmentResult | ||
| is CasResult.ConflictError<*> -> throw ConflictProblem(assessmentId, "Cas2BailAssessment conflict by assessmentId") | ||
| is CasResult.FieldValidationError<*> -> CasResult.FieldValidationError(mapOf("$.reason" to "doesNotExist")) | ||
| is CasResult.GeneralValidationError<*> -> CasResult.GeneralValidationError("General Validation Error") | ||
| } | ||
|
|
||
| val cas2BailAssessmentEntity = extractEntityFromCasResult(assessmentResult) | ||
| return ResponseEntity.ok( | ||
| cas2BailAssessmentsTransformer.transformJpaToApiRepresentation(cas2BailAssessmentEntity), | ||
| ) | ||
| } | ||
|
|
||
| override fun assessmentsAssessmentIdStatusUpdatesPost( | ||
| assessmentId: UUID, | ||
| cas2AssessmentStatusUpdate: Cas2AssessmentStatusUpdate, | ||
| ): ResponseEntity<Unit> { | ||
| val result = cas2BailStatusUpdateService.createForAssessment( | ||
| assessmentId = assessmentId, | ||
| statusUpdate = cas2AssessmentStatusUpdate, | ||
| assessor = externalUserService.getUserForRequest(), | ||
| ) | ||
|
|
||
| processAuthorisationFor(result) | ||
| .run { processValidation(result) } | ||
|
|
||
| return ResponseEntity(HttpStatus.CREATED) | ||
| } | ||
|
|
||
| override fun assessmentsAssessmentIdNotesPost( | ||
| assessmentId: UUID, | ||
| body: NewCas2ApplicationNote, | ||
| ): ResponseEntity<Cas2ApplicationNote> { | ||
| val noteResult = cas2BailApplicationNoteService.createAssessmentNote(assessmentId, body) | ||
|
|
||
| val validationResult = processAuthorisationFor( noteResult) as CasResult<Cas2ApplicationNote> | ||
|
|
||
| val note = processValidation(validationResult) as Cas2ApplicationNoteEntity | ||
|
|
||
| return ResponseEntity | ||
| .created(URI.create("/cas2/assessments/$assessmentId/notes/${note.id}")) | ||
| .body( | ||
| applicationNotesTransformer.transformJpaToApi(note), | ||
| ) | ||
| } | ||
|
|
||
| private fun <EntityType> processAuthorisationFor( | ||
| result: CasResult<EntityType> | ||
| ): Any? { | ||
|
|
||
| return extractEntityFromCasResult(result) | ||
|
|
||
| } | ||
|
|
||
|
|
||
| private fun <EntityType : Any> processValidation(casResult: CasResult<EntityType>): Any { | ||
| return extractEntityFromCasResult(casResult) | ||
| } | ||
|
|
||
| } | ||
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 |
|---|---|---|
|
|
@@ -53,6 +53,16 @@ class Cas2ApplicationJsonSchemaEntity( | |
| schema: String, | ||
| ) : JsonSchemaEntity(id, addedAt, schema) | ||
|
|
||
| @Entity | ||
| @DiscriminatorValue("CAS_2_BAIL_APPLICATION") | ||
| @Table(name = "cas_2_bail_application_json_schemas") | ||
| @PrimaryKeyJoinColumn(name = "json_schema_id") | ||
| class Cas2BailApplicationJsonSchemaEntity( | ||
| id: UUID, | ||
| addedAt: OffsetDateTime, | ||
| schema: String, | ||
| ) : JsonSchemaEntity(id, addedAt, schema) | ||
|
There was a problem hiding this comment. i'm not sure if you want to do this now, but we've decided to remove all the Json Schema/Json Validation code and tables. See https://dsdmoj.atlassian.net/browse/APS-1570 for what we think can be removed. |
||
|
|
||
| @Entity | ||
| @DiscriminatorValue("TEMPORARY_ACCOMMODATION_APPLICATION") | ||
| @Table(name = "temporary_accommodation_application_json_schemas") | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because the class name is unique within the project, you shouldn't need to specify a value in the @service annotation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed done.