diff --git a/integration_tests/mockApis/oasys.ts b/integration_tests/mockApis/oasys.ts index ce37178d2..5078e6536 100644 --- a/integration_tests/mockApis/oasys.ts +++ b/integration_tests/mockApis/oasys.ts @@ -10,12 +10,11 @@ import type { Health, LearningNeeds, OffenceDetail, - Psychiatric, Referral, RisksAndAlerts, RoshAnalysis, } from '@accredited-programmes/models' -import type { Lifestyle, Relationships } from '@accredited-programmes-api' +import type { Lifestyle, Psychiatric, Relationships } from '@accredited-programmes-api' export default { stubAssessmentDateInfo: (args: { diff --git a/integration_tests/pages/shared/showReferral/risksAndNeeds/emotionalWellbeing.ts b/integration_tests/pages/shared/showReferral/risksAndNeeds/emotionalWellbeing.ts index ea8d4da72..60885b437 100644 --- a/integration_tests/pages/shared/showReferral/risksAndNeeds/emotionalWellbeing.ts +++ b/integration_tests/pages/shared/showReferral/risksAndNeeds/emotionalWellbeing.ts @@ -1,6 +1,7 @@ import { CourseUtils, EmotionalWellbeingUtils } from '../../../../../server/utils' import Page from '../../../page' -import type { Course, Psychiatric } from '@accredited-programmes/models' +import type { Course } from '@accredited-programmes/models' +import type { Psychiatric } from '@accredited-programmes-api' export default class EmotionalWellbeing extends Page { psychiatric: Psychiatric diff --git a/server/@types/models/Psychiatric.ts b/server/@types/models/Psychiatric.ts deleted file mode 100644 index 135acf5d3..000000000 --- a/server/@types/models/Psychiatric.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface Psychiatric { - currPsychologicalProblems?: string - description?: string - difficultiesCoping?: string - selfHarmSuicidal?: string -} diff --git a/server/@types/models/index.d.ts b/server/@types/models/index.d.ts index 8bcc3c7e4..d9cc4c275 100644 --- a/server/@types/models/index.d.ts +++ b/server/@types/models/index.d.ts @@ -20,7 +20,6 @@ import type { Organisation } from './Organisation' import type { OrganisationAddress } from './OrganisationAddress' import type { Paginated } from './Paginated' import type { KeyDates, Person, SentenceDetails } from './Person' -import type { Psychiatric } from './Psychiatric' import type { ConfirmationFields, CreatedReferralResponse, @@ -65,7 +64,6 @@ export type { OrganisationAddress, Paginated, Person, - Psychiatric, Referral, ReferralStatus, ReferralStatusCategory, diff --git a/server/data/accreditedProgrammesApi/oasysClient.ts b/server/data/accreditedProgrammesApi/oasysClient.ts index 6ce8da5e2..76f172797 100644 --- a/server/data/accreditedProgrammesApi/oasysClient.ts +++ b/server/data/accreditedProgrammesApi/oasysClient.ts @@ -10,12 +10,11 @@ import type { Health, LearningNeeds, OffenceDetail, - Psychiatric, Referral, RisksAndAlerts, RoshAnalysis, } from '@accredited-programmes/models' -import type { Lifestyle, Relationships } from '@accredited-programmes-api' +import type { Lifestyle, Psychiatric, Relationships } from '@accredited-programmes-api' import type { SystemToken } from '@hmpps-auth' export default class OasysClient { diff --git a/server/services/oasysService.ts b/server/services/oasysService.ts index 2259d23f6..6269f9152 100644 --- a/server/services/oasysService.ts +++ b/server/services/oasysService.ts @@ -10,12 +10,11 @@ import type { Health, LearningNeeds, OffenceDetail, - Psychiatric, Referral, RisksAndAlerts, RoshAnalysis, } from '@accredited-programmes/models' -import type { Lifestyle, Relationships } from '@accredited-programmes-api' +import type { Lifestyle, Psychiatric, Relationships } from '@accredited-programmes-api' export default class OasysService { constructor( diff --git a/server/testutils/factories/psychiatric.ts b/server/testutils/factories/psychiatric.ts index 0151ef42d..89eeb75d1 100644 --- a/server/testutils/factories/psychiatric.ts +++ b/server/testutils/factories/psychiatric.ts @@ -1,7 +1,7 @@ import { Factory } from 'fishery' import FactoryHelpers from './factoryHelpers' -import type { Psychiatric } from '@accredited-programmes/models' +import type { Psychiatric } from '@accredited-programmes-api' export default Factory.define(() => { const problemOptions = ['0-No problems', '1-Some problems']