ECL rename models directories

DNUM-SocialGouv · Aug 4, 2023 · 0ad725b · 0ad725b
1 parent 88e9457
commit 0ad725b
Show file tree

Hide file tree

Showing 31 changed files with 54 additions and 57 deletions.
diff --git a/src/etl/RiphCtisResearchStudyModelFactory.ts b/src/etl/RiphCtisResearchStudyModelFactory.ts
@@ -1,19 +1,18 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Extension, Identifier, Meta } from 'fhir/r4'
 
 import { RiphCtisDto } from './dto/RiphCtisDto'
 import { ModelUtils } from '../shared/models/custom/ModelUtils'
 import { ReferenceContentsModel } from '../shared/models/custom/ReferenceContentsModel'
-import { CodeableConceptModel } from '../shared/models/fhir/DataType/CodeableConceptModel'
-import { IdentifierModel } from '../shared/models/fhir/DataType/IdentifierModel'
+import { CodeableConceptModel } from '../shared/models/fhir/DataTypes/CodeableConceptModel'
+import { IdentifierModel } from '../shared/models/fhir/DataTypes/IdentifierModel'
 import { GroupModel } from '../shared/models/fhir/GroupModel'
 import { LocationModel } from '../shared/models/fhir/LocationModel'
-import { ContactDetailModel } from '../shared/models/fhir/MetadataType/ContactDetailModel'
+import { ContactDetailModel } from '../shared/models/fhir/MetadataTypes/ContactDetailModel'
 import { OrganizationModel } from '../shared/models/fhir/OrganizationModel'
 import { RiphStatus, ResearchStudyModel } from '../shared/models/fhir/ResearchStudyModel'
