Slimming down golden record

Author: chiaramapellimt

openapi.yml

@@ -821,12 +821,6 @@ components:
     Hearing:
       type: object
       properties:
-        id:
-          type: number
-          nullable: true
-        locationId:
-          type: number
-          nullable: true
         dateTimeOfHearing:
           type: string
           format: date-time
@@ -836,15 +830,9 @@ components:
           nullable: true
         outcome:
           nullable: true
-        agencyId:
-          type: string
-          nullable: true
     HearingOutcome:
       type: object
       properties:
-        id:
-          type: number
-          nullable: true
         code:
           type: string
           nullable: true
@@ -951,21 +939,10 @@ components:
     IncidentDetails:
       type: object
       properties:
-        locationId:
-          type: number
-          nullable: true
         dateTimeOfIncident:
           type: string
           format: date-time
           nullable: true
-        dateTimeOfDiscovery:
-          type: string
-          format: date-time
-          nullable: true
-        handoverDeadline:
-          type: string
-          format: date-time
-          nullable: true
     IncidentRole:
       type: object
       properties:
@@ -974,12 +951,6 @@ components:
           nullable: true
         offenceRule:
           nullable: true
-        associatedPrisonersNumber:
-          type: string
-          nullable: true
-        associatedPrisonersName:
-          type: string
-          nullable: true
     LatestSentenceKeyDatesAndAdjustments:
       type: object
       properties:
@@ -1051,15 +1022,6 @@ components:
           nullable: true
         offenceRule:
           nullable: true
-        victimPrisonersNumber:
-          type: string
-          nullable: true
-        victimStaffUsername:
-          type: string
-          nullable: true
-        victimOtherPersonsName:
-          type: string
-          nullable: true
     OffenceRuleDetails:
       type: object
       properties:
@@ -1072,9 +1034,6 @@ components:
     Outcome:
       type: object
       properties:
-        id:
-          type: number
-          nullable: true
         code:
           type: string
           nullable: true
@@ -1165,9 +1124,6 @@ components:
     Punishment:
       type: object
       properties:
-        id:
-          type: number
-          nullable: true
         type:
           type: string
           nullable: true
@@ -1177,44 +1133,17 @@ components:
         otherPrivilege:
           type: string
           nullable: true
-        stoppagePercentage:
-          type: number
-          nullable: true
-        activatedBy:
-          type: string
-          nullable: true
-        activatedFrom:
-          type: string
-          nullable: true
         schedule:
           nullable: true
-        consecutiveChargeNumber:
-          type: string
-          nullable: true
-        consecutiveReportAvailable:
-          type: boolean
-          nullable: true
-        damagesOwedAmount:
-          type: number
-          nullable: true
-        canRemove:
-          type: boolean
-          nullable: true
     PunishmentComment:
       type: object
       properties:
-        id:
-          type: number
-          nullable: true
         comment:
           type: string
           nullable: true
         reasonForChange:
           type: string
           nullable: true
-        createdByUserId:
-          type: string
-          nullable: true
         dateTime:
           type: string
           format: date-time

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

@@ -3,6 +3,4 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.adjudications
 data class AdjudicationsIncidentRole(
   val roleCode: String? = null,
   val offenceRule: AdjudicationsOffenceRuleDetails? = null,
-  val associatedPrisonersNumber: String? = null,
-  val associatedPrisonersName: String? = null,
 )

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

@@ -4,6 +4,5 @@ class AdjudicationsPunishmentComment(
   val id: Number? = null,
   val comment: String? = null,
   val reasonForChange: String? = null,
-  val createdByUserId: String? = null,
   val dateTime: String? = null,
 )

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

