Skip to content

Commit d8d5e92

Browse files
danhumphreys-mojdanhumphreys-moj
committed
Type updates.
1 parent 0a74d35 commit d8d5e92

15 files changed

+71
-64
lines changed

‎server/@types/shared/index.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export type { ApprovedPremisesApplicationSummary } from './models/ApprovedPremis
2222
export type { ApprovedPremisesAssessment } from './models/ApprovedPremisesAssessment';
2323
export type { ApprovedPremisesAssessmentStatus } from './models/ApprovedPremisesAssessmentStatus';
2424
export type { ApprovedPremisesAssessmentSummary } from './models/ApprovedPremisesAssessmentSummary';
25-
export type { ApprovedPremisesBedSearchResult } from './models/ApprovedPremisesBedSearchResult';
2625
export type { ApprovedPremisesSummary } from './models/ApprovedPremisesSummary';
2726
export type { ApprovedPremisesUser } from './models/ApprovedPremisesUser';
2827
export type { ApprovedPremisesUserPermission } from './models/ApprovedPremisesUserPermission';
@@ -40,12 +39,11 @@ export type { AssessmentTask } from './models/AssessmentTask';
4039
export type { Bed } from './models/Bed';
4140
export type { BedDetail } from './models/BedDetail';
4241
export type { BedSearchAttributes } from './models/BedSearchAttributes';
43-
export type { BedSearchParameters } from './models/BedSearchParameters';
44-
export type { BedSearchResult } from './models/BedSearchResult';
4542
export type { BedSearchResultBedSummary } from './models/BedSearchResultBedSummary';
4643
export type { BedSearchResultPremisesSummary } from './models/BedSearchResultPremisesSummary';
4744
export type { BedSearchResultRoomSummary } from './models/BedSearchResultRoomSummary';
4845
export type { BedSearchResults } from './models/BedSearchResults';
46+
export type { BedspaceFilters } from './models/BedspaceFilters';
4947
export type { BedStatus } from './models/BedStatus';
5048
export type { BedSummary } from './models/BedSummary';
5149
export type { Booking } from './models/Booking';
@@ -136,6 +134,7 @@ export type { Characteristic } from './models/Characteristic';
136134
export type { CharacteristicPair } from './models/CharacteristicPair';
137135
export type { ClarificationNote } from './models/ClarificationNote';
138136
export type { Confirmation } from './models/Confirmation';
137+
export type { DashboardPlacementRequest } from './models/DashboardPlacementRequest';
139138
export type { DateCapacity } from './models/DateCapacity';
140139
export type { DateChange } from './models/DateChange';
141140
export type { DatePeriod } from './models/DatePeriod';
@@ -230,6 +229,7 @@ export type { PlacementRequirements } from './models/PlacementRequirements';
230229
export type { PlacementType } from './models/PlacementType';
231230
export type { Premises } from './models/Premises';
232231
export type { PremisesBooking } from './models/PremisesBooking';
232+
export type { PremisesFilters } from './models/PremisesFilters';
233233
export type { PremisesSummary } from './models/PremisesSummary';
234234
export type { PrisonCaseNote } from './models/PrisonCaseNote';
235235
export type { ProbationDeliveryUnit } from './models/ProbationDeliveryUnit';

‎server/@types/shared/models/ApprovedPremisesBedSearchResult.ts

-16
This file was deleted.