-import { ExtensionModel } from '../shared/models/fhir/SpecialPurposeDataType/ExtensionModel'
-import { MetaModel } from '../shared/models/fhir/SpecialPurposeDataType/MetaModel'
-import { ReferenceModel } from '../shared/models/fhir/SpecialPurposeDataType/ReferenceModel'
+import { ExtensionModel } from '../shared/models/fhir/SpecialPurposeDataTypes/ExtensionModel'
+import { MetaModel } from '../shared/models/fhir/SpecialPurposeDataTypes/MetaModel'
+import { ReferenceModel } from '../shared/models/fhir/SpecialPurposeDataTypes/ReferenceModel'
 
 export class RiphCtisResearchStudyModelFactory {
   static create(riphCtisDto: RiphCtisDto): ResearchStudyModel {

diff --git a/src/etl/RiphDmResearchStudyModelFactory.ts b/src/etl/RiphDmResearchStudyModelFactory.ts
@@ -1,18 +1,17 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Extension, Identifier } from 'fhir/r4'
 
 import { RiphDmDto } from './dto/RiphDmDto'
 import { ModelUtils } from '../shared/models/custom/ModelUtils'
 import { ReferenceContentsModel } from '../shared/models/custom/ReferenceContentsModel'
-import { CodeableConceptModel } from '../shared/models/fhir/DataType/CodeableConceptModel'
-import { IdentifierModel } from '../shared/models/fhir/DataType/IdentifierModel'
+import { CodeableConceptModel } from '../shared/models/fhir/DataTypes/CodeableConceptModel'
+import { IdentifierModel } from '../shared/models/fhir/DataTypes/IdentifierModel'
 import { GroupModel } from '../shared/models/fhir/GroupModel'
-import { ContactDetailModel } from '../shared/models/fhir/MetadataType/ContactDetailModel'
+import { ContactDetailModel } from '../shared/models/fhir/MetadataTypes/ContactDetailModel'
 import { OrganizationModel } from '../shared/models/fhir/OrganizationModel'
 import { ResearchStudyModel, RiphStatus } from '../shared/models/fhir/ResearchStudyModel'
-import { ExtensionModel } from '../shared/models/fhir/SpecialPurposeDataType/ExtensionModel'
-import { MetaModel } from '../shared/models/fhir/SpecialPurposeDataType/MetaModel'
-import { ReferenceModel } from '../shared/models/fhir/SpecialPurposeDataType/ReferenceModel'
+import { ExtensionModel } from '../shared/models/fhir/SpecialPurposeDataTypes/ExtensionModel'
+import { MetaModel } from '../shared/models/fhir/SpecialPurposeDataTypes/MetaModel'
+import { ReferenceModel } from '../shared/models/fhir/SpecialPurposeDataTypes/ReferenceModel'
 
 export class RiphDmResearchStudyModelFactory {
   static create(riphDmDto: RiphDmDto): ResearchStudyModel {
@@ -75,13 +74,13 @@ export class RiphDmResearchStudyModelFactory {
       IdentifierModel.createPrimarySlice(ModelUtils.UNAVAILABLE),
       IdentifierModel.createSecondarySlice(riphDmDto.numero_national, assigner),
     ]
-    const location = undefined
+    const location: CodeableConceptModel[] = undefined
     const meta: MetaModel = MetaModel.create(
       riphDmDto.historique,
       riphDmDto.dates_avis_favorable_ms_mns
     )
     const phase: CodeableConceptModel = CodeableConceptModel.createResearchStudyPhase(ModelUtils.UNAVAILABLE)
-    const site = undefined
+    const site: ReferenceModel[] = undefined
     const sponsor: ReferenceModel = ReferenceModel.createPrimarySponsor(primarySponsorOrganizationId)
     const status = riphDmDto.etat as RiphStatus
     const title = ModelUtils.emptyIfNull(riphDmDto.titre_recherche)

diff --git a/src/etl/RiphJardeResearchStudyModelFactory.ts b/src/etl/RiphJardeResearchStudyModelFactory.ts
@@ -1,18 +1,17 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Extension, Identifier, Organization } from 'fhir/r4'
 
 import { RiphJardeDto } from './dto/RiphJardeDto'
 import { ModelUtils } from '../shared/models/custom/ModelUtils'
 import { ReferenceContentsModel } from '../shared/models/custom/ReferenceContentsModel'
-import { CodeableConceptModel } from '../shared/models/fhir/DataType/CodeableConceptModel'
-import { IdentifierModel } from '../shared/models/fhir/DataType/IdentifierModel'
+import { CodeableConceptModel } from '../shared/models/fhir/DataTypes/CodeableConceptModel'
+import { IdentifierModel } from '../shared/models/fhir/DataTypes/IdentifierModel'
 import { GroupModel } from '../shared/models/fhir/GroupModel'
-import { ContactDetailModel } from '../shared/models/fhir/MetadataType/ContactDetailModel'
+import { ContactDetailModel } from '../shared/models/fhir/MetadataTypes/ContactDetailModel'
 import { OrganizationModel } from '../shared/models/fhir/OrganizationModel'
 import { ResearchStudyModel, RiphStatus } from '../shared/models/fhir/ResearchStudyModel'
-import { ExtensionModel } from '../shared/models/fhir/SpecialPurposeDataType/ExtensionModel'
-import { MetaModel } from '../shared/models/fhir/SpecialPurposeDataType/MetaModel'
-import { ReferenceModel } from '../shared/models/fhir/SpecialPurposeDataType/ReferenceModel'
+import { ExtensionModel } from '../shared/models/fhir/SpecialPurposeDataTypes/ExtensionModel'
+import { MetaModel } from '../shared/models/fhir/SpecialPurposeDataTypes/MetaModel'
+import { ReferenceModel } from '../shared/models/fhir/SpecialPurposeDataTypes/ReferenceModel'
 
 export class RiphJardeResearchStudyModelFactory {
   static create(riphJardeDto: RiphJardeDto): ResearchStudyModel {
@@ -75,13 +74,13 @@ export class RiphJardeResearchStudyModelFactory {
       IdentifierModel.createPrimarySlice(ModelUtils.UNAVAILABLE),
       IdentifierModel.createSecondarySlice(riphJardeDto.numero_national, assigner),
     ]
-    const location = undefined
+    const location: CodeableConceptModel[] = undefined
     const meta: MetaModel = MetaModel.create(
       riphJardeDto.historique,
       riphJardeDto.dates_avis_favorable_ms_mns
     )
     const phase: CodeableConceptModel = CodeableConceptModel.createResearchStudyPhase(ModelUtils.UNAVAILABLE)
-    const site = undefined
+    const site: ReferenceModel[] = undefined
     const sponsor: ReferenceModel = ReferenceModel.createPrimarySponsor(primarySponsorOrganizationId)
     const status = riphJardeDto.etat as RiphStatus
     const title = ModelUtils.emptyIfNull(riphJardeDto.titre_recherche)

diff --git a/src/shared/models/custom/ModelUtils.test.ts b/src/shared/models/custom/ModelUtils.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable sort-keys */
 import { ModelUtils } from './ModelUtils'
-import { AssignerForSecondaryIdentifier } from '../fhir/SpecialPurposeDataType/ReferenceModel'
+import { AssignerForSecondaryIdentifier } from '../fhir/SpecialPurposeDataTypes/ReferenceModel'
 import { riphCtisDto } from 'src/shared/test/helpers/elasticsearchHelper'
 
 describe('shared | models | custom | ModelUtils', () => {

diff --git a/src/shared/models/custom/ModelUtils.ts b/src/shared/models/custom/ModelUtils.ts
@@ -1,4 +1,4 @@
-import { AssignerForSecondaryIdentifier } from '../fhir/SpecialPurposeDataType/ReferenceModel'
+import { AssignerForSecondaryIdentifier } from '../fhir/SpecialPurposeDataTypes/ReferenceModel'
 
 export class ModelUtils {
   static UNAVAILABLE = 'INDISPONIBLE'

diff --git a/...eSystem/administrativeGenderCodeSystem.ts → ...Systems/administrativeGenderCodeSystem.ts b/...eSystem/administrativeGenderCodeSystem.ts → ...Systems/administrativeGenderCodeSystem.ts
diff --git a/...dels/fhir/CodeSystem/countryCodeSystem.ts → ...els/fhir/CodeSystems/countryCodeSystem.ts b/...dels/fhir/CodeSystem/countryCodeSystem.ts → ...els/fhir/CodeSystems/countryCodeSystem.ts
diff --git a/...odeSystem/eclaireTypeContactCodeSystem.ts → ...deSystems/eclaireTypeContactCodeSystem.ts b/...odeSystem/eclaireTypeContactCodeSystem.ts → ...deSystems/eclaireTypeContactCodeSystem.ts
diff --git a/...odels/fhir/CodeSystem/medDraCodeSystem.ts → ...dels/fhir/CodeSystems/medDraCodeSystem.ts b/...odels/fhir/CodeSystem/medDraCodeSystem.ts → ...dels/fhir/CodeSystems/medDraCodeSystem.ts
diff --git a/...odeSystem/researchStudyPhaseCodeSystem.ts → ...deSystems/researchStudyPhaseCodeSystem.ts b/...odeSystem/researchStudyPhaseCodeSystem.ts → ...deSystems/researchStudyPhaseCodeSystem.ts
diff --git a/...ls/fhir/CodeSystem/titleTypeCodeSystem.ts → ...s/fhir/CodeSystems/titleTypeCodeSystem.ts b/...ls/fhir/CodeSystem/titleTypeCodeSystem.ts → ...s/fhir/CodeSystems/titleTypeCodeSystem.ts
diff --git a/...ared/models/fhir/DataType/AddressModel.ts → ...red/models/fhir/DataTypes/AddressModel.ts b/...ared/models/fhir/DataType/AddressModel.ts → ...red/models/fhir/DataTypes/AddressModel.ts
diff --git a/...hir/DataType/CodeableConceptModel.test.ts → ...ir/DataTypes/CodeableConceptModel.test.ts b/...hir/DataType/CodeableConceptModel.test.ts → ...ir/DataTypes/CodeableConceptModel.test.ts
diff --git a/...els/fhir/DataType/CodeableConceptModel.ts → ...ls/fhir/DataTypes/CodeableConceptModel.ts b/...els/fhir/DataType/CodeableConceptModel.ts → ...ls/fhir/DataTypes/CodeableConceptModel.ts
@@ -2,8 +2,8 @@ import { CodeableConcept, Coding } from 'fhir/r4'
 
 import { CodingModel } from './CodingModel'
 import { ModelUtils } from '../../custom/ModelUtils'
-import { ContactType } from '../MetadataType/ContactDetailModel'
-import { LabelType } from '../SpecialPurposeDataType/ExtensionModel'
+import { ContactType } from '../MetadataTypes/ContactDetailModel'
+import { LabelType } from '../SpecialPurposeDataTypes/ExtensionModel'
 
 export class CodeableConceptModel implements CodeableConcept {
   constructor(

diff --git a/.../models/fhir/DataType/CodingModel.test.ts → ...models/fhir/DataTypes/CodingModel.test.ts b/.../models/fhir/DataType/CodingModel.test.ts → ...models/fhir/DataTypes/CodingModel.test.ts
diff --git a/...hared/models/fhir/DataType/CodingModel.ts → ...ared/models/fhir/DataTypes/CodingModel.ts b/...hared/models/fhir/DataType/CodingModel.ts → ...ared/models/fhir/DataTypes/CodingModel.ts
@@ -1,13 +1,13 @@
 import { Coding } from 'fhir/r4'
 
-import { administrativeGenderCodeSystem } from '../CodeSystem/administrativeGenderCodeSystem'
-import { countryCodeSystem } from '../CodeSystem/countryCodeSystem'
-import { eclaireTypeContactCodeSystem } from '../CodeSystem/eclaireTypeContactCodeSystem'
-import { medDraCodeSystem } from '../CodeSystem/medDraCodeSystem'
-import { researchStudyPhaseCodeSystem } from '../CodeSystem/researchStudyPhaseCodeSystem'
-import { titleTypeCodeSystem } from '../CodeSystem/titleTypeCodeSystem'
-import { ContactType } from '../MetadataType/ContactDetailModel'
-import { LabelType } from '../SpecialPurposeDataType/ExtensionModel'
+import { administrativeGenderCodeSystem } from '../CodeSystems/administrativeGenderCodeSystem'
+import { countryCodeSystem } from '../CodeSystems/countryCodeSystem'
+import { eclaireTypeContactCodeSystem } from '../CodeSystems/eclaireTypeContactCodeSystem'
+import { medDraCodeSystem } from '../CodeSystems/medDraCodeSystem'
+import { researchStudyPhaseCodeSystem } from '../CodeSystems/researchStudyPhaseCodeSystem'
+import { titleTypeCodeSystem } from '../CodeSystems/titleTypeCodeSystem'
+import { ContactType } from '../MetadataTypes/ContactDetailModel'
+import { LabelType } from '../SpecialPurposeDataTypes/ExtensionModel'
 
 export class CodingModel implements Coding {
   constructor(

diff --git a/...models/fhir/DataType/ContactPointModel.ts → ...odels/fhir/DataTypes/ContactPointModel.ts b/...models/fhir/DataType/ContactPointModel.ts → ...odels/fhir/DataTypes/ContactPointModel.ts
@@ -1,6 +1,6 @@
 import { ContactPoint, Extension } from 'fhir/r4'
 
-import { ExtensionModel } from '../SpecialPurposeDataType/ExtensionModel'
+import { ExtensionModel } from '../SpecialPurposeDataTypes/ExtensionModel'
 
 export class ContactPointModel implements ContactPoint {
   constructor(

diff --git a/...ed/models/fhir/DataType/HumanNameModel.ts → ...d/models/fhir/DataTypes/HumanNameModel.ts b/...ed/models/fhir/DataType/HumanNameModel.ts → ...d/models/fhir/DataTypes/HumanNameModel.ts
diff --git a/...d/models/fhir/DataType/IdentifierModel.ts → .../models/fhir/DataTypes/IdentifierModel.ts b/...d/models/fhir/DataType/IdentifierModel.ts → .../models/fhir/DataTypes/IdentifierModel.ts
@@ -3,7 +3,7 @@ import { Identifier, Reference } from 'fhir/r4'
 import {
   AssignerForSecondaryIdentifier,
   ReferenceModel,
-} from '../SpecialPurposeDataType/ReferenceModel'
+} from '../SpecialPurposeDataTypes/ReferenceModel'
 
 export class IdentifierModel implements Identifier {
   constructor(

diff --git a/...hared/models/fhir/DataType/PeriodModel.ts → ...ared/models/fhir/DataTypes/PeriodModel.ts b/...hared/models/fhir/DataType/PeriodModel.ts → ...ared/models/fhir/DataTypes/PeriodModel.ts
diff --git a/...red/models/fhir/DataType/QuantityModel.ts → ...ed/models/fhir/DataTypes/QuantityModel.ts b/...red/models/fhir/DataType/QuantityModel.ts → ...ed/models/fhir/DataTypes/QuantityModel.ts
diff --git a/...d/models/fhir/DataType/RangeModel.test.ts → .../models/fhir/DataTypes/RangeModel.test.ts b/...d/models/fhir/DataType/RangeModel.test.ts → .../models/fhir/DataTypes/RangeModel.test.ts
diff --git a/...shared/models/fhir/DataType/RangeModel.ts → ...hared/models/fhir/DataTypes/RangeModel.ts b/...shared/models/fhir/DataType/RangeModel.ts → ...hared/models/fhir/DataTypes/RangeModel.ts
diff --git a/src/shared/models/fhir/GroupCharacteristicModel.ts b/src/shared/models/fhir/GroupCharacteristicModel.ts
@@ -1,7 +1,7 @@
 import { CodeableConcept, GroupCharacteristic, Quantity, Range, Reference } from 'fhir/r4'
 
-import { CodeableConceptModel } from './DataType/CodeableConceptModel'
-import { RangeModel } from './DataType/RangeModel'
+import { CodeableConceptModel } from './DataTypes/CodeableConceptModel'
+import { RangeModel } from './DataTypes/RangeModel'
 import { ModelUtils } from '../custom/ModelUtils'
 
 export class GroupCharacteristicModel implements GroupCharacteristic {

diff --git a/src/shared/models/fhir/LocationModel.ts b/src/shared/models/fhir/LocationModel.ts
@@ -1,8 +1,8 @@
 import { Address, ContactPoint, Identifier, Location } from 'fhir/r4'
 
-import { AddressModel } from './DataType/AddressModel'
-import { ContactPointModel } from './DataType/ContactPointModel'
-import { IdentifierModel } from './DataType/IdentifierModel'
+import { AddressModel } from './DataTypes/AddressModel'
+import { ContactPointModel } from './DataTypes/ContactPointModel'
+import { IdentifierModel } from './DataTypes/IdentifierModel'
 
 export class LocationModel implements Location {
   readonly resourceType: 'Location'

diff --git a/...s/fhir/MetadataType/ContactDetailModel.ts → .../fhir/MetadataTypes/ContactDetailModel.ts b/...s/fhir/MetadataType/ContactDetailModel.ts → .../fhir/MetadataTypes/ContactDetailModel.ts
@@ -1,8 +1,8 @@
 import { ContactDetail, ContactPoint, Extension } from 'fhir/r4'
 
 import { ModelUtils } from '../../custom/ModelUtils'
-import { ContactPointModel } from '../DataType/ContactPointModel'
-import { ExtensionModel } from '../SpecialPurposeDataType/ExtensionModel'
+import { ContactPointModel } from '../DataTypes/ContactPointModel'
+import { ExtensionModel } from '../SpecialPurposeDataTypes/ExtensionModel'
 
 export type ContactType = 'Public' | 'Scientific';
 

diff --git a/src/shared/models/fhir/OrganizationContactModel.ts b/src/shared/models/fhir/OrganizationContactModel.ts
@@ -5,9 +5,9 @@ import {
   OrganizationContact,
 } from 'fhir/r4'
 
-import { CodeableConceptModel } from './DataType/CodeableConceptModel'
-import { ContactPointModel } from './DataType/ContactPointModel'
-import { HumanNameModel } from './DataType/HumanNameModel'
+import { CodeableConceptModel } from './DataTypes/CodeableConceptModel'
+import { ContactPointModel } from './DataTypes/ContactPointModel'
+import { HumanNameModel } from './DataTypes/HumanNameModel'
 
 export class OrganizationContactModel implements OrganizationContact {
   constructor(

diff --git a/src/shared/models/fhir/OrganizationModel.ts b/src/shared/models/fhir/OrganizationModel.ts
@@ -7,11 +7,11 @@ import {
   OrganizationContact,
 } from 'fhir/r4'
 
-import { AddressModel } from './DataType/AddressModel'
-import { CodeableConceptModel } from './DataType/CodeableConceptModel'
-import { ContactPointModel } from './DataType/ContactPointModel'
+import { AddressModel } from './DataTypes/AddressModel'
+import { CodeableConceptModel } from './DataTypes/CodeableConceptModel'
+import { ContactPointModel } from './DataTypes/ContactPointModel'
 import { OrganizationContactModel } from './OrganizationContactModel'
-import { AssignerForSecondaryIdentifier } from './SpecialPurposeDataType/ReferenceModel'
+import { AssignerForSecondaryIdentifier } from './SpecialPurposeDataTypes/ReferenceModel'
 import { ModelUtils } from '../custom/ModelUtils'
 
 export class OrganizationModel implements Organization {

diff --git a/.../SpecialPurposeDataType/ExtensionModel.ts → ...SpecialPurposeDataTypes/ExtensionModel.ts b/.../SpecialPurposeDataType/ExtensionModel.ts → ...SpecialPurposeDataTypes/ExtensionModel.ts
@@ -2,10 +2,10 @@ import { CodeableConcept, Extension, HumanName, Period, Reference } from 'fhir/r
 
 import { ReferenceModel } from './ReferenceModel'
 import { ModelUtils } from '../../custom/ModelUtils'
-import { CodeableConceptModel } from '../DataType/CodeableConceptModel'
-import { HumanNameModel } from '../DataType/HumanNameModel'
-import { PeriodModel } from '../DataType/PeriodModel'
-import { ContactType } from '../MetadataType/ContactDetailModel'
+import { CodeableConceptModel } from '../DataTypes/CodeableConceptModel'
+import { HumanNameModel } from '../DataTypes/HumanNameModel'
+import { PeriodModel } from '../DataTypes/PeriodModel'
+import { ContactType } from '../MetadataTypes/ContactDetailModel'
 
 export class ExtensionModel implements Extension {
   constructor(

diff --git a/.../fhir/SpecialPurposeDataType/MetaModel.ts → ...fhir/SpecialPurposeDataTypes/MetaModel.ts b/.../fhir/SpecialPurposeDataType/MetaModel.ts → ...fhir/SpecialPurposeDataTypes/MetaModel.ts
diff --git a/.../SpecialPurposeDataType/ReferenceModel.ts → ...SpecialPurposeDataTypes/ReferenceModel.ts b/.../SpecialPurposeDataType/ReferenceModel.ts → ...SpecialPurposeDataTypes/ReferenceModel.ts