diff --git a/server/@types/shared/index.d.ts b/server/@types/shared/index.d.ts index f0e7568b7..ed4796937 100644 --- a/server/@types/shared/index.d.ts +++ b/server/@types/shared/index.d.ts @@ -22,7 +22,6 @@ export type { ApprovedPremisesApplicationSummary } from './models/ApprovedPremis export type { ApprovedPremisesAssessment } from './models/ApprovedPremisesAssessment'; export type { ApprovedPremisesAssessmentStatus } from './models/ApprovedPremisesAssessmentStatus'; export type { ApprovedPremisesAssessmentSummary } from './models/ApprovedPremisesAssessmentSummary'; -export type { ApprovedPremisesBedSearchResult } from './models/ApprovedPremisesBedSearchResult'; export type { ApprovedPremisesSummary } from './models/ApprovedPremisesSummary'; export type { ApprovedPremisesUser } from './models/ApprovedPremisesUser'; export type { ApprovedPremisesUserPermission } from './models/ApprovedPremisesUserPermission'; @@ -41,7 +40,6 @@ export type { Bed } from './models/Bed'; export type { BedDetail } from './models/BedDetail'; export type { BedSearchAttributes } from './models/BedSearchAttributes'; export type { BedSearchParameters } from './models/BedSearchParameters'; -export type { BedSearchResult } from './models/BedSearchResult'; export type { BedSearchResultBedSummary } from './models/BedSearchResultBedSummary'; export type { BedSearchResultPremisesSummary } from './models/BedSearchResultPremisesSummary'; export type { BedSearchResultRoomSummary } from './models/BedSearchResultRoomSummary'; diff --git a/server/@types/shared/models/ApprovedPremisesBedSearchResult.ts b/server/@types/shared/models/ApprovedPremisesBedSearchResult.ts deleted file mode 100644 index 3c4813454..000000000 --- a/server/@types/shared/models/ApprovedPremisesBedSearchResult.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { BedSearchResult } from './BedSearchResult'; -/** - * This is no longer returned by any APIs so should be removed once removed from UI Code - * @deprecated - */ -export type ApprovedPremisesBedSearchResult = (BedSearchResult & { - /** - * how many miles away from the postcode district the Premises this Bed belongs to is - */ - distanceMiles: number; -}); - diff --git a/server/@types/shared/models/BedSearchResult.ts b/server/@types/shared/models/BedSearchResult.ts deleted file mode 100644 index c361ebe4b..000000000 --- a/server/@types/shared/models/BedSearchResult.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { BedSearchResultBedSummary } from './BedSearchResultBedSummary'; -import type { BedSearchResultPremisesSummary } from './BedSearchResultPremisesSummary'; -import type { BedSearchResultRoomSummary } from './BedSearchResultRoomSummary'; -import type { ServiceName } from './ServiceName'; -export type BedSearchResult = { - serviceName: ServiceName; - premises: BedSearchResultPremisesSummary; - room: BedSearchResultRoomSummary; - bed: BedSearchResultBedSummary; -}; - diff --git a/server/@types/shared/models/BedSearchResults.ts b/server/@types/shared/models/BedSearchResults.ts index 14dcd00e5..8798600db 100644 --- a/server/@types/shared/models/BedSearchResults.ts +++ b/server/@types/shared/models/BedSearchResults.ts @@ -2,7 +2,7 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { BedSearchResult } from './BedSearchResult'; +import type { TemporaryAccommodationBedSearchResult } from './TemporaryAccommodationBedSearchResult'; export type BedSearchResults = { /** * How many distinct Rooms the Beds in the results belong to @@ -16,6 +16,6 @@ export type BedSearchResults = { * How many Beds are in the results */ resultsBedCount: number; - results: Array; + results: Array; }; diff --git a/server/@types/shared/models/MigrationJobType.ts b/server/@types/shared/models/MigrationJobType.ts index e665421f2..be27b8cee 100644 --- a/server/@types/shared/models/MigrationJobType.ts +++ b/server/@types/shared/models/MigrationJobType.ts @@ -2,4 +2,4 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type MigrationJobType = 'update_all_users_from_community_api' | 'update_sentence_type_and_situation' | 'update_booking_status' | 'update_task_due_dates' | 'update_users_pdu_by_api' | 'update_cas2_applications_with_assessments' | 'update_cas2_status_updates_with_assessments' | 'update_cas2_notes_with_assessments' | 'update_cas1_fix_placement_app_links' | 'update_cas1_notice_types' | 'update_cas1_backfill_user_ap_area' | 'update_cas3_application_offender_name' | 'update_cas3_domain_event_type_for_person_departed_updated' | 'update_cas1_applications_licence_expiry_date'; +export type MigrationJobType = 'update_all_users_from_community_api' | 'update_sentence_type_and_situation' | 'update_booking_status' | 'update_task_due_dates' | 'update_users_pdu_by_api' | 'update_cas2_applications_with_assessments' | 'update_cas2_status_updates_with_assessments' | 'update_cas2_notes_with_assessments' | 'update_cas1_fix_placement_app_links' | 'update_cas1_notice_types' | 'update_cas1_backfill_user_ap_area' | 'update_cas3_application_offender_name' | 'update_cas3_domain_event_type_for_person_departed_updated' | 'update_cas1_applications_licence_expiry_date' | 'update_cas1_backfill_offline_application_name'; diff --git a/server/@types/shared/models/PlacementRequirements.ts b/server/@types/shared/models/PlacementRequirements.ts index 5f1762675..59194aa74 100644 --- a/server/@types/shared/models/PlacementRequirements.ts +++ b/server/@types/shared/models/PlacementRequirements.ts @@ -8,6 +8,9 @@ import type { PlacementCriteria } from './PlacementCriteria'; export type PlacementRequirements = { gender: Gender; type: ApType; + /** + * Postcode outcode + */ location: string; radius: number; essentialCriteria: Array; diff --git a/server/@types/shared/models/SeedFileType.ts b/server/@types/shared/models/SeedFileType.ts index a9dc24f22..3f7424d36 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_referrals' | 'approved_premises_update_space_booking' | 'approved_premises_backfill_active_space_bookings_created_in_delius' | 'temporary_accommodation_referral_rejection'; +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_referrals' | 'approved_premises_update_space_booking' | 'approved_premises_backfill_active_space_bookings_created_in_delius' | 'approved_premises_create_test_applications' | 'temporary_accommodation_referral_rejection'; diff --git a/server/@types/shared/models/TemporaryAccommodationBedSearchResult.ts b/server/@types/shared/models/TemporaryAccommodationBedSearchResult.ts index 5a751c28e..9dbce307e 100644 --- a/server/@types/shared/models/TemporaryAccommodationBedSearchResult.ts +++ b/server/@types/shared/models/TemporaryAccommodationBedSearchResult.ts @@ -2,9 +2,14 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { BedSearchResult } from './BedSearchResult'; +import type { BedSearchResultBedSummary } from './BedSearchResultBedSummary'; +import type { BedSearchResultPremisesSummary } from './BedSearchResultPremisesSummary'; +import type { BedSearchResultRoomSummary } from './BedSearchResultRoomSummary'; import type { TemporaryAccommodationBedSearchResultOverlap } from './TemporaryAccommodationBedSearchResultOverlap'; -export type TemporaryAccommodationBedSearchResult = (BedSearchResult & { +export type TemporaryAccommodationBedSearchResult = { + premises: BedSearchResultPremisesSummary; + room: BedSearchResultRoomSummary; + bed: BedSearchResultBedSummary; overlaps: Array; -}); +};