Use Psychiatric type from imported file

ministryofjustice · Aug 19, 2024 · 8cc17ca · 8cc17ca
1 parent 208d927
commit 8cc17ca
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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<Psychiatric>(() => {
   const problemOptions = ['0-No problems', '1-Some problems']