@@ -20,6 +20,9 @@ data class ReportedAdjudication(
   val isYouthOffender: Boolean,
   val incidentRole: AdjudicationsIncidentRole? = null,
   val offenceDetails: AdjudicationsOffenceDetails? = null,
+  val status: String? = null,
+  val statusReason: String? = null,
+  val statusDetails: String? = null,
   val hearings: List<AdjudicationsHearing?> = emptyList(),
   val outcomes: List<AdjudicationsOutcomeHistory> = emptyList(),
   val punishments: List<AdjudicationsPunishment> = emptyList(),
@@ -28,10 +31,7 @@ data class ReportedAdjudication(
   fun toAdjudication(): Adjudication =
     Adjudication(
       incidentDetails = IncidentDetailsDto(
-        locationId = this.incidentDetails.locationId,
         dateTimeOfIncident = this.incidentDetails.dateTimeOfIncident,
-        dateTimeOfDiscovery = this.incidentDetails.dateTimeOfDiscovery,
-        handoverDeadline = this.incidentDetails.handoverDeadline,
       ),
       isYouthOffender = this.isYouthOffender,
       incidentRole = IncidentRoleDto(
@@ -40,67 +40,50 @@ data class ReportedAdjudication(
           paragraphNumber = this.incidentRole?.offenceRule?.paragraphNumber,
           paragraphDescription = this.incidentRole?.offenceRule?.paragraphDescription,
         ),
-        associatedPrisonersNumber = this.incidentRole?.associatedPrisonersNumber,
-        associatedPrisonersName = this.incidentRole?.associatedPrisonersName,
       ),
       offenceDetails = OffenceDto(
         offenceCode = this.offenceDetails?.offenceCode,
         offenceRule = OffenceRuleDto(
           paragraphNumber = this.offenceDetails?.offenceRule?.paragraphNumber,
           paragraphDescription = this.offenceDetails?.offenceRule?.paragraphDescription,
-          nomisCode = this.offenceDetails?.offenceRule?.nomisCode,
-          withOthersNomisCode = this.offenceDetails?.offenceRule?.withOthersNomisCode,
-
         ),
-        victimPrisonersNumber = this.offenceDetails?.victimPrisonersNumber,
-        victimStaffUsername = this.offenceDetails?.victimStaffUsername,
-        victimOtherPersonsName = this.offenceDetails?.victimOtherPersonsName,
       ),
+      status = this.status,
+      statusReason = this.statusReason,
+      statusDetails = this.statusDetails,
       hearings = this.hearings.map {
         HearingDto(
-          id = it?.id,
-          locationId = it?.locationId,
           dateTimeOfHearing = it?.dateTimeOfHearing,
           oicHearingType = it?.oicHearingType,
           outcome = HearingOutcomeDto(
-            id = it?.outcome?.id,
-            adjudicator = it?.outcome?.adjudicator,
             code = it?.outcome?.code,
             reason = it?.outcome?.reason,
             details = it?.outcome?.details,
             plea = it?.outcome?.plea,
           ),
-          agencyId = it?.agencyId,
         )
       },
       outcomes = this.outcomes.map {
         OutcomeHistoryDto(
           hearing = HearingDto(
-            id = it.hearing?.id,
-            locationId = it.hearing?.locationId,
             dateTimeOfHearing = it.hearing?.dateTimeOfHearing,
             oicHearingType = it.hearing?.oicHearingType,
             outcome = HearingOutcomeDto(
-              id = it.hearing?.outcome?.id,
-              adjudicator = it.hearing?.outcome?.adjudicator,
               code = it.hearing?.outcome?.code,
               reason = it.hearing?.outcome?.reason,
               details = it.hearing?.outcome?.details,
               plea = it.hearing?.outcome?.plea,
             ),
-            agencyId = it.hearing?.agencyId,
           ),
           outcome = CombinedOutcomeDto(
             outcome = OutcomeDto(
-              id = it.outcome?.outcome?.id,
               code = it.outcome?.outcome?.code,
               details = it.outcome?.outcome?.details,
               reason = it.outcome?.outcome?.reason,
               quashedReason = it.outcome?.outcome?.quashedReason,
               canRemove = it.outcome?.outcome?.canRemove,
             ),
             referralOutcome = OutcomeDto(
-              id = it.outcome?.referralOutcome?.id,
               code = it.outcome?.referralOutcome?.code,
               details = it.outcome?.referralOutcome?.details,
               reason = it.outcome?.referralOutcome?.reason,
@@ -112,31 +95,21 @@ data class ReportedAdjudication(
       },
       punishments = this.punishments.map {
         PunishmentDto(
-          id = it.id,
           type = it.type,
           privilegeType = it.privilegeType,
           otherPrivilege = it.otherPrivilege,
-          stoppagePercentage = it.stoppagePercentage,
-          activatedBy = it.activatedBy,
-          activatedFrom = it.activatedFrom,
           schedule = PunishmentScheduleDto(
             days = it.schedule?.days,
             startDate = it.schedule?.startDate,
             endDate = it.schedule?.endDate,
             suspendedUntil = it.schedule?.suspendedUntil,
           ),
-          consecutiveChargeNumber = it.consecutiveChargeNumber,
-          consecutiveReportAvailable = it.consecutiveReportAvailable,
-          damagesOwedAmount = it.damagesOwedAmount,
-          canRemove = it.canRemove,
         )
       },
       punishmentComments = this.punishmentComments.map {
         PunishmentCommentDto(
-          id = it.id,
           comment = it.comment,
           reasonForChange = it.reasonForChange,
-          createdByUserId = it.createdByUserId,
           dateTime = it.dateTime,
         )
       },

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

@@ -5,6 +5,9 @@ data class Adjudication(
   val isYouthOffender: Boolean? = null,
   val incidentRole: IncidentRoleDto? = null,
   val offenceDetails: OffenceDto? = null,
+  val status: String? = null,
+  val statusReason: String? = null,
+  val statusDetails: String? = null,
   val hearings: List<HearingDto>? = null,
   val outcomes: List<OutcomeHistoryDto>? = null,
   val punishments: List<PunishmentDto>? = null,

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

@@ -1,10 +1,7 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class HearingDto(
-  val id: Number? = null,
-  val locationId: Number? = null,
   val dateTimeOfHearing: String? = null,
   val oicHearingType: String? = null,
   val outcome: HearingOutcomeDto? = null,
-  val agencyId: String? = null,
 )

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

@@ -1,8 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class HearingOutcomeDto(
-  val id: Number? = null,
-  val adjudicator: String? = null,
   val code: String? = null,
   val reason: String? = null,
   val details: String? = null,

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

@@ -1,8 +1,5 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class IncidentDetailsDto(
-  val locationId: Number? = null,
   val dateTimeOfIncident: String? = null,
-  val dateTimeOfDiscovery: String? = null,
-  val handoverDeadline: String? = null,
 )

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

@@ -3,6 +3,4 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 data class IncidentRoleDto(
   val roleCode: String? = null,
   val offenceRule: OffenceRuleDetailsDto? = null,
-  val associatedPrisonersNumber: String? = null,
-  val associatedPrisonersName: String? = null,
 )

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

@@ -3,7 +3,4 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 data class OffenceDto(
   val offenceCode: Number? = null,
   val offenceRule: OffenceRuleDto? = null,
-  val victimPrisonersNumber: String? = null,
-  val victimStaffUsername: String? = null,
-  val victimOtherPersonsName: String? = null,
 )

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

@@ -3,6 +3,4 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 data class OffenceRuleDto(
   val paragraphNumber: String? = null,
   val paragraphDescription: String? = null,
-  val nomisCode: String? = null,
-  val withOthersNomisCode: String? = null,
 )

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

@@ -1,7 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class OutcomeDto(
-  val id: Number? = null,
   val code: String? = null,
   val details: String? = null,
   val reason: String? = null,

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

@@ -1,9 +1,7 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class PunishmentCommentDto(
-  val id: Number? = null,
   val comment: String? = null,
   val reasonForChange: String? = null,
-  val createdByUserId: String? = null,
   val dateTime: String? = null,
 )

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

@@ -1,16 +1,8 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class PunishmentDto(
-  val id: Number? = null,
   val type: String? = null,
   val privilegeType: String? = null,
   val otherPrivilege: String? = null,
-  val stoppagePercentage: Number? = null,
-  val activatedBy: String? = null,
-  val activatedFrom: String? = null,
   val schedule: PunishmentScheduleDto? = null,
-  val consecutiveChargeNumber: String? = null,
-  val consecutiveReportAvailable: Boolean? = null,
-  val damagesOwedAmount: Number? = null,
-  val canRemove: Boolean? = null,
 )