refactor: update ThemeId import paths across multiple files (nx-circular-deps) (data <-> common) (#2123)

yvalentin · web-flow · commit bfb613fc6720 · 2025-07-31T11:39:55.000+02:00
diff --git a/apps/nuxt/src/components/layout/LayoutCatalog.vue b/apps/nuxt/src/components/layout/LayoutCatalog.vue
@@ -79,7 +79,7 @@ import { useNavigationStore } from '@/stores/navigation'
 import { FaqPage } from '@/tools/faq/faqType'
 import Navigation from '@/tools/navigation'
 import { Theme } from '@/tools/theme'
-import { ThemeId } from '@tee/data'
+import { ThemeId } from '@/types'
 import { computed } from 'vue'
 
 interface Props {
diff --git a/apps/nuxt/src/components/theme/ThemeFiltersAndCard.vue b/apps/nuxt/src/components/theme/ThemeFiltersAndCard.vue
@@ -11,9 +11,8 @@
   />
 </template>
 <script setup lang="ts">
-import { ThemeId } from '@tee/data'
 import { computed } from 'vue'
-import { FilterItemKeys } from '@/types'
+import { FilterItemKeys, ThemeId } from '@/types'
 import { useFiltersStore } from '@/stores/filters'
 interface Props {
   hasError: boolean
diff --git a/apps/nuxt/src/tools/api/opportunityApi.ts b/apps/nuxt/src/tools/api/opportunityApi.ts
@@ -11,12 +11,12 @@ import {
   RouteName,
   isProjectFormDataType,
   ProjectType,
-  ProgramTypeForFront
+  ProgramTypeForFront,
+  ThemeId
 } from '@/types'
 import RequestApi from '@/tools/api/requestApi'
 import Opportunity from '@/tools/opportunity'
 import TrackStructure from '@/tools/questionnaire/track/trackStructure'
-import { ThemeId } from '@tee/data'
 
 export default class OpportunityApi extends RequestApi {
   protected readonly url = '/api/opportunities'
diff --git a/libs/backend-ddd/src/opportunity/domain/opportunityFeatures.ts b/libs/backend-ddd/src/opportunity/domain/opportunityFeatures.ts
@@ -6,8 +6,8 @@ import OpportunityHubFeatures from '../../opportunityHub/domain/opportunityHubFe
 import { OpportunityHubRepository } from '../../opportunityHub/domain/spi'
 import { ProgramRepository } from '../../program/domain/spi'
 import ProgramFeatures from '../../program/domain/programFeatures'
-import { Operators, ProgramType, ThemeId } from '@tee/data'
-import { ContactDetails, Opportunity, OpportunityType, SiretValidator } from '@tee/common'
+import { Operators, ProgramType } from '@tee/data'
+import { ContactDetails, Opportunity, OpportunityType, SiretValidator, ThemeId } from '@tee/common'
 import EstablishmentService from '../../establishment/application/establishmentService'
 import Monitor from '../../common/domain/monitoring/monitor'
 import { ProjectService } from '../../project/application/projectService'
diff --git a/libs/backend-ddd/src/opportunity/domain/types.ts b/libs/backend-ddd/src/opportunity/domain/types.ts
@@ -1,5 +1,5 @@
-import { Opportunity, OpportunityDetails } from '@tee/common'
-import { ProgramType, ProjectType, Operators, ThemeId } from '@tee/data'
+import { Opportunity, OpportunityDetails, ThemeId } from '@tee/common'
+import { ProgramType, ProjectType, Operators } from '@tee/data'
 
 export type OpportunityWithContactId = Opportunity & {
   contactId: number
diff --git a/libs/backend-ddd/src/opportunityHub/infrastructure/api/placedesentreprises/placeDesEntreprises.ts b/libs/backend-ddd/src/opportunityHub/infrastructure/api/placedesentreprises/placeDesEntreprises.ts
@@ -8,8 +8,8 @@ import { OpportunityWithContactId } from '../../../../opportunity/domain/types'
 import OpportunityHubAbstract from '../opportunityHubAbstract'
 import { ProgramService } from '../../../../program/application/programService'
 import OpportunityService from '../../../../opportunity/application/opportunityService'
-import { Operators, ProgramType, ThemeId } from '@tee/data'
-import { Objective, Opportunity, OpportunityType } from '@tee/common'
+import { Operators, ProgramType } from '@tee/data'
+import { Objective, Opportunity, OpportunityType, ThemeId } from '@tee/common'
 import Monitor from '../../../../common/domain/monitoring/monitor'
 import { OpportunityAssociatedData } from '../../../../opportunity/domain/opportunityAssociatedData'
 
diff --git a/libs/backend-ddd/src/program/infrastructure/frontConverter.ts b/libs/backend-ddd/src/program/infrastructure/frontConverter.ts
@@ -1,5 +1,5 @@
-import { PublicodesKeys, PublicodeObjective } from '@tee/common'
-import { FiltersKeys, ProgramTypeForFront, ProgramTypeWithEligibility, PublicodesCondition, ThemeId } from '@tee/data'
+import { PublicodesKeys, PublicodeObjective, ThemeId } from '@tee/common'
+import { FiltersKeys, ProgramTypeForFront, ProgramTypeWithEligibility, PublicodesCondition } from '@tee/data'
 import type { ObjectivePublicodeData } from './types'
 
 class FrontConverter {
diff --git a/libs/backend-ddd/tests/opportunity/testing.ts b/libs/backend-ddd/tests/opportunity/testing.ts
@@ -1,5 +1,4 @@
-import { ContactDetails, Opportunity, OpportunityDetails, OpportunityType } from '@tee/common'
-import { ThemeId } from '@tee/data'
+import { ContactDetails, Opportunity, OpportunityDetails, OpportunityType, ThemeId } from '@tee/common'
 
 export const fakeContact = (): ContactDetails => {
   return {
diff --git a/libs/common/src/index.ts b/libs/common/src/index.ts
@@ -5,3 +5,4 @@ export * from './geoSearch/types'
 export * from './opportunity'
 export * from './questionnaire'
 export * from './validator'
+export * from './theme/types'
diff --git a/libs/common/src/questionnaire/questionnaireSchemaValidator.ts b/libs/common/src/questionnaire/questionnaireSchemaValidator.ts
@@ -1,5 +1,5 @@
-import { ThemeId } from '@tee/data'
 import { z } from 'zod'
+import { ThemeId } from '../theme/types'
 import { stringBoolean } from '../validator'
 import { BuildingProperty, MobilityStatus, StructureSize, WasteManagementStatus, WasteSortingStatus, YesNo } from './types/types'
 
diff --git a/libs/common/src/questionnaire/types/questionnaireData.ts b/libs/common/src/questionnaire/types/questionnaireData.ts
@@ -1,5 +1,5 @@
+import { ThemeId } from '../../theme/types'
 import { StructureSize, BuildingProperty, WasteSortingStatus, WasteManagementStatus, YesNo, MobilityStatus } from './types'
-import { ThemeId } from '@tee/data'
 
 export enum QuestionnaireDataEnum {
   priority_objective = 'priority_objective',
diff --git a/libs/common/src/theme/types.ts b/libs/common/src/theme/types.ts
diff --git a/libs/data/src/index.ts b/libs/data/src/index.ts
@@ -3,7 +3,6 @@ export * from './program/programEligibility'
 export * from './program/types/shared'
 export * from './program/types/program'
 export * from './type/publicodesTypes'
-export * from './theme/types/shared'
 export * from './project/types/shared'
 export * from './project/projectEligibility'
 export * from './project/projectSorter'
diff --git a/libs/data/src/program/types/shared.ts b/libs/data/src/program/types/shared.ts
@@ -1,4 +1,4 @@
-import { ThemeId } from '../../theme/types/shared'
+import { ThemeId } from '@tee/common'
 import type { Dispositif as ProgramWithoutId } from './program'
 
 export enum ProgramAidType {
diff --git a/libs/data/src/program/yamlGenerator/publicodesGenerator.ts b/libs/data/src/program/yamlGenerator/publicodesGenerator.ts
@@ -1,5 +1,5 @@
 import { DataProgram, Publicodes } from '../types/domain'
-import { ThemeId } from '../../theme/types/shared'
+import { ThemeId } from '@tee/common'
 import { Logger } from '../../common/logger/logger'
 import { LogLevel } from '../../common/logger/types'
 
diff --git a/libs/data/src/project/projectFeatures.ts b/libs/data/src/project/projectFeatures.ts
@@ -4,7 +4,7 @@ import { ProjectBaserow } from '../common/baserow/projectBaserow'
 import { DataProject, ProjectStatus } from './types/domain'
 import { jsonPrograms } from '../../static'
 import { ProgramType } from '../program/types/shared'
-import { ThemeId } from '../theme/types/shared'
+import { ThemeId } from '@tee/common'
 import { SlugValidator } from '../common/validators/slugValidator'
 import { LinkValidator } from '../common/validators/linkValidator'
 import { Logger } from '../common/logger/logger'
diff --git a/libs/data/src/project/types/shared.ts b/libs/data/src/project/types/shared.ts
@@ -1,4 +1,4 @@
-import { ThemeId } from '../../theme/types/shared'
+import { ThemeId } from '@tee/common'
 import { projects } from '../../../static'
 
 export interface ProjectType {
diff --git a/libs/data/src/testimony/types/shared.ts b/libs/data/src/testimony/types/shared.ts
@@ -1,5 +1,5 @@
 import { ProjectId } from '../../project/types/shared'
-import { ThemeId } from '../../theme/types/shared'
+import { ThemeId } from '@tee/common'
 
 export interface Testimony {
   slug: string
diff --git a/libs/data/src/theme/types/domain.ts b/libs/data/src/theme/types/domain.ts
@@ -1,4 +1,4 @@
-import { ThemeId } from './shared'
+import { ThemeId } from '@tee/common'
 
 export interface Theme {
   id: number