‎server/@types/shared/models/Assessment.ts

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
/* eslint-disable */
55
import type { AssessmentDecision } from './AssessmentDecision';
66
import type { ClarificationNote } from './ClarificationNote';
7-
import type { ReferralHistoryNote } from './ReferralHistoryNote';
87
import type { Unit } from './Unit';
98
export type Assessment = {
109
service: string;
@@ -18,6 +17,5 @@ export type Assessment = {
1817
rejectionRationale?: string;
1918
data?: Unit;
2019
clarificationNotes: Array<ClarificationNote>;
21-
referralHistoryNotes?: Array<ReferralHistoryNote>;
2220
};
2321

‎server/@types/shared/models/BedSearchParameters.ts

-16
This file was deleted.

‎server/@types/shared/models/BedSearchResult.ts

-15
This file was deleted.

‎server/@types/shared/models/BedSearchResults.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* istanbul ignore file */
33
/* tslint:disable */
44
/* eslint-disable */
5-
import type { BedSearchResult } from './BedSearchResult';
5+
import type { TemporaryAccommodationBedSearchResult } from './TemporaryAccommodationBedSearchResult';
66
export type BedSearchResults = {
77
/**
88
* How many distinct Rooms the Beds in the results belong to
@@ -16,6 +16,6 @@ export type BedSearchResults = {
1616
* How many Beds are in the results
1717
*/
1818
resultsBedCount: number;
19-
results: Array<BedSearchResult>;
19+
results: Array<TemporaryAccommodationBedSearchResult>;
2020
};
2121

‎server/@types/shared/models/BedspaceFilters.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* generated using openapi-typescript-codegen -- do not edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
export type BedspaceFilters = {
6+
includedCharacteristicIds?: Array<string>;
7+
excludedCharacteristicIds?: Array<string>;
8+
};
9+

‎server/@types/shared/models/Cas1SpaceBookingDaySummary.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* istanbul ignore file */
33
/* tslint:disable */
44
/* eslint-disable */
5-
import type { Cas1SpaceBookingCharacteristic } from './Cas1SpaceBookingCharacteristic';
5+
import type { Cas1SpaceCharacteristic } from './Cas1SpaceCharacteristic';
66
import type { PersonSummary } from './PersonSummary';
77
export type Cas1SpaceBookingDaySummary = {
88
id: string;
@@ -20,6 +20,6 @@ export type Cas1SpaceBookingDaySummary = {
2020
*/
2121
tier?: string;
2222
releaseType?: string;
23-
essentialCharacteristics: Array<Cas1SpaceBookingCharacteristic>;
23+
essentialCharacteristics: Array<Cas1SpaceCharacteristic>;
2424
};
2525

‎server/@types/shared/models/DashboardPlacementRequest.ts

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* generated using openapi-typescript-codegen -- do not edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
import type { BookingSummary } from './BookingSummary';
6+
import type { Person } from './Person';
7+
import type { PersonRisks } from './PersonRisks';
8+
import type { PlacementDates } from './PlacementDates';
9+
import type { PlacementRequestStatus } from './PlacementRequestStatus';
10+
import type { PlacementRequirements } from './PlacementRequirements';
11+
export type DashboardPlacementRequest = (PlacementRequirements & PlacementDates & {
12+
id: string;
13+
person: Person;
14+
risks: PersonRisks;
15+
applicationId: string;
16+
status: PlacementRequestStatus;
17+
applicationDate: string;
18+
isParole: boolean;
19+
booking?: BookingSummary;
20+
});
21+

‎server/@types/shared/models/MigrationJobType.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/* istanbul ignore file */
33
/* tslint:disable */
44
/* eslint-disable */
5-
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';
5+
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';

‎server/@types/shared/models/PlacementRequirements.ts

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import type { PlacementCriteria } from './PlacementCriteria';
88
export type PlacementRequirements = {
99
gender: Gender;
1010
type: ApType;
11+
/**
12+
* Postcode outcode
13+
*/
1114
location: string;
1215
radius: number;
1316
essentialCriteria: Array<PlacementCriteria>;

‎server/@types/shared/models/PremisesFilters.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* generated using openapi-typescript-codegen -- do not edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
export type PremisesFilters = {
6+
includedCharacteristicIds?: Array<string>;
7+
excludedCharacteristicIds?: Array<string>;
8+
};
9+

‎server/@types/shared/models/SeedFileType.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/* istanbul ignore file */
33
/* tslint:disable */
44
/* eslint-disable */
5-
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';
5+
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' | 'approved_premises_delete_application_timeline_notes' | 'temporary_accommodation_referral_rejection';

‎server/@types/shared/models/TemporaryAccommodationBedSearchParameters.ts

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,24 @@
33
/* tslint:disable */
44
/* eslint-disable */
55
import type { BedSearchAttributes } from './BedSearchAttributes';
6-
import type { BedSearchParameters } from './BedSearchParameters';
7-
export type TemporaryAccommodationBedSearchParameters = (BedSearchParameters & {
6+
import type { BedspaceFilters } from './BedspaceFilters';
7+
import type { PremisesFilters } from './PremisesFilters';
8+
export type TemporaryAccommodationBedSearchParameters = {
9+
serviceName?: string;
10+
startDate: string;
11+
/**
12+
* The number of days the Bed will need to be free from the start_date until
13+
*/
14+
durationDays: number;
815
/**
916
* The list of pdus Ids to search within
1017
*/
1118
probationDeliveryUnits: Array<string>;
19+
premisesFilters?: PremisesFilters;
20+
bedspaceFilters?: BedspaceFilters;
1221
/**
1322
* Bedspace and property attributes to filter on
1423
*/
1524
attributes?: Array<BedSearchAttributes>;
16-
});
25+
};
1726

‎server/@types/shared/models/TemporaryAccommodationBedSearchResult.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
/* istanbul ignore file */
33
/* tslint:disable */
44
/* eslint-disable */
5-
import type { BedSearchResult } from './BedSearchResult';
5+
import type { BedSearchResultBedSummary } from './BedSearchResultBedSummary';
6+
import type { BedSearchResultPremisesSummary } from './BedSearchResultPremisesSummary';
7+
import type { BedSearchResultRoomSummary } from './BedSearchResultRoomSummary';
68
import type { TemporaryAccommodationBedSearchResultOverlap } from './TemporaryAccommodationBedSearchResultOverlap';
7-
export type TemporaryAccommodationBedSearchResult = (BedSearchResult & {
9+
export type TemporaryAccommodationBedSearchResult = {
10+
premises: BedSearchResultPremisesSummary;
11+
room: BedSearchResultRoomSummary;
12+
bed: BedSearchResultBedSummary;
813
overlaps: Array<TemporaryAccommodationBedSearchResultOverlap>;
9-
});
14+
};
1015

0 commit comments

Comments
 (0)