diff --git a/server/@types/shared/index.d.ts b/server/@types/shared/index.d.ts index 7d637145e..4219e3bf2 100644 --- a/server/@types/shared/index.d.ts +++ b/server/@types/shared/index.d.ts @@ -6,7 +6,6 @@ export type { ActiveOffence } from './models/ActiveOffence'; export type { Adjudication } from './models/Adjudication'; export type { AllocatedFilter } from './models/AllocatedFilter'; -export type { AnyValue } from './models/AnyValue'; export type { ApArea } from './models/ApArea'; export type { Appeal } from './models/Appeal'; export type { AppealDecision } from './models/AppealDecision'; diff --git a/server/@types/shared/models/AnyValue.ts b/server/@types/shared/models/AnyValue.ts deleted file mode 100644 index 294694a24..000000000 --- a/server/@types/shared/models/AnyValue.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/** - * Any object that conforms to the current JSON schema for an application - */ -export type AnyValue = Record; diff --git a/server/@types/shared/models/ApprovedPremisesApplication.ts b/server/@types/shared/models/ApprovedPremisesApplication.ts index ec7bae953..4acf27ffc 100644 --- a/server/@types/shared/models/ApprovedPremisesApplication.ts +++ b/server/@types/shared/models/ApprovedPremisesApplication.ts @@ -2,7 +2,6 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { ApArea } from './ApArea'; import type { Application } from './Application'; import type { ApprovedPremisesApplicationStatus } from './ApprovedPremisesApplicationStatus'; @@ -12,6 +11,7 @@ import type { Cas1ApplicationUserDetails } from './Cas1ApplicationUserDetails'; import type { Cas1CruManagementArea } from './Cas1CruManagementArea'; import type { PersonRisks } from './PersonRisks'; import type { PersonStatus } from './PersonStatus'; +import type { Unit } from './Unit'; export type ApprovedPremisesApplication = (Application & { isWomensApplication?: boolean; /** @@ -31,8 +31,8 @@ export type ApprovedPremisesApplication = (Application & { createdByUserId: string; schemaVersion: string; outdatedSchema: boolean; - data?: AnyValue; - document?: AnyValue; + data?: Unit; + document?: Unit; status: ApprovedPremisesApplicationStatus; assessmentId?: string; assessmentDecision?: AssessmentDecision; diff --git a/server/@types/shared/models/Assessment.ts b/server/@types/shared/models/Assessment.ts index cdcfba21b..c2a6b773b 100644 --- a/server/@types/shared/models/Assessment.ts +++ b/server/@types/shared/models/Assessment.ts @@ -2,10 +2,10 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { AssessmentDecision } from './AssessmentDecision'; import type { ClarificationNote } from './ClarificationNote'; import type { ReferralHistoryNote } from './ReferralHistoryNote'; +import type { Unit } from './Unit'; export type Assessment = { service: string; id: string; @@ -16,7 +16,7 @@ export type Assessment = { submittedAt?: string; decision?: AssessmentDecision; rejectionRationale?: string; - data?: AnyValue; + data?: Unit; clarificationNotes: Array; referralHistoryNotes?: Array; }; diff --git a/server/@types/shared/models/AssessmentAcceptance.ts b/server/@types/shared/models/AssessmentAcceptance.ts index aa7f604b8..388529910 100644 --- a/server/@types/shared/models/AssessmentAcceptance.ts +++ b/server/@types/shared/models/AssessmentAcceptance.ts @@ -2,12 +2,12 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { ApType } from './ApType'; import type { PlacementDates } from './PlacementDates'; import type { PlacementRequirements } from './PlacementRequirements'; +import type { Unit } from './Unit'; export type AssessmentAcceptance = { - document: AnyValue; + document: Unit; requirements?: PlacementRequirements; placementDates?: PlacementDates; apType?: ApType; diff --git a/server/@types/shared/models/AssessmentRejection.ts b/server/@types/shared/models/AssessmentRejection.ts index 1529c026d..7f0ba1f59 100644 --- a/server/@types/shared/models/AssessmentRejection.ts +++ b/server/@types/shared/models/AssessmentRejection.ts @@ -2,9 +2,9 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; export type AssessmentRejection = { - document: AnyValue; + document: Unit; rejectionRationale: string; referralRejectionReasonId?: string; referralRejectionReasonDetail?: string; diff --git a/server/@types/shared/models/Cas2Application.ts b/server/@types/shared/models/Cas2Application.ts index 999177bd9..06610d1e2 100644 --- a/server/@types/shared/models/Cas2Application.ts +++ b/server/@types/shared/models/Cas2Application.ts @@ -2,18 +2,18 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { Application } from './Application'; import type { ApplicationStatus } from './ApplicationStatus'; import type { Cas2Assessment } from './Cas2Assessment'; import type { Cas2TimelineEvent } from './Cas2TimelineEvent'; import type { NomisUser } from './NomisUser'; +import type { Unit } from './Unit'; export type Cas2Application = (Application & { createdBy: NomisUser; schemaVersion: string; outdatedSchema: boolean; - data?: AnyValue; - document?: AnyValue; + data?: Unit; + document?: Unit; status: ApplicationStatus; submittedAt?: string; telephoneNumber?: string; diff --git a/server/@types/shared/models/Cas2SubmittedApplication.ts b/server/@types/shared/models/Cas2SubmittedApplication.ts index b8793a7f0..f7b2e1b7e 100644 --- a/server/@types/shared/models/Cas2SubmittedApplication.ts +++ b/server/@types/shared/models/Cas2SubmittedApplication.ts @@ -2,11 +2,11 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { Cas2Assessment } from './Cas2Assessment'; import type { Cas2TimelineEvent } from './Cas2TimelineEvent'; import type { NomisUser } from './NomisUser'; import type { Person } from './Person'; +import type { Unit } from './Unit'; export type Cas2SubmittedApplication = { id: string; person: Person; @@ -14,7 +14,7 @@ export type Cas2SubmittedApplication = { submittedBy?: NomisUser; schemaVersion: string; outdatedSchema: boolean; - document?: AnyValue; + document?: Unit; submittedAt?: string; telephoneNumber?: string; timelineEvents: Array; diff --git a/server/@types/shared/models/PlacementApplication.ts b/server/@types/shared/models/PlacementApplication.ts index 0e5809e15..a40337523 100644 --- a/server/@types/shared/models/PlacementApplication.ts +++ b/server/@types/shared/models/PlacementApplication.ts @@ -2,10 +2,10 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { NewPlacementApplication } from './NewPlacementApplication'; import type { PlacementApplicationType } from './PlacementApplicationType'; import type { PlacementDates } from './PlacementDates'; +import type { Unit } from './Unit'; import type { WithdrawPlacementRequestReason } from './WithdrawPlacementRequestReason'; export type PlacementApplication = (NewPlacementApplication & { /** @@ -23,8 +23,8 @@ export type PlacementApplication = (NewPlacementApplication & { assessmentId: string; assessmentCompletedAt: string; applicationCompletedAt: string; - data?: AnyValue; - document?: AnyValue; + data?: Unit; + document?: Unit; canBeWithdrawn: boolean; isWithdrawn: boolean; withdrawalReason?: WithdrawPlacementRequestReason; diff --git a/server/@types/shared/models/ReferralHistoryNoteMessageDetails.ts b/server/@types/shared/models/ReferralHistoryNoteMessageDetails.ts index dcd268514..2ff1ac7c6 100644 --- a/server/@types/shared/models/ReferralHistoryNoteMessageDetails.ts +++ b/server/@types/shared/models/ReferralHistoryNoteMessageDetails.ts @@ -2,11 +2,11 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; export type ReferralHistoryNoteMessageDetails = { rejectionReason?: string; rejectionReasonDetails?: string; isWithdrawn?: boolean; - domainEvent?: AnyValue; + domainEvent?: Unit; }; diff --git a/server/@types/shared/models/RequestForPlacement.ts b/server/@types/shared/models/RequestForPlacement.ts index 18943111a..428b69680 100644 --- a/server/@types/shared/models/RequestForPlacement.ts +++ b/server/@types/shared/models/RequestForPlacement.ts @@ -2,10 +2,10 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { PlacementDates } from './PlacementDates'; import type { RequestForPlacementStatus } from './RequestForPlacementStatus'; import type { RequestForPlacementType } from './RequestForPlacementType'; +import type { Unit } from './Unit'; import type { WithdrawPlacementRequestReason } from './WithdrawPlacementRequestReason'; export type RequestForPlacement = { /** @@ -23,7 +23,7 @@ export type RequestForPlacement = { * */ requestReviewedAt?: string; - document?: AnyValue; + document?: Unit; /** * If true, the user making this request can withdraw this request for placement. * If false, it may still be possible to indirectly withdraw this request for placement by withdrawing the application. diff --git a/server/@types/shared/models/SeedFileType.ts b/server/@types/shared/models/SeedFileType.ts index d13e3a3b2..907a88e1a 100644 --- a/server/@types/shared/models/SeedFileType.ts +++ b/server/@types/shared/models/SeedFileType.ts @@ -2,4 +2,4 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type SeedFileType = 'approved_premises' | 'approved_premises_rooms' | 'temporary_accommodation_premises' | 'temporary_accommodation_bedspace' | 'user' | 'nomis_users' | 'external_users' | 'cas2_applications' | 'temporary_accommodation_users' | 'approved_premises_users' | 'characteristics' | 'update_noms_number' | 'update_users_from_api' | 'approved_premises_ap_staff_users' | 'approved_premises_cancel_bookings' | 'approved_premises_assessment_more_info_bug_fix' | 'approved_premises_redact_assessment_details' | 'approved_premises_booking_to_space_booking' | 'approved_premises_withdraw_placement_request' | 'approved_premises_replay_domain_events' | 'approved_premises_duplicate_application' | 'approved_premises_update_event_number' | 'approved_premises_link_booking_to_placement_request' | 'approved_premises_out_of_service_beds' | 'approved_premises_cru_management_areas' | 'approved_premises_space_planning_dry_run' | 'approved_premises_import_delius_booking_management_data' | 'approved_premises_update_space_booking'; +export type SeedFileType = 'approved_premises' | 'approved_premises_rooms' | 'temporary_accommodation_premises' | 'temporary_accommodation_bedspace' | 'user' | 'nomis_users' | 'external_users' | 'cas2_applications' | 'temporary_accommodation_users' | 'approved_premises_users' | 'characteristics' | 'update_noms_number' | 'update_users_from_api' | 'approved_premises_ap_staff_users' | 'approved_premises_cancel_bookings' | 'approved_premises_assessment_more_info_bug_fix' | 'approved_premises_redact_assessment_details' | 'approved_premises_booking_to_space_booking' | 'approved_premises_withdraw_placement_request' | 'approved_premises_replay_domain_events' | 'approved_premises_duplicate_application' | 'approved_premises_update_event_number' | 'approved_premises_link_booking_to_placement_request' | 'approved_premises_out_of_service_beds' | 'approved_premises_cru_management_areas' | 'approved_premises_space_planning_dry_run' | 'approved_premises_import_delius_booking_management_data' | 'approved_premises_update_space_booking' | 'temporary_accommodation_referral_rejection'; diff --git a/server/@types/shared/models/SeedFromExcelFileType.ts b/server/@types/shared/models/SeedFromExcelFileType.ts index 1693effe9..869c44477 100644 --- a/server/@types/shared/models/SeedFromExcelFileType.ts +++ b/server/@types/shared/models/SeedFromExcelFileType.ts @@ -2,4 +2,4 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type SeedFromExcelFileType = 'approved_premises_room'; +export type SeedFromExcelFileType = 'cas1_import_site_survey_rooms' | 'cas1_import_site_survey_premises'; diff --git a/server/@types/shared/models/SeedFromExcelRequest.ts b/server/@types/shared/models/SeedFromExcelRequest.ts index b79fb9678..31d5f10a0 100644 --- a/server/@types/shared/models/SeedFromExcelRequest.ts +++ b/server/@types/shared/models/SeedFromExcelRequest.ts @@ -5,7 +5,6 @@ import type { SeedFromExcelFileType } from './SeedFromExcelFileType'; export type SeedFromExcelRequest = { seedType: SeedFromExcelFileType; - premisesId: string; fileName: string; }; diff --git a/server/@types/shared/models/SubmitApplication.ts b/server/@types/shared/models/SubmitApplication.ts index 66be5eee5..9f82f766a 100644 --- a/server/@types/shared/models/SubmitApplication.ts +++ b/server/@types/shared/models/SubmitApplication.ts @@ -2,9 +2,9 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; export type SubmitApplication = { type: string; - translatedDocument?: AnyValue; + translatedDocument?: Unit; }; diff --git a/server/@types/shared/models/SubmitCas2Application.ts b/server/@types/shared/models/SubmitCas2Application.ts index 31b03e8fc..bf897c6d9 100644 --- a/server/@types/shared/models/SubmitCas2Application.ts +++ b/server/@types/shared/models/SubmitCas2Application.ts @@ -2,9 +2,9 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; export type SubmitCas2Application = { - translatedDocument: AnyValue; + translatedDocument: Unit; /** * Id of the application being submitted */ diff --git a/server/@types/shared/models/SubmitPlacementApplication.ts b/server/@types/shared/models/SubmitPlacementApplication.ts index 192680493..2341ae78f 100644 --- a/server/@types/shared/models/SubmitPlacementApplication.ts +++ b/server/@types/shared/models/SubmitPlacementApplication.ts @@ -2,11 +2,11 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { PlacementDates } from './PlacementDates'; import type { PlacementType } from './PlacementType'; +import type { Unit } from './Unit'; export type SubmitPlacementApplication = { - translatedDocument: AnyValue; + translatedDocument: Unit; placementType: PlacementType; placementDates: Array; }; diff --git a/server/@types/shared/models/SubmitTemporaryAccommodationApplication.ts b/server/@types/shared/models/SubmitTemporaryAccommodationApplication.ts index ba7d38f88..3e7cd881d 100644 --- a/server/@types/shared/models/SubmitTemporaryAccommodationApplication.ts +++ b/server/@types/shared/models/SubmitTemporaryAccommodationApplication.ts @@ -2,8 +2,8 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { SubmitApplication } from './SubmitApplication'; +import type { Unit } from './Unit'; export type SubmitTemporaryAccommodationApplication = (SubmitApplication & { arrivalDate: string; isRegisteredSexOffender?: boolean; @@ -22,6 +22,6 @@ export type SubmitTemporaryAccommodationApplication = (SubmitApplication & { isConcerningSexualBehaviour?: boolean; isConcerningArsonBehaviour?: boolean; prisonReleaseTypes?: Array; - summaryData: AnyValue; + summaryData: Unit; }); diff --git a/server/@types/shared/models/TemporaryAccommodationApplication.ts b/server/@types/shared/models/TemporaryAccommodationApplication.ts index ab587e59f..a7f1eb9a8 100644 --- a/server/@types/shared/models/TemporaryAccommodationApplication.ts +++ b/server/@types/shared/models/TemporaryAccommodationApplication.ts @@ -2,16 +2,16 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { Application } from './Application'; import type { ApplicationStatus } from './ApplicationStatus'; import type { PersonRisks } from './PersonRisks'; +import type { Unit } from './Unit'; export type TemporaryAccommodationApplication = (Application & { createdByUserId: string; schemaVersion: string; outdatedSchema: boolean; - data?: AnyValue; - document?: AnyValue; + data?: Unit; + document?: Unit; status: ApplicationStatus; risks?: PersonRisks; submittedAt?: string; diff --git a/server/@types/shared/models/TemporaryAccommodationAssessment.ts b/server/@types/shared/models/TemporaryAccommodationAssessment.ts index 170f19aa1..b21d57e7c 100644 --- a/server/@types/shared/models/TemporaryAccommodationAssessment.ts +++ b/server/@types/shared/models/TemporaryAccommodationAssessment.ts @@ -2,16 +2,16 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; import type { Assessment } from './Assessment'; import type { TemporaryAccommodationApplication } from './TemporaryAccommodationApplication'; import type { TemporaryAccommodationAssessmentStatus } from './TemporaryAccommodationAssessmentStatus'; import type { TemporaryAccommodationUser } from './TemporaryAccommodationUser'; +import type { Unit } from './Unit'; export type TemporaryAccommodationAssessment = (Assessment & { application: TemporaryAccommodationApplication; allocatedToStaffMember?: TemporaryAccommodationUser; status?: TemporaryAccommodationAssessmentStatus; - summaryData: AnyValue; + summaryData: Unit; releaseDate?: string; accommodationRequiredFromDate?: string; }); diff --git a/server/@types/shared/models/UpdateApplication.ts b/server/@types/shared/models/UpdateApplication.ts index e9d92b526..c6bf74166 100644 --- a/server/@types/shared/models/UpdateApplication.ts +++ b/server/@types/shared/models/UpdateApplication.ts @@ -2,10 +2,10 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; import type { UpdateApplicationType } from './UpdateApplicationType'; export type UpdateApplication = { type: UpdateApplicationType; - data: Record; + data: Record; }; diff --git a/server/@types/shared/models/UpdateAssessment.ts b/server/@types/shared/models/UpdateAssessment.ts index 61f3edfea..cc94b6c23 100644 --- a/server/@types/shared/models/UpdateAssessment.ts +++ b/server/@types/shared/models/UpdateAssessment.ts @@ -2,9 +2,9 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; export type UpdateAssessment = { - data: Record; + data: Record; releaseDate?: string; accommodationRequiredFromDate?: string; }; diff --git a/server/@types/shared/models/UpdatePlacementApplication.ts b/server/@types/shared/models/UpdatePlacementApplication.ts index 1336289cd..8b1fbb5ac 100644 --- a/server/@types/shared/models/UpdatePlacementApplication.ts +++ b/server/@types/shared/models/UpdatePlacementApplication.ts @@ -2,8 +2,8 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AnyValue } from './AnyValue'; +import type { Unit } from './Unit'; export type UpdatePlacementApplication = { - data: Record; + data: Record; };