diff --git a/apps/web/src/app/application/rootReducer.ts b/apps/web/src/app/application/rootReducer.ts index f8be8923b..dfa48dced 100644 --- a/apps/web/src/app/application/rootReducer.ts +++ b/apps/web/src/app/application/rootReducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "@reduxjs/toolkit"; -import projectCreation from "@/features/create-project/application/createProject.reducer"; +import projectCreation from "@/features/create-project/core/createProject.reducer"; import siteCreation from "@/features/create-site/application/createSite.reducer"; import siteMunicipalityData from "@/features/create-site/application/siteMunicipalityData.reducer"; import siteCarbonStorage from "@/features/create-site/application/siteSoilsCarbonStorage.reducer"; diff --git a/apps/web/src/app/application/store.ts b/apps/web/src/app/application/store.ts index 676766d99..460e46dd6 100644 --- a/apps/web/src/app/application/store.ts +++ b/apps/web/src/app/application/store.ts @@ -1,9 +1,9 @@ import { configureStore, Reducer } from "@reduxjs/toolkit"; -import { SiteMunicipalityDataGateway as CreateProjectMunicipalityDataGateway } from "@/features/create-project/application/getSiteLocalAuthorities.action"; -import { PhotovoltaicPerformanceGateway } from "@/features/create-project/application/renewable-energy/getPhotovoltaicExpectedPerformance.action"; -import { SaveReconversionProjectGateway } from "@/features/create-project/application/saveReconversionProject.action"; -import { SaveExpressReconversionProjectGateway } from "@/features/create-project/application/urban-project/urbanProject.actions"; +import { SiteMunicipalityDataGateway as CreateProjectMunicipalityDataGateway } from "@/features/create-project/core/getSiteLocalAuthorities.action"; +import { PhotovoltaicPerformanceGateway } from "@/features/create-project/core/renewable-energy/actions/getPhotovoltaicExpectedPerformance.action"; +import { SaveReconversionProjectGateway } from "@/features/create-project/core/saveReconversionProject.action"; +import { SaveExpressReconversionProjectGateway } from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { SiteMunicipalityDataGateway as CreateSiteMunicipalityDataGateway } from "@/features/create-site/application/siteMunicipalityData.actions"; import { ReconversionProjectImpactsGateway } from "@/features/projects/application/fetchReconversionProjectImpacts.action"; import { ProjectFeaturesGateway } from "@/features/projects/application/project-features/projectFeatures.actions"; @@ -12,8 +12,8 @@ import { AppSettingsGateway } from "@/shared/app-settings/core/AppSettingsGatewa import { CreateUserGateway } from "@/users/application/createUser.action"; import { CurrentUserGateway } from "@/users/application/initCurrentUser.action"; -import { GetSitesByIdGateway } from "../../features/create-project/application/createProject.actions"; -import { SoilsCarbonStorageGateway as ProjectSoilsCarbonStorageGateway } from "../../features/create-project/application/soilsCarbonStorage.action"; +import { GetSitesByIdGateway } from "../../features/create-project/core/createProject.actions"; +import { SoilsCarbonStorageGateway as ProjectSoilsCarbonStorageGateway } from "../../features/create-project/core/soilsCarbonStorage.action"; import { CreateSiteGateway } from "../../features/create-site/application/createSite.actions"; import { SoilsCarbonStorageGateway as SiteSoilsCarbonStorageGateway } from "../../features/create-site/application/siteSoilsCarbonStorage.actions"; import { ReconversionProjectsListGateway } from "../../features/projects/application/projectsList.actions"; diff --git a/apps/web/src/features/create-project/application/__tests__/projectSiteLocalAuthorities.reducer.spec.ts b/apps/web/src/features/create-project/core/__tests__/projectSiteLocalAuthorities.reducer.spec.ts similarity index 98% rename from apps/web/src/features/create-project/application/__tests__/projectSiteLocalAuthorities.reducer.spec.ts rename to apps/web/src/features/create-project/core/__tests__/projectSiteLocalAuthorities.reducer.spec.ts index cffecca5d..b34a246f1 100644 --- a/apps/web/src/features/create-project/application/__tests__/projectSiteLocalAuthorities.reducer.spec.ts +++ b/apps/web/src/features/create-project/core/__tests__/projectSiteLocalAuthorities.reducer.spec.ts @@ -3,9 +3,9 @@ import { createStore, RootState } from "@/app/application/store"; import { AdministrativeDivisionMock } from "@/shared/infrastructure/administrative-division-service/administrativeDivisionMock"; import { getTestAppDependencies } from "@/test/testAppDependencies"; -import { Address } from "../../domain/project.types"; import { getInitialState as getInitialProjectCreationState } from "../createProject.reducer"; import { fetchSiteLocalAuthorities } from "../getSiteLocalAuthorities.action"; +import { Address } from "../project.types"; import { relatedSiteData } from "./siteData.mock"; const API_MOCKED_RESULT = { diff --git a/apps/web/src/features/create-project/application/__tests__/siteData.mock.ts b/apps/web/src/features/create-project/core/__tests__/siteData.mock.ts similarity index 92% rename from apps/web/src/features/create-project/application/__tests__/siteData.mock.ts rename to apps/web/src/features/create-project/core/__tests__/siteData.mock.ts index f37b6122e..182d3d921 100644 --- a/apps/web/src/features/create-project/application/__tests__/siteData.mock.ts +++ b/apps/web/src/features/create-project/core/__tests__/siteData.mock.ts @@ -1,4 +1,4 @@ -import { ProjectSite } from "../../domain/project.types"; +import { ProjectSite } from "../project.types"; export const relatedSiteData = { id: "28b53918-a6f6-43f2-9554-7b5434428f8b", diff --git a/apps/web/src/features/create-project/application/createProject.actions.ts b/apps/web/src/features/create-project/core/createProject.actions.ts similarity index 90% rename from apps/web/src/features/create-project/application/createProject.actions.ts rename to apps/web/src/features/create-project/core/createProject.actions.ts index acb147900..f87ceadbd 100644 --- a/apps/web/src/features/create-project/application/createProject.actions.ts +++ b/apps/web/src/features/create-project/core/createProject.actions.ts @@ -1,6 +1,6 @@ import { createAppAsyncThunk } from "@/app/application/appAsyncThunk"; -import { ProjectSite } from "../domain/project.types"; +import { ProjectSite } from "./project.types"; export interface GetSitesByIdGateway { getById(siteId: string): Promise; diff --git a/apps/web/src/features/create-project/application/createProject.reducer.ts b/apps/web/src/features/create-project/core/createProject.reducer.ts similarity index 95% rename from apps/web/src/features/create-project/application/createProject.reducer.ts rename to apps/web/src/features/create-project/core/createProject.reducer.ts index 8af6396e3..5ed855b9f 100644 --- a/apps/web/src/features/create-project/application/createProject.reducer.ts +++ b/apps/web/src/features/create-project/core/createProject.reducer.ts @@ -3,7 +3,7 @@ import reduceReducers from "reduce-reducers"; import { DevelopmentPlanCategory } from "shared"; import { v4 as uuid } from "uuid"; -import { ProjectSite } from "@/features/create-project/domain/project.types"; +import { ProjectSite } from "@/features/create-project/core/project.types"; import { projectCreationInitiated } from "./createProject.actions"; import { fetchSiteLocalAuthorities } from "./getSiteLocalAuthorities.action"; @@ -12,7 +12,7 @@ import { INITIAL_STATE as renenewableEnergyProjectInitialState, renewableEnergyProjectReducer, } from "./renewable-energy/renewableEnergy.reducer"; -import { createModeStepReverted } from "./urban-project/urbanProject.actions"; +import { createModeStepReverted } from "./urban-project/actions/urbanProject.actions"; import urbanProjectReducer, { initialState as urbanProjectInitialState, UrbanProjectState, diff --git a/apps/web/src/features/create-project/application/createProject.selectors.ts b/apps/web/src/features/create-project/core/createProject.selectors.ts similarity index 97% rename from apps/web/src/features/create-project/application/createProject.selectors.ts rename to apps/web/src/features/create-project/core/createProject.selectors.ts index e1df2aea7..c6302f3e1 100644 --- a/apps/web/src/features/create-project/application/createProject.selectors.ts +++ b/apps/web/src/features/create-project/core/createProject.selectors.ts @@ -8,8 +8,8 @@ import { import { RootState } from "@/app/application/store"; -import { Address } from "../domain/project.types"; import { ProjectCreationState, ProjectCreationStep } from "./createProject.reducer"; +import { Address } from "./project.types"; const selectSelf = (state: RootState) => state.projectCreation; diff --git a/apps/web/src/features/create-project/application/getSiteLocalAuthorities.action.ts b/apps/web/src/features/create-project/core/getSiteLocalAuthorities.action.ts similarity index 100% rename from apps/web/src/features/create-project/application/getSiteLocalAuthorities.action.ts rename to apps/web/src/features/create-project/core/getSiteLocalAuthorities.action.ts diff --git a/apps/web/src/features/create-project/domain/project.types.ts b/apps/web/src/features/create-project/core/project.types.ts similarity index 100% rename from apps/web/src/features/create-project/domain/project.types.ts rename to apps/web/src/features/create-project/core/project.types.ts diff --git a/apps/web/src/features/create-project/domain/projectName.spec.ts b/apps/web/src/features/create-project/core/projectName.spec.ts similarity index 100% rename from apps/web/src/features/create-project/domain/projectName.spec.ts rename to apps/web/src/features/create-project/core/projectName.spec.ts diff --git a/apps/web/src/features/create-project/domain/projectName.ts b/apps/web/src/features/create-project/core/projectName.ts similarity index 100% rename from apps/web/src/features/create-project/domain/projectName.ts rename to apps/web/src/features/create-project/core/projectName.ts diff --git a/apps/web/src/features/create-project/application/renewable-energy/__tests__/expectedPhotovoltaicPerformance.spec.ts b/apps/web/src/features/create-project/core/renewable-energy/__tests__/expectedPhotovoltaicPerformance.spec.ts similarity index 96% rename from apps/web/src/features/create-project/application/renewable-energy/__tests__/expectedPhotovoltaicPerformance.spec.ts rename to apps/web/src/features/create-project/core/renewable-energy/__tests__/expectedPhotovoltaicPerformance.spec.ts index 2e4b61d3b..09199cd9e 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/__tests__/expectedPhotovoltaicPerformance.spec.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/__tests__/expectedPhotovoltaicPerformance.spec.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { createStore } from "@/app/application/store"; -import { ProjectSite } from "@/features/create-project/domain/project.types"; +import { ProjectSite } from "@/features/create-project/core/project.types"; import { ExpectedPhotovoltaicPerformanceMock } from "@/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceMock"; import { SitesServiceMock } from "@/features/create-project/infrastructure/sites-service/SitesServiceMock"; import { getTestAppDependencies } from "@/test/testAppDependencies"; @@ -9,8 +9,8 @@ import { projectCreationInitiated } from "../../createProject.actions"; import { fetchPhotovoltaicExpectedAnnulPowerPerformanceForLocation, PhotovoltaicPerformanceApiResult, -} from "../getPhotovoltaicExpectedPerformance.action"; -import { completePhotovoltaicInstallationElectricalPower } from "../renewableEnergy.actions"; +} from "../actions/getPhotovoltaicExpectedPerformance.action"; +import { completePhotovoltaicInstallationElectricalPower } from "../actions/renewableEnergy.actions"; const API_MOCKED_RESULT = { expectedPerformance: { diff --git a/apps/web/src/features/create-project/application/renewable-energy/__tests__/projectData.mock.ts b/apps/web/src/features/create-project/core/renewable-energy/__tests__/projectData.mock.ts similarity index 98% rename from apps/web/src/features/create-project/application/renewable-energy/__tests__/projectData.mock.ts rename to apps/web/src/features/create-project/core/renewable-energy/__tests__/projectData.mock.ts index f3bad3144..da1f0df2b 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/__tests__/projectData.mock.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/__tests__/projectData.mock.ts @@ -1,4 +1,4 @@ -import { ReconversionProjectCreationData } from "@/features/create-project/domain/project.types"; +import { ReconversionProjectCreationData } from "@/features/create-project/core/project.types"; export const projectWithMinimalData = { relatedSiteId: "f590f643-cd9a-4187-8973-f90e9f1998c8", diff --git a/apps/web/src/features/create-project/application/renewable-energy/__tests__/renewableEnergy.reducer.spec.ts b/apps/web/src/features/create-project/core/renewable-energy/__tests__/renewableEnergy.reducer.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/renewable-energy/__tests__/renewableEnergy.reducer.spec.ts rename to apps/web/src/features/create-project/core/renewable-energy/__tests__/renewableEnergy.reducer.spec.ts index 811244b51..6b9919ffe 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/__tests__/renewableEnergy.reducer.spec.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/__tests__/renewableEnergy.reducer.spec.ts @@ -5,7 +5,7 @@ import { buildUser } from "@/users/domain/user.mock"; import { InMemorySaveReconversionProjectService } from "../../../infrastructure/save-project-service/InMemorySaveReconversionProjectService"; import { relatedSiteData } from "../../__tests__/siteData.mock"; import { getInitialState } from "../../createProject.reducer"; -import { saveReconversionProject } from "../saveReconversionProject.action"; +import { saveReconversionProject } from "../actions/saveReconversionProject.action"; import { projectWithExhaustiveData, projectWithMinimalData } from "./projectData.mock"; describe("renewableEnergy.reducer.spec reducer", () => { diff --git a/apps/web/src/features/create-project/application/renewable-energy/__tests__/stakeholders.selector.spec.ts b/apps/web/src/features/create-project/core/renewable-energy/__tests__/stakeholders.selector.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/renewable-energy/__tests__/stakeholders.selector.spec.ts rename to apps/web/src/features/create-project/core/renewable-energy/__tests__/stakeholders.selector.spec.ts index 196f890f4..61a630aca 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/__tests__/stakeholders.selector.spec.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/__tests__/stakeholders.selector.spec.ts @@ -9,7 +9,7 @@ import { import { getRenewableEnergyProjectAvailableLocalAuthoritiesStakeholders, getRenewableEnergyProjectAvailableStakeholders, -} from "../stakeholders.selectors"; +} from "../selectors/stakeholders.selectors"; import { projectWithExhaustiveData, projectWithMinimalData } from "./projectData.mock"; const siteData = { diff --git a/apps/web/src/features/create-project/application/renewable-energy/getPhotovoltaicExpectedPerformance.action.ts b/apps/web/src/features/create-project/core/renewable-energy/actions/getPhotovoltaicExpectedPerformance.action.ts similarity index 100% rename from apps/web/src/features/create-project/application/renewable-energy/getPhotovoltaicExpectedPerformance.action.ts rename to apps/web/src/features/create-project/core/renewable-energy/actions/getPhotovoltaicExpectedPerformance.action.ts diff --git a/apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.actions.ts b/apps/web/src/features/create-project/core/renewable-energy/actions/renewableEnergy.actions.ts similarity index 98% rename from apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.actions.ts rename to apps/web/src/features/create-project/core/renewable-energy/actions/renewableEnergy.actions.ts index 0fb37fe4d..293f7930f 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.actions.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/actions/renewableEnergy.actions.ts @@ -14,8 +14,8 @@ import { PhotovoltaicKeyParameter, ReconversionProjectCreationData, Schedule, -} from "../../domain/project.types"; -import { SoilsTransformationProject } from "../../domain/soilsTransformation"; +} from "../../project.types"; +import { SoilsTransformationProject } from "../soilsTransformation"; export function prefixActionType(actionType: string) { return `projectCreation/renewableEnergyProject/${actionType}`; diff --git a/apps/web/src/features/create-project/application/renewable-energy/saveReconversionProject.action.ts b/apps/web/src/features/create-project/core/renewable-energy/actions/saveReconversionProject.action.ts similarity index 96% rename from apps/web/src/features/create-project/application/renewable-energy/saveReconversionProject.action.ts rename to apps/web/src/features/create-project/core/renewable-energy/actions/saveReconversionProject.action.ts index 3e74a7855..394e65aba 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/saveReconversionProject.action.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/actions/saveReconversionProject.action.ts @@ -1,6 +1,6 @@ import { createAppAsyncThunk } from "@/app/application/appAsyncThunk"; -import { saveProjectSchema } from "../saveReconversionProject.action"; +import { saveProjectSchema } from "../../saveReconversionProject.action"; export const saveReconversionProject = createAppAsyncThunk( "projectCreation/renewableEnergyProject/save", diff --git a/apps/web/src/features/create-project/application/renewable-energy/soilsCarbonStorage.actions.ts b/apps/web/src/features/create-project/core/renewable-energy/actions/soilsCarbonStorage.actions.ts similarity index 89% rename from apps/web/src/features/create-project/application/renewable-energy/soilsCarbonStorage.actions.ts rename to apps/web/src/features/create-project/core/renewable-energy/actions/soilsCarbonStorage.actions.ts index d3ccb1633..3ce35c54f 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/soilsCarbonStorage.actions.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/actions/soilsCarbonStorage.actions.ts @@ -1,8 +1,8 @@ import { createAppAsyncThunk } from "@/app/application/appAsyncThunk"; -import { selectSiteAddress, selectSiteSoilsDistribution } from "../createProject.selectors"; -import { selectProjectSoilsDistribution } from "../renewable-energy/renewableEnergy.selector"; -import { CurrentAndProjectedSoilsCarbonStorageResult } from "../soilsCarbonStorage.action"; +import { selectSiteAddress, selectSiteSoilsDistribution } from "../../createProject.selectors"; +import { CurrentAndProjectedSoilsCarbonStorageResult } from "../../soilsCarbonStorage.action"; +import { selectProjectSoilsDistribution } from "../selectors/renewableEnergy.selector"; import { prefixActionType } from "./renewableEnergy.actions"; export const fetchCurrentAndProjectedSoilsCarbonStorage = diff --git a/apps/web/src/features/create-project/domain/photovoltaic.ts b/apps/web/src/features/create-project/core/renewable-energy/photovoltaic.ts similarity index 100% rename from apps/web/src/features/create-project/domain/photovoltaic.ts rename to apps/web/src/features/create-project/core/renewable-energy/photovoltaic.ts diff --git a/apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.reducer.ts b/apps/web/src/features/create-project/core/renewable-energy/renewableEnergy.reducer.ts similarity index 98% rename from apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.reducer.ts rename to apps/web/src/features/create-project/core/renewable-energy/renewableEnergy.reducer.ts index 3f36b15d6..0c66403eb 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.reducer.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/renewableEnergy.reducer.ts @@ -6,22 +6,11 @@ import { } from "@reduxjs/toolkit"; import { SoilsDistribution, stripEmptySurfaces } from "shared"; -import { ReconversionProjectCreationData } from "@/features/create-project/domain/project.types"; +import { ReconversionProjectCreationData } from "@/features/create-project/core/project.types"; -import { - getRecommendedPhotovoltaicPanelsAccessPathSurfaceArea, - getRecommendedPhotovoltaicPanelsFoundationsSurfaceArea, -} from "../../domain/photovoltaic"; -import { - canSiteAccomodatePhotovoltaicPanels, - hasSiteSignificantBiodiversityAndClimateSensibleSoils, - preserveCurrentSoils, - transformNonSuitableSoils, - transformSoilsForRenaturation, -} from "../../domain/soilsTransformation"; import { ProjectCreationState } from "../createProject.reducer"; import { SoilsCarbonStorageResult } from "../soilsCarbonStorage.action"; -import { fetchPhotovoltaicExpectedAnnulPowerPerformanceForLocation } from "./getPhotovoltaicExpectedPerformance.action"; +import { fetchPhotovoltaicExpectedAnnulPowerPerformanceForLocation } from "./actions/getPhotovoltaicExpectedPerformance.action"; import { completeNonSuitableSoilsNoticeStep, completeNonSuitableSoilsSelectionStep, @@ -99,9 +88,20 @@ import { revertYearlyProjectedExpenses, revertYearlyProjectedRevenue, revertSoilsDecontaminationIntroductionStep, -} from "./renewableEnergy.actions"; -import { saveReconversionProject } from "./saveReconversionProject.action"; -import { fetchCurrentAndProjectedSoilsCarbonStorage } from "./soilsCarbonStorage.actions"; +} from "./actions/renewableEnergy.actions"; +import { saveReconversionProject } from "./actions/saveReconversionProject.action"; +import { fetchCurrentAndProjectedSoilsCarbonStorage } from "./actions/soilsCarbonStorage.actions"; +import { + getRecommendedPhotovoltaicPanelsAccessPathSurfaceArea, + getRecommendedPhotovoltaicPanelsFoundationsSurfaceArea, +} from "./photovoltaic"; +import { + canSiteAccomodatePhotovoltaicPanels, + hasSiteSignificantBiodiversityAndClimateSensibleSoils, + preserveCurrentSoils, + transformNonSuitableSoils, + transformSoilsForRenaturation, +} from "./soilsTransformation"; export type RenewableEneryProjectState = { saveState: "idle" | "loading" | "success" | "error"; diff --git a/apps/web/src/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors.ts b/apps/web/src/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors.ts similarity index 97% rename from apps/web/src/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors.ts rename to apps/web/src/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors.ts index a477aa213..ec2a53900 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors.ts @@ -1,10 +1,10 @@ import { createSelector } from "@reduxjs/toolkit"; +import { selectSiteSurfaceArea } from "../../createProject.selectors"; import { getRecommendedPhotovoltaicPanelsSurfaceAreaFromElectricalPower, getRecommendedPowerKWcFromPhotovoltaicPanelsSurfaceArea, -} from "../../domain/photovoltaic"; -import { selectSiteSurfaceArea } from "../createProject.selectors"; +} from "../photovoltaic"; import { selectCreationData } from "./renewableEnergy.selector"; export const selectPhotovoltaicPanelsSurfaceArea = createSelector( diff --git a/apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.selector.ts b/apps/web/src/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector.ts similarity index 92% rename from apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.selector.ts rename to apps/web/src/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector.ts index 7d46ae4bf..b53381dde 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/renewableEnergy.selector.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector.ts @@ -4,6 +4,9 @@ import { ProjectSchedule, ProjectScheduleBuilder, SoilsDistribution } from "shar import { RootState } from "@/app/application/store"; import { RenewableEnergyDevelopmentPlanType } from "@/shared/domain/reconversionProject"; +import { ProjectCreationState } from "../../createProject.reducer"; +import { selectDefaultSchedule } from "../../createProject.selectors"; +import { generateRenewableEnergyProjectName } from "../../projectName"; import { computeDefaultPhotovoltaicOtherAmountExpenses, computeDefaultPhotovoltaicTechnicalStudiesAmountExpenses, @@ -12,11 +15,8 @@ import { computeDefaultPhotovoltaicYearlyRecurringRevenueAmount, computeDefaultPhotovoltaicYearlyRentAmount, computeDefaultPhotovoltaicYearlyTaxesAmount, -} from "../../domain/photovoltaic"; -import { generateRenewableEnergyProjectName } from "../../domain/projectName"; -import { ProjectCreationState } from "../createProject.reducer"; -import { selectDefaultSchedule } from "../createProject.selectors"; -import { RenewableEneryProjectState } from "./renewableEnergy.reducer"; +} from "../photovoltaic"; +import { RenewableEneryProjectState } from "../renewableEnergy.reducer"; const selectSelf = (state: RootState) => state.projectCreation; diff --git a/apps/web/src/features/create-project/application/renewable-energy/soilsTransformation.selectors.ts b/apps/web/src/features/create-project/core/renewable-energy/selectors/soilsTransformation.selectors.ts similarity index 98% rename from apps/web/src/features/create-project/application/renewable-energy/soilsTransformation.selectors.ts rename to apps/web/src/features/create-project/core/renewable-energy/selectors/soilsTransformation.selectors.ts index 52b279056..f9844ed98 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/soilsTransformation.selectors.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/selectors/soilsTransformation.selectors.ts @@ -3,6 +3,7 @@ import { SoilsDistribution, SoilType, sumSoilsSurfaceAreasWhere } from "shared"; import { typedObjectKeys } from "@/shared/services/object-keys/objectKeys"; +import { selectSiteData, selectSiteSoilsDistribution } from "../../createProject.selectors"; import { getBioversityAndClimateSensitiveSoilsSurfaceAreaDestroyed, getNonSuitableSoilsForPhotovoltaicPanels, @@ -10,8 +11,7 @@ import { getSuitableSurfaceAreaForPhotovoltaicPanels, isBiodiversityAndClimateSensibleSoil, willTransformationNoticeablyImpactBiodiversityAndClimate, -} from "../../domain/soilsTransformation"; -import { selectSiteData, selectSiteSoilsDistribution } from "../createProject.selectors"; +} from "../soilsTransformation"; import { selectPhotovoltaicPanelsSurfaceArea } from "./photovoltaicPowerStation.selectors"; import { selectCreationData, selectProjectSoilsDistribution } from "./renewableEnergy.selector"; diff --git a/apps/web/src/features/create-project/application/renewable-energy/stakeholders.selectors.ts b/apps/web/src/features/create-project/core/renewable-energy/selectors/stakeholders.selectors.ts similarity index 96% rename from apps/web/src/features/create-project/application/renewable-energy/stakeholders.selectors.ts rename to apps/web/src/features/create-project/core/renewable-energy/selectors/stakeholders.selectors.ts index f6325e3a0..0baadb1e0 100644 --- a/apps/web/src/features/create-project/application/renewable-energy/stakeholders.selectors.ts +++ b/apps/web/src/features/create-project/core/renewable-energy/selectors/stakeholders.selectors.ts @@ -1,12 +1,12 @@ import { createSelector } from "@reduxjs/toolkit"; -import { ProjectStakeholder } from "../../domain/project.types"; +import { ProjectStakeholder } from "../../project.types"; import { AvailableProjectStakeholder, getAvailableLocalAuthoritiesStakeholders, getProjectAvailableStakeholders, hasStakeholder, -} from "../stakeholders.selectors"; +} from "../../stakeholders.selectors"; import { selectCreationData } from "./renewableEnergy.selector"; export const getRenewableEnergyProjectAvailableStakeholders = createSelector( diff --git a/apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.selectors.ts b/apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.selectors.ts new file mode 100644 index 000000000..d25883228 --- /dev/null +++ b/apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.selectors.ts @@ -0,0 +1,104 @@ +import { createSelector } from "@reduxjs/toolkit"; +import { SoilsDistribution, SoilType, sumSoilsSurfaceAreasWhere } from "shared"; + +import { typedObjectKeys } from "@/shared/services/object-keys/objectKeys"; + +import { selectSiteData, selectSiteSoilsDistribution } from "../createProject.selectors"; +import { selectPhotovoltaicPanelsSurfaceArea } from "./selectors/photovoltaicPowerStation.selectors"; +import { + selectCreationData, + selectProjectSoilsDistribution, +} from "./selectors/renewableEnergy.selector"; +import { + getNonSuitableSoilsForPhotovoltaicPanels, + getSuitableSoilsForTransformation, + getSuitableSurfaceAreaForPhotovoltaicPanels, + isBiodiversityAndClimateSensibleSoil, + willTransformationNoticeablyImpactBiodiversityAndClimate, + getBioversityAndClimateSensitiveSoilsSurfaceAreaDestroyed, +} from "./soilsTransformation"; + +export const selectSuitableSurfaceAreaForPhotovoltaicPanels = createSelector( + selectSiteData, + (state): number => { + return getSuitableSurfaceAreaForPhotovoltaicPanels(state?.soilsDistribution ?? {}); + }, +); + +export const selectNonSuitableSoilsForPhototovoltaicPanels = createSelector( + selectSiteData, + (state): SoilsDistribution => { + return state ? getNonSuitableSoilsForPhotovoltaicPanels(state.soilsDistribution) : {}; + }, +); + +export const selectMissingSuitableSurfaceAreaForPhotovoltaicPanels = createSelector( + [selectPhotovoltaicPanelsSurfaceArea, selectSuitableSurfaceAreaForPhotovoltaicPanels], + (neededSurfaceArea, suitableSurfaceArea): number => { + return neededSurfaceArea - suitableSurfaceArea; + }, +); + +const selectNonSuitableSoilsSelected = createSelector( + selectCreationData, + (creationData): SoilType[] => creationData.nonSuitableSoilsToTransform ?? [], +); + +export const selectNonSuitableSoilsForPhototovoltaicPanelsToTransform = createSelector( + [selectNonSuitableSoilsForPhototovoltaicPanels, selectNonSuitableSoilsSelected], + (nonSuitableSoils, selectedNonSuitableSoilsToTransform): SoilsDistribution => { + return typedObjectKeys(nonSuitableSoils) + .filter((soilType) => selectedNonSuitableSoilsToTransform.includes(soilType)) + .reduce((soilsDistribution, soilType) => { + return { ...soilsDistribution, [soilType]: nonSuitableSoils[soilType] }; + }, {}); + }, +); + +export const selectFutureSoils = createSelector(selectCreationData, (creationData): SoilType[] => { + return creationData.futureSoilsSelection ?? []; +}); + +export const selectBiodiversityAndClimateSensibleSoilsSurfaceAreaDestroyed = createSelector( + [selectSiteSoilsDistribution, selectProjectSoilsDistribution], + (siteSoilsDistribution, projectSoilsDistribution): number => { + return getBioversityAndClimateSensitiveSoilsSurfaceAreaDestroyed( + siteSoilsDistribution, + projectSoilsDistribution, + ); + }, +); + +export const selectWillSoilsTransformationHaveNegativeImpactOnBiodiversityAndClimate = + createSelector( + [selectSiteSoilsDistribution, selectProjectSoilsDistribution], + (siteSoilsDistribution, projectSoilsDistribution): boolean => { + return willTransformationNoticeablyImpactBiodiversityAndClimate( + siteSoilsDistribution, + projectSoilsDistribution, + ); + }, + ); + +export const selectFutureBiodiversityAndClimateSensibleSoilsSurfaceArea = createSelector( + selectProjectSoilsDistribution, + (futureSoilsDistribution): number => { + return sumSoilsSurfaceAreasWhere(futureSoilsDistribution, isBiodiversityAndClimateSensibleSoil); + }, +); + +export const selectBaseSoilsDistributionForTransformation = createSelector( + selectCreationData, + selectSiteData, + (creationData, siteData): SoilsDistribution => { + return creationData.baseSoilsDistributionForTransformation ?? siteData?.soilsDistribution ?? {}; + }, +); + +export const selectTransformableSoils = createSelector( + selectBaseSoilsDistributionForTransformation, + (baseSoilsDistributionForTransformation): SoilType[] => { + const currentSoils = typedObjectKeys(baseSoilsDistributionForTransformation); + return getSuitableSoilsForTransformation(currentSoils); + }, +); diff --git a/apps/web/src/features/create-project/domain/soilsTransformation.spec.ts b/apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.spec.ts similarity index 100% rename from apps/web/src/features/create-project/domain/soilsTransformation.spec.ts rename to apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.spec.ts diff --git a/apps/web/src/features/create-project/domain/soilsTransformation.ts b/apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.ts similarity index 100% rename from apps/web/src/features/create-project/domain/soilsTransformation.ts rename to apps/web/src/features/create-project/core/renewable-energy/soilsTransformation.ts diff --git a/apps/web/src/features/create-project/application/saveReconversionProject.action.ts b/apps/web/src/features/create-project/core/saveReconversionProject.action.ts similarity index 100% rename from apps/web/src/features/create-project/application/saveReconversionProject.action.ts rename to apps/web/src/features/create-project/core/saveReconversionProject.action.ts diff --git a/apps/web/src/features/create-project/application/soilsCarbonStorage.action.ts b/apps/web/src/features/create-project/core/soilsCarbonStorage.action.ts similarity index 100% rename from apps/web/src/features/create-project/application/soilsCarbonStorage.action.ts rename to apps/web/src/features/create-project/core/soilsCarbonStorage.action.ts diff --git a/apps/web/src/features/create-project/application/stakeholders.selectors.ts b/apps/web/src/features/create-project/core/stakeholders.selectors.ts similarity index 98% rename from apps/web/src/features/create-project/application/stakeholders.selectors.ts rename to apps/web/src/features/create-project/core/stakeholders.selectors.ts index cbe8e1c4a..21d7a4249 100644 --- a/apps/web/src/features/create-project/application/stakeholders.selectors.ts +++ b/apps/web/src/features/create-project/core/stakeholders.selectors.ts @@ -4,8 +4,8 @@ import { LocalAuthority } from "shared/dist/local-authority"; import { RootState } from "@/app/application/store"; -import { ProjectStakeholderStructure } from "../domain/project.types"; import { selectSiteData } from "./createProject.selectors"; +import { ProjectStakeholderStructure } from "./project.types"; export type AvailableProjectStakeholder = { name: string; diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/saveReconversionProject.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/saveReconversionProject.spec.ts similarity index 95% rename from apps/web/src/features/create-project/application/urban-project/__tests__/saveReconversionProject.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/saveReconversionProject.spec.ts index d78b79085..aa45979f3 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/saveReconversionProject.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/saveReconversionProject.spec.ts @@ -7,10 +7,10 @@ import { UrbanProjectPhase, } from "shared"; -import { ProjectStakeholder } from "@/features/create-project/domain/project.types"; +import { ProjectStakeholder } from "@/features/create-project/core/project.types"; import { initCurrentUser } from "@/users/application/initCurrentUser.action"; -import { saveReconversionProject } from "../saveReconversionProject.action"; +import { saveReconversionProject } from "../actions/saveReconversionProject.action"; import { StoreBuilder } from "./testUtils"; const mock = { diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/testUtils.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/testUtils.ts similarity index 100% rename from apps/web/src/features/create-project/application/urban-project/__tests__/testUtils.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/testUtils.ts diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectBuildings.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectBuildings.spec.ts similarity index 98% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectBuildings.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectBuildings.spec.ts index 9df4272ac..fa6a18a98 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectBuildings.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectBuildings.spec.ts @@ -1,5 +1,5 @@ /* eslint-disable jest/expect-expect */ -import "../urbanProject.actions"; +import "../actions/urbanProject.actions"; import { buildingsFloorSurfaceAreaCompleted, buildingsFloorSurfaceAreaReverted, @@ -11,8 +11,8 @@ import { buildingsUseCategorySurfaceAreasReverted, buildingsEconomicActivitySurfaceAreasCompleted, buildingsEconomicActivitySurfaceAreasReverted, -} from "../urbanProject.actions"; -import { selectBuildingsEconomicActivitySurfaceDistributionWithUnit } from "../urbanProject.selectors"; +} from "../actions/urbanProject.actions"; +import { selectBuildingsEconomicActivitySurfaceDistributionWithUnit } from "../selectors/urbanProject.selectors"; import { expectRevertedState, expectUpdatedState, StoreBuilder } from "./testUtils"; describe("Urban project custom creation : buildings steps", () => { diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectCosts.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectCosts.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectCosts.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectCosts.spec.ts index 42ab2c8a6..1462bde7e 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectCosts.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectCosts.spec.ts @@ -10,7 +10,7 @@ import { sitePurchaseReverted, yearlyProjectedExpensesCompleted, yearlyProjectedExpensesReverted, -} from "../urbanProject.actions"; +} from "../actions/urbanProject.actions"; import { expectCurrentStep, expectUpdatedState, diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectRevenues.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectRevenues.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectRevenues.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectRevenues.spec.ts index ce4903f9a..940831f7e 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectRevenues.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectRevenues.spec.ts @@ -8,7 +8,7 @@ import { revenueIntroductionCompleted, yearlyProjectedRevenueCompleted, yearlyProjectedRevenueReverted, -} from "../urbanProject.actions"; +} from "../actions/urbanProject.actions"; import { expectCurrentStep, expectUpdatedState, diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectScheduleNameAndPhase.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectScheduleNameAndPhase.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectScheduleNameAndPhase.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectScheduleNameAndPhase.spec.ts index daeb58f90..103da5405 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectScheduleNameAndPhase.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectScheduleNameAndPhase.spec.ts @@ -8,7 +8,7 @@ import { scheduleIntroductionCompleted, scheduleIntroductionReverted, scheduleReverted, -} from "../urbanProject.actions"; +} from "../actions/urbanProject.actions"; import { expectCurrentStep, expectUpdatedState, diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectSoilsDecontamination.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectSoilsDecontamination.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectSoilsDecontamination.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectSoilsDecontamination.spec.ts index 092a6e1c4..4f7db5d30 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectSoilsDecontamination.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectSoilsDecontamination.spec.ts @@ -6,7 +6,7 @@ import { soilsDecontaminationSelectionReverted, soilsDecontaminationSurfaceAreaCompleted, soilsDecontaminationSurfaceAreaReverted, -} from "../urbanProject.actions"; +} from "../actions/urbanProject.actions"; import { expectRevertedState, expectUpdatedState, StoreBuilder } from "./testUtils"; describe("Urban project custom creation : soils decontamination", () => { diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectSpaces.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectSpaces.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectSpaces.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectSpaces.spec.ts index ec1c653ef..f322c8b98 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectSpaces.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectSpaces.spec.ts @@ -21,7 +21,7 @@ import { spacesSelectionReverted, spacesSurfaceAreaCompleted, spacesSurfaceAreaReverted, -} from "../urbanProject.actions"; +} from "../actions/urbanProject.actions"; import { expectCurrentStep, expectUpdatedState, diff --git a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectStakeholders.spec.ts b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectStakeholders.spec.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectStakeholders.spec.ts rename to apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectStakeholders.spec.ts index 6e3686d6d..1830b49ba 100644 --- a/apps/web/src/features/create-project/application/urban-project/__tests__/urbanProjectStakeholders.spec.ts +++ b/apps/web/src/features/create-project/core/urban-project/__tests__/urbanProjectStakeholders.spec.ts @@ -6,7 +6,7 @@ import { stakeholderProjectDeveloperReverted, stakeholderReinstatementContractOwnerCompleted, stakeholderReinstatementContractOwnerReverted, -} from "../urbanProject.actions"; +} from "../actions/urbanProject.actions"; import { expectCurrentStep, expectUpdatedState, diff --git a/apps/web/src/features/create-project/application/urban-project/saveReconversionProject.action.ts b/apps/web/src/features/create-project/core/urban-project/actions/saveReconversionProject.action.ts similarity index 95% rename from apps/web/src/features/create-project/application/urban-project/saveReconversionProject.action.ts rename to apps/web/src/features/create-project/core/urban-project/actions/saveReconversionProject.action.ts index eeb639333..887d9441d 100644 --- a/apps/web/src/features/create-project/application/urban-project/saveReconversionProject.action.ts +++ b/apps/web/src/features/create-project/core/urban-project/actions/saveReconversionProject.action.ts @@ -1,11 +1,11 @@ import { createAppAsyncThunk } from "@/app/application/appAsyncThunk"; -import { saveProjectSchema } from "../saveReconversionProject.action"; -import { prefixActionType } from "./urbanProject.actions"; +import { saveProjectSchema } from "../../saveReconversionProject.action"; import { getUrbanProjectSpaceDistribution, selectUrbanProjectSoilsDistribution, -} from "./urbanProject.selectors"; +} from "../selectors/urbanProject.selectors"; +import { prefixActionType } from "./urbanProject.actions"; export const saveReconversionProject = createAppAsyncThunk( prefixActionType("saveReconversionProject"), diff --git a/apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.actions.ts b/apps/web/src/features/create-project/core/urban-project/actions/soilsCarbonStorage.actions.ts similarity index 84% rename from apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.actions.ts rename to apps/web/src/features/create-project/core/urban-project/actions/soilsCarbonStorage.actions.ts index 0c5705bd6..9e5682798 100644 --- a/apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.actions.ts +++ b/apps/web/src/features/create-project/core/urban-project/actions/soilsCarbonStorage.actions.ts @@ -1,9 +1,9 @@ import { createAppAsyncThunk } from "@/app/application/appAsyncThunk"; -import { selectSiteAddress, selectSiteSoilsDistribution } from "../createProject.selectors"; -import { CurrentAndProjectedSoilsCarbonStorageResult } from "../soilsCarbonStorage.action"; -import { prefixActionType } from "../urban-project/urbanProject.actions"; -import { selectUrbanProjectSoilsDistribution } from "./urbanProject.selectors"; +import { selectSiteAddress, selectSiteSoilsDistribution } from "../../createProject.selectors"; +import { CurrentAndProjectedSoilsCarbonStorageResult } from "../../soilsCarbonStorage.action"; +import { selectUrbanProjectSoilsDistribution } from "../selectors/urbanProject.selectors"; +import { prefixActionType } from "./urbanProject.actions"; export const fetchCurrentAndProjectedSoilsCarbonStorage = createAppAsyncThunk( diff --git a/apps/web/src/features/create-project/application/urban-project/urbanProject.actions.ts b/apps/web/src/features/create-project/core/urban-project/actions/urbanProject.actions.ts similarity index 98% rename from apps/web/src/features/create-project/application/urban-project/urbanProject.actions.ts rename to apps/web/src/features/create-project/core/urban-project/actions/urbanProject.actions.ts index 37f8090de..cfbf5cfe4 100644 --- a/apps/web/src/features/create-project/application/urban-project/urbanProject.actions.ts +++ b/apps/web/src/features/create-project/core/urban-project/actions/urbanProject.actions.ts @@ -16,8 +16,8 @@ import { z } from "zod"; import { createAppAsyncThunk } from "@/app/application/appAsyncThunk"; -import { ProjectStakeholderStructure, Schedule } from "../../domain/project.types"; -import { BuildingsUseCategory } from "../../domain/urbanProject"; +import { ProjectStakeholderStructure, Schedule } from "../../project.types"; +import { BuildingsUseCategory } from "../urbanProject"; export function prefixActionType(actionType: string) { return `projectCreation/urbanProject/${actionType}`; diff --git a/apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.selectors.ts b/apps/web/src/features/create-project/core/urban-project/selectors/soilsCarbonStorage.selectors.ts similarity index 100% rename from apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.selectors.ts rename to apps/web/src/features/create-project/core/urban-project/selectors/soilsCarbonStorage.selectors.ts diff --git a/apps/web/src/features/create-project/application/urban-project/stakeholders.selectors.ts b/apps/web/src/features/create-project/core/urban-project/selectors/stakeholders.selectors.ts similarity index 98% rename from apps/web/src/features/create-project/application/urban-project/stakeholders.selectors.ts rename to apps/web/src/features/create-project/core/urban-project/selectors/stakeholders.selectors.ts index 577ffbb35..725a9a430 100644 --- a/apps/web/src/features/create-project/application/urban-project/stakeholders.selectors.ts +++ b/apps/web/src/features/create-project/core/urban-project/selectors/stakeholders.selectors.ts @@ -5,7 +5,7 @@ import { getAvailableLocalAuthoritiesStakeholders, getProjectAvailableStakeholders, hasStakeholder, -} from "../stakeholders.selectors"; +} from "../../stakeholders.selectors"; import { selectCreationData } from "./urbanProject.selectors"; export const getUrbanProjectAvailableStakeholders = createSelector( diff --git a/apps/web/src/features/create-project/application/urban-project/urbanProject.selectors.ts b/apps/web/src/features/create-project/core/urban-project/selectors/urbanProject.selectors.ts similarity index 97% rename from apps/web/src/features/create-project/application/urban-project/urbanProject.selectors.ts rename to apps/web/src/features/create-project/core/urban-project/selectors/urbanProject.selectors.ts index 4dbbbbed6..62a119e90 100644 --- a/apps/web/src/features/create-project/application/urban-project/urbanProject.selectors.ts +++ b/apps/web/src/features/create-project/core/urban-project/selectors/urbanProject.selectors.ts @@ -16,13 +16,13 @@ import { import { RootState } from "@/app/application/store"; import { selectAppSettings } from "@/shared/app-settings/core/appSettings"; -import { generateUrbanProjectName } from "../../domain/projectName"; +import { selectDefaultSchedule, selectSiteData } from "../../createProject.selectors"; +import { generateUrbanProjectName } from "../../projectName"; +import { UrbanProjectCreationStep, UrbanProjectState } from "../urbanProject.reducer"; import { getUrbanProjectSoilsDistributionFromSpaces, UrbanSpacesByCategory, -} from "../../domain/urbanProjectSoils"; -import { selectDefaultSchedule, selectSiteData } from "../createProject.selectors"; -import { UrbanProjectCreationStep, UrbanProjectState } from "./urbanProject.reducer"; +} from "../urbanProjectSoils"; const selectSelf = (state: RootState) => state.projectCreation.urbanProject; diff --git a/apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.reducer.ts b/apps/web/src/features/create-project/core/urban-project/soilsCarbonStorage.reducer.ts similarity index 91% rename from apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.reducer.ts rename to apps/web/src/features/create-project/core/urban-project/soilsCarbonStorage.reducer.ts index a755cf70e..a45079610 100644 --- a/apps/web/src/features/create-project/application/urban-project/soilsCarbonStorage.reducer.ts +++ b/apps/web/src/features/create-project/core/urban-project/soilsCarbonStorage.reducer.ts @@ -1,7 +1,7 @@ import { createReducer } from "@reduxjs/toolkit"; import { SoilsCarbonStorageResult } from "../soilsCarbonStorage.action"; -import { fetchCurrentAndProjectedSoilsCarbonStorage } from "./soilsCarbonStorage.actions"; +import { fetchCurrentAndProjectedSoilsCarbonStorage } from "./actions/soilsCarbonStorage.actions"; export type State = | { diff --git a/apps/web/src/features/create-project/application/urban-project/urbanProject.reducer.ts b/apps/web/src/features/create-project/core/urban-project/urbanProject.reducer.ts similarity index 99% rename from apps/web/src/features/create-project/application/urban-project/urbanProject.reducer.ts rename to apps/web/src/features/create-project/core/urban-project/urbanProject.reducer.ts index 2c883d806..22c6560cb 100644 --- a/apps/web/src/features/create-project/application/urban-project/urbanProject.reducer.ts +++ b/apps/web/src/features/create-project/core/urban-project/urbanProject.reducer.ts @@ -20,13 +20,9 @@ import { import { typedObjectKeys } from "@/shared/services/object-keys/objectKeys"; -import { ProjectStakeholder } from "../../domain/project.types"; -import { BuildingsUseCategory } from "../../domain/urbanProject"; import { ProjectCreationState } from "../createProject.reducer"; -import { saveReconversionProject } from "./saveReconversionProject.action"; -import soilsCarbonStorageReducer, { - State as SoilsCarbonStorageState, -} from "./soilsCarbonStorage.reducer"; +import { ProjectStakeholder } from "../project.types"; +import { saveReconversionProject } from "./actions/saveReconversionProject.action"; import { buildingsFloorSurfaceAreaCompleted, buildingsFloorSurfaceAreaReverted, @@ -95,7 +91,11 @@ import { scheduleReverted, expectedSiteResaleRevenueCompleted, expectedSiteResaleRevenueReverted, -} from "./urbanProject.actions"; +} from "./actions/urbanProject.actions"; +import soilsCarbonStorageReducer, { + State as SoilsCarbonStorageState, +} from "./soilsCarbonStorage.reducer"; +import { BuildingsUseCategory } from "./urbanProject"; export type UrbanProjectExpressCreationStep = "EXPRESS_CATEGORY_SELECTION" | "CREATION_RESULT"; export type UrbanProjectCustomCreationStep = diff --git a/apps/web/src/features/create-project/domain/urbanProject.ts b/apps/web/src/features/create-project/core/urban-project/urbanProject.ts similarity index 100% rename from apps/web/src/features/create-project/domain/urbanProject.ts rename to apps/web/src/features/create-project/core/urban-project/urbanProject.ts diff --git a/apps/web/src/features/create-project/domain/urbanProjectSoils.spec.ts b/apps/web/src/features/create-project/core/urban-project/urbanProjectSoils.spec.ts similarity index 100% rename from apps/web/src/features/create-project/domain/urbanProjectSoils.spec.ts rename to apps/web/src/features/create-project/core/urban-project/urbanProjectSoils.spec.ts diff --git a/apps/web/src/features/create-project/domain/urbanProjectSoils.ts b/apps/web/src/features/create-project/core/urban-project/urbanProjectSoils.ts similarity index 100% rename from apps/web/src/features/create-project/domain/urbanProjectSoils.ts rename to apps/web/src/features/create-project/core/urban-project/urbanProjectSoils.ts diff --git a/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceApi.ts b/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceApi.ts index b867d92b7..4d153c65f 100644 --- a/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceApi.ts +++ b/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceApi.ts @@ -1,10 +1,9 @@ -import { objectToQueryParams } from "@/shared/services/object-query-parameters/objectToQueryParameters"; - import { PhotovoltaicPerformanceApiPayload, PhotovoltaicPerformanceApiResult, PhotovoltaicPerformanceGateway, -} from "../../application/renewable-energy/getPhotovoltaicExpectedPerformance.action"; +} from "@/features/create-project/core/renewable-energy/actions/getPhotovoltaicExpectedPerformance.action"; +import { objectToQueryParams } from "@/shared/services/object-query-parameters/objectToQueryParameters"; export class ExpectedPhotovoltaicPerformanceApi implements PhotovoltaicPerformanceGateway { async getExpectedPhotovoltaicPerformance({ diff --git a/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceMock.ts b/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceMock.ts index fd76a69d1..da30786f6 100644 --- a/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceMock.ts +++ b/apps/web/src/features/create-project/infrastructure/photovoltaic-performance-service/photovoltaicPerformanceMock.ts @@ -1,7 +1,7 @@ import { PhotovoltaicPerformanceApiResult, PhotovoltaicPerformanceGateway, -} from "../../application/renewable-energy/getPhotovoltaicExpectedPerformance.action"; +} from "@/features/create-project/core/renewable-energy/actions/getPhotovoltaicExpectedPerformance.action"; export const MOCK_RESULT = { expectedPerformance: { diff --git a/apps/web/src/features/create-project/infrastructure/save-express-project-service/HttpSaveExpressReconversionProjectService.ts b/apps/web/src/features/create-project/infrastructure/save-express-project-service/HttpSaveExpressReconversionProjectService.ts index d3a4230cd..9cb9d0cc4 100644 --- a/apps/web/src/features/create-project/infrastructure/save-express-project-service/HttpSaveExpressReconversionProjectService.ts +++ b/apps/web/src/features/create-project/infrastructure/save-express-project-service/HttpSaveExpressReconversionProjectService.ts @@ -1,4 +1,4 @@ -import { SaveExpressReconversionProjectGateway } from "../../application/urban-project/urbanProject.actions"; +import { SaveExpressReconversionProjectGateway } from "../../core/urban-project/actions/urbanProject.actions"; export type SaveExpressReconversionProjectPayload = { reconversionProjectId: string; diff --git a/apps/web/src/features/create-project/infrastructure/save-express-project-service/InMemorySaveExpressReconversionProjectService.ts b/apps/web/src/features/create-project/infrastructure/save-express-project-service/InMemorySaveExpressReconversionProjectService.ts index 58063b7f4..04ac0795a 100644 --- a/apps/web/src/features/create-project/infrastructure/save-express-project-service/InMemorySaveExpressReconversionProjectService.ts +++ b/apps/web/src/features/create-project/infrastructure/save-express-project-service/InMemorySaveExpressReconversionProjectService.ts @@ -1,4 +1,4 @@ -import { SaveExpressReconversionProjectGateway } from "../../application/urban-project/urbanProject.actions"; +import { SaveExpressReconversionProjectGateway } from "../../core/urban-project/actions/urbanProject.actions"; import { SaveExpressReconversionProjectPayload } from "./HttpSaveExpressReconversionProjectService"; export class InMemorySaveExpressReconversionProjectService diff --git a/apps/web/src/features/create-project/infrastructure/save-project-service/HttpSaveReconversionProjectService.ts b/apps/web/src/features/create-project/infrastructure/save-project-service/HttpSaveReconversionProjectService.ts index 48d075eba..3365f8a81 100644 --- a/apps/web/src/features/create-project/infrastructure/save-project-service/HttpSaveReconversionProjectService.ts +++ b/apps/web/src/features/create-project/infrastructure/save-project-service/HttpSaveReconversionProjectService.ts @@ -1,7 +1,7 @@ import { SaveProjectPayload, SaveReconversionProjectGateway, -} from "../../application/saveReconversionProject.action"; +} from "../../core/saveReconversionProject.action"; export class HttpSaveReconversionProjectService implements SaveReconversionProjectGateway { async save(newReconversionProject: SaveProjectPayload) { diff --git a/apps/web/src/features/create-project/infrastructure/save-project-service/InMemorySaveReconversionProjectService.ts b/apps/web/src/features/create-project/infrastructure/save-project-service/InMemorySaveReconversionProjectService.ts index 5ec626145..b43ee255c 100644 --- a/apps/web/src/features/create-project/infrastructure/save-project-service/InMemorySaveReconversionProjectService.ts +++ b/apps/web/src/features/create-project/infrastructure/save-project-service/InMemorySaveReconversionProjectService.ts @@ -1,7 +1,7 @@ import { SaveProjectPayload, SaveReconversionProjectGateway, -} from "../../application/saveReconversionProject.action"; +} from "../../core/saveReconversionProject.action"; export class InMemorySaveReconversionProjectService implements SaveReconversionProjectGateway { _reconversionProjects: SaveProjectPayload[] = []; diff --git a/apps/web/src/features/create-project/infrastructure/sites-service/HttpSiteService.ts b/apps/web/src/features/create-project/infrastructure/sites-service/HttpSiteService.ts index 86ce616f2..86bb16484 100644 --- a/apps/web/src/features/create-project/infrastructure/sites-service/HttpSiteService.ts +++ b/apps/web/src/features/create-project/infrastructure/sites-service/HttpSiteService.ts @@ -1,5 +1,5 @@ -import { GetSitesByIdGateway } from "../../application/createProject.actions"; -import { ProjectSite } from "../../domain/project.types"; +import { GetSitesByIdGateway } from "../../core/createProject.actions"; +import { ProjectSite } from "../../core/project.types"; export class HttpSitesService implements GetSitesByIdGateway { async getById(siteId: string): Promise { diff --git a/apps/web/src/features/create-project/infrastructure/sites-service/SitesServiceMock.ts b/apps/web/src/features/create-project/infrastructure/sites-service/SitesServiceMock.ts index 5530b6459..1eb9f7ad7 100644 --- a/apps/web/src/features/create-project/infrastructure/sites-service/SitesServiceMock.ts +++ b/apps/web/src/features/create-project/infrastructure/sites-service/SitesServiceMock.ts @@ -1,5 +1,5 @@ -import { GetSitesByIdGateway } from "../../application/createProject.actions"; -import { ProjectSite } from "../../domain/project.types"; +import { GetSitesByIdGateway } from "../../core/createProject.actions"; +import { ProjectSite } from "../../core/project.types"; export class SitesServiceMock implements GetSitesByIdGateway { constructor(private result?: ProjectSite) {} diff --git a/apps/web/src/features/create-project/views/ProjectCreationWizard.tsx b/apps/web/src/features/create-project/views/ProjectCreationWizard.tsx index 60a879320..e00266579 100644 --- a/apps/web/src/features/create-project/views/ProjectCreationWizard.tsx +++ b/apps/web/src/features/create-project/views/ProjectCreationWizard.tsx @@ -5,12 +5,12 @@ import { routes } from "@/app/views/router"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import SidebarLayout from "@/shared/views/layout/SidebarLayout/SidebarLayout"; -import { projectCreationInitiated } from "../application/createProject.actions"; -import { ProjectCreationStep } from "../application/createProject.reducer"; +import { projectCreationInitiated } from "../core/createProject.actions"; +import { ProjectCreationStep } from "../core/createProject.reducer"; import { selectCurrentStep, selectProjectDevelopmentPlanCategory, -} from "../application/createProject.selectors"; +} from "../core/createProject.selectors"; import Stepper from "./Stepper"; import ProjectCreationIntroduction from "./introduction"; import PhotovoltaicPowerStationCreationWizard from "./photovoltaic-power-station"; diff --git a/apps/web/src/features/create-project/views/common-views/costs/reinstatement-costs/index.tsx b/apps/web/src/features/create-project/views/common-views/costs/reinstatement-costs/index.tsx index f0fd8092e..ecbeeeab6 100644 --- a/apps/web/src/features/create-project/views/common-views/costs/reinstatement-costs/index.tsx +++ b/apps/web/src/features/create-project/views/common-views/costs/reinstatement-costs/index.tsx @@ -1,6 +1,6 @@ import { computeProjectReinstatementCosts, ReinstatementExpense, SoilsDistribution } from "shared"; -import { ProjectSite } from "@/features/create-project/domain/project.types"; +import { ProjectSite } from "@/features/create-project/core/project.types"; import ReinstatementExpensesForm, { FormValues } from "./ReinstatementCostsForm"; import { mapFormValuesToReinstatementExpenses, mapInitialValues } from "./mappers"; diff --git a/apps/web/src/features/create-project/views/common-views/result/index.tsx b/apps/web/src/features/create-project/views/common-views/result/index.tsx index a70331bc6..ea0b99889 100644 --- a/apps/web/src/features/create-project/views/common-views/result/index.tsx +++ b/apps/web/src/features/create-project/views/common-views/result/index.tsx @@ -1,7 +1,7 @@ import { selectProjectId, selectSiteData, -} from "@/features/create-project/application/createProject.selectors"; +} from "@/features/create-project/core/createProject.selectors"; import { useAppSelector } from "@/shared/views/hooks/store.hooks"; import ProjectCreationResult from "./ProjectCreationResult"; diff --git a/apps/web/src/features/create-project/views/common-views/schedule/projection/ScheduleProjectionForm.tsx b/apps/web/src/features/create-project/views/common-views/schedule/projection/ScheduleProjectionForm.tsx index bebe96325..6a3857322 100644 --- a/apps/web/src/features/create-project/views/common-views/schedule/projection/ScheduleProjectionForm.tsx +++ b/apps/web/src/features/create-project/views/common-views/schedule/projection/ScheduleProjectionForm.tsx @@ -3,7 +3,7 @@ import { format } from "date-fns"; import { useForm } from "react-hook-form"; import { ProjectSchedule } from "shared"; -import { Schedule } from "@/features/create-project/domain/project.types"; +import { Schedule } from "@/features/create-project/core/project.types"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import RequiredLabel from "@/shared/views/components/form/RequiredLabel/RequiredLabel"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/common-views/schedule/projection/index.tsx b/apps/web/src/features/create-project/views/common-views/schedule/projection/index.tsx index 2bbb6de48..a5569abbc 100644 --- a/apps/web/src/features/create-project/views/common-views/schedule/projection/index.tsx +++ b/apps/web/src/features/create-project/views/common-views/schedule/projection/index.tsx @@ -1,7 +1,7 @@ import { ProjectSchedule } from "shared"; -import { selectIsSiteFriche } from "@/features/create-project/application/createProject.selectors"; -import { Schedule } from "@/features/create-project/domain/project.types"; +import { selectIsSiteFriche } from "@/features/create-project/core/createProject.selectors"; +import { Schedule } from "@/features/create-project/core/project.types"; import { useAppSelector } from "@/shared/views/hooks/store.hooks"; import ScheduleProjectionForm from "./ScheduleProjectionForm"; diff --git a/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/SoilsCarbonStorageComparison.tsx b/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/SoilsCarbonStorageComparison.tsx index 6b6eb6e77..4fcaa6872 100644 --- a/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/SoilsCarbonStorageComparison.tsx +++ b/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/SoilsCarbonStorageComparison.tsx @@ -1,6 +1,6 @@ import { roundToInteger } from "shared"; -import { SoilsCarbonStorageResult } from "@/features/create-project/application/soilsCarbonStorage.action"; +import { SoilsCarbonStorageResult } from "@/features/create-project/core/soilsCarbonStorage.action"; import { formatNumberFr } from "@/shared/services/format-number/formatNumber"; import { getPercentageDifference } from "@/shared/services/percentage/percentage"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; diff --git a/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/index.tsx b/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/index.tsx index 7bf751e91..aae074205 100644 --- a/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/index.tsx +++ b/apps/web/src/features/create-project/views/common-views/soils-carbon-storage-comparison/index.tsx @@ -1,6 +1,6 @@ import { Alert } from "@codegouvfr/react-dsfr/Alert"; -import { SoilsCarbonStorageResult } from "@/features/create-project/application/soilsCarbonStorage.action"; +import { SoilsCarbonStorageResult } from "@/features/create-project/core/soilsCarbonStorage.action"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import LoadingSpinner from "@/shared/views/components/Spinner/LoadingSpinner"; import WizardFormLayout from "@/shared/views/layout/WizardFormLayout/WizardFormLayout"; diff --git a/apps/web/src/features/create-project/views/common-views/stakeholder-form/StakeholderForm.tsx b/apps/web/src/features/create-project/views/common-views/stakeholder-form/StakeholderForm.tsx index 33e775f72..051f884d8 100644 --- a/apps/web/src/features/create-project/views/common-views/stakeholder-form/StakeholderForm.tsx +++ b/apps/web/src/features/create-project/views/common-views/stakeholder-form/StakeholderForm.tsx @@ -4,7 +4,7 @@ import { ReactNode } from "react"; import { useForm } from "react-hook-form"; import { LocalAuthority } from "shared/dist/local-authority"; -import { AvailableProjectStakeholder } from "@/features/create-project/application/stakeholders.selectors"; +import { AvailableProjectStakeholder } from "@/features/create-project/core/stakeholders.selectors"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import Fieldset from "@/shared/views/components/form/Fieldset/Fieldset"; import RadioButton from "@/shared/views/components/form/RadioButton/RadioButton"; diff --git a/apps/web/src/features/create-project/views/common-views/stakeholder-form/index.tsx b/apps/web/src/features/create-project/views/common-views/stakeholder-form/index.tsx index 1d3ee651a..3953ad70b 100644 --- a/apps/web/src/features/create-project/views/common-views/stakeholder-form/index.tsx +++ b/apps/web/src/features/create-project/views/common-views/stakeholder-form/index.tsx @@ -1,15 +1,15 @@ import { ReactNode, useEffect } from "react"; import { LocalAuthority } from "shared"; -import { fetchSiteLocalAuthorities } from "@/features/create-project/application/getSiteLocalAuthorities.action"; -import { - AvailableLocalAuthorityStakeholder, - AvailableProjectStakeholder, -} from "@/features/create-project/application/stakeholders.selectors"; +import { fetchSiteLocalAuthorities } from "@/features/create-project/core/getSiteLocalAuthorities.action"; import { ProjectStakeholder, ProjectStakeholderStructure, -} from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/project.types"; +import { + AvailableLocalAuthorityStakeholder, + AvailableProjectStakeholder, +} from "@/features/create-project/core/stakeholders.selectors"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import StakeholderForm, { FormValues } from "./StakeholderForm"; diff --git a/apps/web/src/features/create-project/views/introduction/index.tsx b/apps/web/src/features/create-project/views/introduction/index.tsx index b0c10fffa..f7196ff41 100644 --- a/apps/web/src/features/create-project/views/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/introduction/index.tsx @@ -2,7 +2,7 @@ import { fr } from "@codegouvfr/react-dsfr"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; -import { introductionStepCompleted } from "../../application/createProject.reducer"; +import { introductionStepCompleted } from "../../core/createProject.reducer"; import CreateProjectIntroductionPage from "./CreateProjetIntroductionPage"; function CreateProjectIntroductionContainer() { diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/PhotovoltaicPowerStationStepper.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/PhotovoltaicPowerStationStepper.tsx index 47eb1bc6e..5d6cf389d 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/PhotovoltaicPowerStationStepper.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/PhotovoltaicPowerStationStepper.tsx @@ -1,7 +1,6 @@ +import { PhotovoltaicProjectCreationStep } from "@/features/create-project/core/renewable-energy/renewableEnergy.reducer"; import FormStepper from "@/shared/views/layout/WizardFormLayout/FormStepper"; -import { PhotovoltaicProjectCreationStep } from "../../application/renewable-energy/renewableEnergy.reducer"; - const stepCategories = [ "Type de projet", "Paramètres du projet", diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/introduction/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/introduction/index.tsx index 0bbf2f4aa..681e85fc5 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/introduction/index.tsx @@ -2,7 +2,7 @@ import { AppDispatch } from "@/app/application/store"; import { completeExpensesIntroductionStep, revertExpensesIntroductionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectExpensesIntroduction from "./ProjectCostsIntroduction"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/photovoltaic-panels-installation-costs/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/photovoltaic-panels-installation-costs/index.tsx index b794d1a14..798d5168e 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/photovoltaic-panels-installation-costs/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/photovoltaic-panels-installation-costs/index.tsx @@ -3,8 +3,8 @@ import { PhotovoltaicInstallationExpense, typedObjectEntries } from "shared"; import { completePhotovoltaicPanelsInstallationExpenses, revertPhotovoltaicPanelsInstallationExpenses, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { getDefaultValuesForPhotovoltaicInstallationExpenses } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { getDefaultValuesForPhotovoltaicInstallationExpenses } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import ExternalLink from "@/shared/views/components/ExternalLink/ExternalLink"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/reinstatement-costs/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/reinstatement-costs/index.tsx index e232974d6..912a99d2d 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/reinstatement-costs/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/reinstatement-costs/index.tsx @@ -1,11 +1,11 @@ import { ReinstatementExpense } from "shared"; -import { selectSiteData } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteData } from "@/features/create-project/core/createProject.selectors"; import { completeReinstatementExpenses, revertReinstatementExpenses, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { selectCreationData } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectCreationData } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ReinstatementsExpensesForm from "../../../common-views/costs/reinstatement-costs"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/site-purchase-amounts/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/site-purchase-amounts/index.tsx index 05602104a..985b47345 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/site-purchase-amounts/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/site-purchase-amounts/index.tsx @@ -2,7 +2,7 @@ import { AppDispatch } from "@/app/application/store"; import { completeSitePurchaseAmounts, revertSitePurchaseAmounts, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import SitePurchaseAmountsForm, { diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/yearly-projected-costs/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/yearly-projected-costs/index.tsx index cb2f27fad..20b0769cd 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/yearly-projected-costs/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/costs/yearly-projected-costs/index.tsx @@ -3,8 +3,8 @@ import { RecurringExpense } from "shared"; import { completeYearlyProjectedExpenses, revertYearlyProjectedExpenses, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { getDefaultValuesForYearlyProjectedExpenses } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { getDefaultValuesForYearlyProjectedExpenses } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import ExternalLink from "@/shared/views/components/ExternalLink/ExternalLink"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/index.tsx index cf8b4e9b2..205775dbf 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/index.tsx @@ -1,8 +1,8 @@ +import { PhotovoltaicProjectCreationStep } from "@/features/create-project/core/renewable-energy/renewableEnergy.reducer"; +import { selectCurrentStep } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import { useAppSelector } from "@/shared/views/hooks/store.hooks"; import SidebarLayout from "@/shared/views/layout/SidebarLayout/SidebarLayout"; -import { PhotovoltaicProjectCreationStep } from "../../application/renewable-energy/renewableEnergy.reducer"; -import { selectCurrentStep } from "../../application/renewable-energy/renewableEnergy.selector"; import RenewableEnergyTypesForm from "../renewable-energy-types"; import { useSyncCreationStepWithRouteQuery } from "../useSyncCreationStepWithRouteQuery"; import PhotovoltaicPowerStationStepper from "./PhotovoltaicPowerStationStepper"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/name-and-description/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/name-and-description/index.tsx index 5e5495780..17ba476fb 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/name-and-description/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/name-and-description/index.tsx @@ -1,8 +1,8 @@ import { completeNaming, revertNaming, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { selectNameAndDescriptionInitialValues } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectNameAndDescriptionInitialValues } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ProjectNameAndDescriptionForm, { diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/ContractDurationForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/ContractDurationForm.tsx index b314348d3..20cbcb1f6 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/ContractDurationForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/ContractDurationForm.tsx @@ -1,6 +1,6 @@ import { useForm } from "react-hook-form"; -import { AVERAGE_PHOTOVOLTAIC_CONTRACT_DURATION_IN_YEARS } from "@/features/create-project/domain/photovoltaic"; +import { AVERAGE_PHOTOVOLTAIC_CONTRACT_DURATION_IN_YEARS } from "@/features/create-project/core/renewable-energy/photovoltaic"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import RowNumericInput from "@/shared/views/components/form/NumericInput/RowNumericInput"; import { requiredNumericFieldRegisterOptions } from "@/shared/views/components/form/NumericInput/registerOptions"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/index.tsx index 6ec177634..be469833c 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/contract-duration/index.tsx @@ -1,9 +1,9 @@ import { completePhotovoltaicContractDuration, revertPhotovoltaicContractDuration, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { selectCreationData } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; -import { AVERAGE_PHOTOVOLTAIC_CONTRACT_DURATION_IN_YEARS } from "@/features/create-project/domain/photovoltaic"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { AVERAGE_PHOTOVOLTAIC_CONTRACT_DURATION_IN_YEARS } from "@/features/create-project/core/renewable-energy/photovoltaic"; +import { selectCreationData } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import PhotovoltaicContractDurationForm from "./ContractDurationForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/expected-annual-production/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/expected-annual-production/index.tsx index dbbe04c64..f3359d8a2 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/expected-annual-production/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/expected-annual-production/index.tsx @@ -1,10 +1,10 @@ import { useEffect } from "react"; -import { fetchPhotovoltaicExpectedAnnulPowerPerformanceForLocation } from "@/features/create-project/application/renewable-energy/getPhotovoltaicExpectedPerformance.action"; +import { fetchPhotovoltaicExpectedAnnulPowerPerformanceForLocation } from "@/features/create-project/core/renewable-energy/actions/getPhotovoltaicExpectedPerformance.action"; import { completePhotovoltaicExpectedAnnualProduction, revertPhotovoltaicExpectedAnnualProduction, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import LoadingSpinner from "@/shared/views/components/Spinner/LoadingSpinner"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/KeyParameterForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/KeyParameterForm.tsx index 73548d23b..0346192d8 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/KeyParameterForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/KeyParameterForm.tsx @@ -1,6 +1,6 @@ import { useForm } from "react-hook-form"; -import { PhotovoltaicKeyParameter } from "@/features/create-project/domain/project.types"; +import { PhotovoltaicKeyParameter } from "@/features/create-project/core/project.types"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import RadioButtons from "@/shared/views/components/RadioButtons/RadioButtons"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/index.tsx index ef69ff6a4..2d792b856 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/key-parameter/index.tsx @@ -1,8 +1,8 @@ -import { selectPhotovoltaicPlantFeaturesKeyParameter } from "@/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors"; import { completePhotovoltaicKeyParameter, revertPhotovoltaicKeyParameter, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectPhotovoltaicPlantFeaturesKeyParameter } from "@/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import PhotovoltaicKeyParameterForm from "./KeyParameterForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerForm.tsx index aff81ab8f..0b87e6ace 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerForm.tsx @@ -1,6 +1,6 @@ import { useForm } from "react-hook-form"; -import { PHOTOVOLTAIC_RATIO_M2_PER_KWC } from "@/features/create-project/domain/photovoltaic"; +import { PHOTOVOLTAIC_RATIO_M2_PER_KWC } from "@/features/create-project/core/renewable-energy/photovoltaic"; import { formatNumberFr, formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import RowNumericInput from "@/shared/views/components/form/NumericInput/RowNumericInput"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerFromSurfaceForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerFromSurfaceForm.tsx index 2f1ae9438..e372c2860 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerFromSurfaceForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/PowerFromSurfaceForm.tsx @@ -1,6 +1,6 @@ import { useForm } from "react-hook-form"; -import { PHOTOVOLTAIC_RATIO_M2_PER_KWC } from "@/features/create-project/domain/photovoltaic"; +import { PHOTOVOLTAIC_RATIO_M2_PER_KWC } from "@/features/create-project/core/renewable-energy/photovoltaic"; import { formatNumberFr, formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import RowNumericInput from "@/shared/views/components/form/NumericInput/RowNumericInput"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/index.tsx index 9a1eede55..d69016e9a 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/power/index.tsx @@ -1,8 +1,8 @@ -import { selectPhotovoltaicPowerViewData } from "@/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors"; import { completePhotovoltaicInstallationElectricalPower, revertPhotovoltaicInstallationElectricalPower, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectPhotovoltaicPowerViewData } from "@/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import PhotovoltaicPowerForm from "./PowerForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/SurfaceFromPowerForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/SurfaceFromPowerForm.tsx index 49f5f2493..31a3d9037 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/SurfaceFromPowerForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/SurfaceFromPowerForm.tsx @@ -1,6 +1,6 @@ import { useForm } from "react-hook-form"; -import { PHOTOVOLTAIC_RATIO_M2_PER_KWC } from "@/features/create-project/domain/photovoltaic"; +import { PHOTOVOLTAIC_RATIO_M2_PER_KWC } from "@/features/create-project/core/renewable-energy/photovoltaic"; import { formatNumberFr, formatSurfaceArea, diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/index.tsx index 172067739..c0826dfe6 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/photovoltaic/surface/index.tsx @@ -1,8 +1,8 @@ -import { selectPhotovoltaicSurfaceViewData } from "@/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors"; import { completePhotovoltaicInstallationSurface, revertPhotovoltaicInstallationSurface, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectPhotovoltaicSurfaceViewData } from "@/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import PhotovoltaicSurfaceForm from "./SurfaceForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/project-phase/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/project-phase/index.tsx index 3878acced..5330c9a9f 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/project-phase/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/project-phase/index.tsx @@ -3,7 +3,7 @@ import { RENEWABLE_ENERGY_PROJECT_PHASE_VALUES } from "shared"; import { completeProjectPhaseStep, revertProjectPhaseStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { getHintTextForRenewableEnergyProjectPhase, getLabelForRenewableEnergyProjectPhase, diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/result/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/result/index.tsx index 4649937b4..db8db0c3b 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/result/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/result/index.tsx @@ -1,6 +1,6 @@ import { useDispatch } from "react-redux"; -import { revertResultStep } from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +import { revertResultStep } from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppSelector } from "@/shared/views/hooks/store.hooks"; import ProjectCreationResult from "../../common-views/result"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/financial-assistance/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/financial-assistance/index.tsx index 3282b1435..b0c49aa14 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/financial-assistance/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/financial-assistance/index.tsx @@ -1,7 +1,7 @@ import { completeFinancialAssistanceRevenues, revertFinancialAssistanceRevenues, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectFinancialAssistanceRevenueForm from "../../../common-views/revenues/financial-assistance"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/introduction/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/introduction/index.tsx index 1dc89896a..7a94f7525 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/introduction/index.tsx @@ -2,7 +2,7 @@ import { AppDispatch } from "@/app/application/store"; import { completeRevenuIntroductionStep, revertRevenuIntroductionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectRevenueIntroduction from "./ProjectRevenueIntroduction"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/yearly-projected-revenue/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/yearly-projected-revenue/index.tsx index 9b217a32d..cbdb709cb 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/yearly-projected-revenue/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/revenue/yearly-projected-revenue/index.tsx @@ -3,8 +3,8 @@ import { RecurringRevenue } from "shared"; import { completeYearlyProjectedRevenue, revertYearlyProjectedRevenue, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { getDefaultValuesForYearlyProjectedRecurringRevenue } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { getDefaultValuesForYearlyProjectedRecurringRevenue } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import YearlyProjectedsRevenueForm from "@/features/create-project/views/common-views/revenues/yearly-projected-revenue"; import ExternalLink from "@/shared/views/components/ExternalLink/ExternalLink"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/introduction/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/introduction/index.tsx index ff40903c1..39eabfe74 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/introduction/index.tsx @@ -1,7 +1,7 @@ import { completeScheduleIntroductionStep, revertScheduleIntroductionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ScheduleIntroduction from "../../../common-views/schedule/introduction/ScheduleIntroduction"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/projection/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/projection/index.tsx index 9567146de..dd6749495 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/projection/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/schedule/projection/index.tsx @@ -1,8 +1,8 @@ import { completeScheduleStep, revertScheduleStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { selectProjectScheduleInitialValues } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectProjectScheduleInitialValues } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ScheduleProjectionForm from "../../../common-views/schedule/projection"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/introduction/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/introduction/index.tsx index d2adcfe08..e1dca9bcb 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/introduction/index.tsx @@ -1,8 +1,8 @@ -import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/core/createProject.selectors"; import { completeSoilsDecontaminationIntroduction, revertSoilsDecontaminationIntroductionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import SoilsDecontaminationIntroduction from "../../../common-views/soils-decontamination/introduction/SoilsDecontaminationIntroduction"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/selection/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/selection/index.tsx index e280f76fe..f16c80916 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/selection/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/selection/index.tsx @@ -1,7 +1,7 @@ import { completeSoilsDecontaminationSelection, revertSoilsDecontaminationSelectionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import SoilsDecontaminationSelection, { diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/surface-area/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/surface-area/index.tsx index 398ee88d0..c07f34b66 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/surface-area/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils-decontamination/surface-area/index.tsx @@ -1,8 +1,8 @@ -import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/core/createProject.selectors"; import { completeSoilsDecontaminationSurfaceArea, revertSoilsDecontaminationSurfaceAreaStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import SoilsDecontaminationSurfaceArea from "../../../common-views/soils-decontamination/surface-area/SoilsDecontaminationSurfaceArea"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-carbon-storage/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-carbon-storage/index.tsx index 4d432cc62..1115202cd 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-carbon-storage/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-carbon-storage/index.tsx @@ -3,8 +3,8 @@ import { useEffect } from "react"; import { completeSoilsCarbonStorageStep, revertSoilsCarbonStorageStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { fetchCurrentAndProjectedSoilsCarbonStorage } from "@/features/create-project/application/renewable-energy/soilsCarbonStorage.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { fetchCurrentAndProjectedSoilsCarbonStorage } from "@/features/create-project/core/renewable-energy/actions/soilsCarbonStorage.actions"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import SoilsCarbonStorageComparison from "../../../common-views/soils-carbon-storage-comparison"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-summary/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-summary/index.tsx index 2b295dbaa..607118d15 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-summary/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-summary/index.tsx @@ -1,7 +1,7 @@ import { completeSoilsSummaryStep, revertSoilsSummaryStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ProjectSoilsSummary from "./ProjectSoilsSummary"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/climate-and-biodiversity-impact-notice/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/climate-and-biodiversity-impact-notice/index.tsx index 781aea0a1..599c27846 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/climate-and-biodiversity-impact-notice/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/climate-and-biodiversity-impact-notice/index.tsx @@ -1,12 +1,12 @@ import { completeSoilsTransformationClimateAndBiodiversityImpactNoticeStep, revertBiodiversityAndClimateImpactNoticeStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { selectBiodiversityAndClimateSensibleSoilsSurfaceAreaDestroyed, selectFutureBiodiversityAndClimateSensibleSoilsSurfaceArea, selectWillSoilsTransformationHaveNegativeImpactOnBiodiversityAndClimate, -} from "@/features/create-project/application/renewable-energy/soilsTransformation.selectors"; +} from "@/features/create-project/core/renewable-energy/soilsTransformation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ClimateAndBiodiversityImpactNotice from "./ClimateAndBiodiversityImpactNotice"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-selection/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-selection/index.tsx index 17d59ec36..6f13c79e5 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-selection/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-selection/index.tsx @@ -1,11 +1,11 @@ import { completeCustomSoilsSelectionStep, revertCustomSoilsSelectionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { selectBaseSoilsDistributionForTransformation, selectTransformableSoils, -} from "@/features/create-project/application/renewable-energy/soilsTransformation.selectors"; +} from "@/features/create-project/core/renewable-energy/soilsTransformation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FutureSoilsSelectionForm, { FormValues } from "./FutureSoilsSelectionForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/FutureSoilsSurfaceAreaForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/FutureSoilsSurfaceAreaForm.tsx index 5cf560334..94faf046d 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/FutureSoilsSurfaceAreaForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/FutureSoilsSurfaceAreaForm.tsx @@ -1,7 +1,7 @@ import { useForm } from "react-hook-form"; import { createSoilSurfaceAreaDistribution, SoilsDistribution, SoilType } from "shared"; -import { getSuitableSurfaceAreaForPhotovoltaicPanels } from "@/features/create-project/domain/soilsTransformation"; +import { getSuitableSurfaceAreaForPhotovoltaicPanels } from "@/features/create-project/core/renewable-energy/soilsTransformation"; import { formatSurfaceArea, SQUARE_METERS_HTML_SYMBOL, diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/index.tsx index 42c062415..303c1de45 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/future-soils-surface-area/index.tsx @@ -1,13 +1,13 @@ -import { selectSiteSurfaceArea } from "@/features/create-project/application/createProject.selectors"; -import { selectPhotovoltaicPanelsSurfaceArea } from "@/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors"; +import { selectSiteSurfaceArea } from "@/features/create-project/core/createProject.selectors"; import { completeCustomSoilsSurfaceAreaAllocationStep, revertCustomSoilsSurfaceAreaAllocationStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectPhotovoltaicPanelsSurfaceArea } from "@/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors"; import { selectBaseSoilsDistributionForTransformation, selectFutureSoils, -} from "@/features/create-project/application/renewable-energy/soilsTransformation.selectors"; +} from "@/features/create-project/core/renewable-energy/soilsTransformation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FutureSoilsSurfaceAreaForm, { FormValues } from "./FutureSoilsSurfaceAreaForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/introduction/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/introduction/index.tsx index 0f395a5c0..e9e4a1ef1 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/introduction/index.tsx @@ -1,7 +1,7 @@ import { completeSoilsTransformationIntroductionStep, revertSoilsTransformationIntroductionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import SoilsTransformationIntroduction from "./SoilsTransformationIntroduction"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-notice/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-notice/index.tsx index a8592cd49..c504a614f 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-notice/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-notice/index.tsx @@ -1,9 +1,9 @@ -import { selectPhotovoltaicPanelsSurfaceArea } from "@/features/create-project/application/renewable-energy/photovoltaicPowerStation.selectors"; import { completeNonSuitableSoilsNoticeStep, revertNonSuitableSoilsNoticeStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { selectSuitableSurfaceAreaForPhotovoltaicPanels } from "@/features/create-project/application/renewable-energy/soilsTransformation.selectors"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectPhotovoltaicPanelsSurfaceArea } from "@/features/create-project/core/renewable-energy/selectors/photovoltaicPowerStation.selectors"; +import { selectSuitableSurfaceAreaForPhotovoltaicPanels } from "@/features/create-project/core/renewable-energy/soilsTransformation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import NonSuitableSoilsNotice from "./NonSuitableSoilsNotice"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-selection/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-selection/index.tsx index ad8c7a719..7a46ac34c 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-selection/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-selection/index.tsx @@ -1,11 +1,11 @@ import { completeNonSuitableSoilsSelectionStep, revertNonSuitableSoilsSelectionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { selectMissingSuitableSurfaceAreaForPhotovoltaicPanels, selectNonSuitableSoilsForPhototovoltaicPanels, -} from "@/features/create-project/application/renewable-energy/soilsTransformation.selectors"; +} from "@/features/create-project/core/renewable-energy/soilsTransformation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import NonSuitableSoilsSelection, { FormValues } from "./NonSuitableSoilsSelection"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-surface-to-transform/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-surface-to-transform/index.tsx index ed106cdd4..18f50242e 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-surface-to-transform/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/non-suitable-soils-surface-to-transform/index.tsx @@ -1,11 +1,11 @@ import { completeNonSuitableSoilsSurfaceStep, revertNonSuitableSoilsSurfaceStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { selectMissingSuitableSurfaceAreaForPhotovoltaicPanels, selectNonSuitableSoilsForPhototovoltaicPanelsToTransform, -} from "@/features/create-project/application/renewable-energy/soilsTransformation.selectors"; +} from "@/features/create-project/core/renewable-energy/soilsTransformation.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import NonSuitableSoilsSurfaceForm, { FormValues } from "./NonSuitableSoilsSurfaceToTransformForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/SoilsTransformationProjectForm.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/SoilsTransformationProjectForm.tsx index 6597f4e4f..bcee51fe0 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/SoilsTransformationProjectForm.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/SoilsTransformationProjectForm.tsx @@ -1,6 +1,6 @@ import { Controller, useForm } from "react-hook-form"; -import { SoilsTransformationProject } from "@/features/create-project/domain/soilsTransformation"; +import { SoilsTransformationProject } from "@/features/create-project/core/renewable-energy/soilsTransformation"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import Badge from "@/shared/views/components/Badge/Badge"; import HorizontalCheckableTile from "@/shared/views/components/CheckableTile/HorizontalCheckableTile"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/index.tsx index df9c3fe42..b338338df 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/soils/soils-transformation/transformation-project-selection/index.tsx @@ -1,7 +1,7 @@ import { completeSoilsTransformationProjectSelectionStep, revertSoilsTransformationProjectSelectionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import SoilsTransformationProjectForm, { FormValues } from "./SoilsTransformationProjectForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/developer/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/developer/index.tsx index d7170d42d..5df58d2eb 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/developer/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/developer/index.tsx @@ -1,12 +1,12 @@ +import { ProjectStakeholderStructure } from "@/features/create-project/core/project.types"; import { completeProjectDeveloper, revertProjectDeveloper, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { getRenewableEnergyProjectAvailableLocalAuthoritiesStakeholders, getRenewableEnergyProjectAvailableStakeholders, -} from "@/features/create-project/application/renewable-energy/stakeholders.selectors"; -import { ProjectStakeholderStructure } from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/renewable-energy/selectors/stakeholders.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/future-site-owner/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/future-site-owner/index.tsx index dc4255382..a87a7af7a 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/future-site-owner/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/future-site-owner/index.tsx @@ -1,12 +1,12 @@ +import { ProjectStakeholderStructure } from "@/features/create-project/core/project.types"; import { completeFutureSiteOwner, revertFutureSiteOwner, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { getRenewableEnergyProjectAvailableLocalAuthoritiesStakeholders, getRenewableEnergyProjectAvailableStakeholders, -} from "@/features/create-project/application/renewable-energy/stakeholders.selectors"; -import { ProjectStakeholderStructure } from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/renewable-energy/selectors/stakeholders.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import StakeholderForm from "../../../common-views/stakeholder-form"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/introduction/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/introduction/index.tsx index 55ad899cf..e449efbf0 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/introduction/index.tsx @@ -1,7 +1,7 @@ import { completeStakeholdersIntroductionStep, revertStakeholdersIntroductionStep, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectStakeholdersIntroduction from "../../../common-views/stakeholder-introduction/StakeholdersIntroduction"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/operator/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/operator/index.tsx index 2bbc24e61..526e70ba3 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/operator/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/operator/index.tsx @@ -1,12 +1,12 @@ +import { ProjectStakeholderStructure } from "@/features/create-project/core/project.types"; import { completeFutureOperator, revertFutureOperator, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { getRenewableEnergyProjectAvailableLocalAuthoritiesStakeholders, getRenewableEnergyProjectAvailableStakeholders, -} from "@/features/create-project/application/renewable-energy/stakeholders.selectors"; -import { ProjectStakeholderStructure } from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/renewable-energy/selectors/stakeholders.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import StakeholderForm from "../../../common-views/stakeholder-form"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/reinstatement-contract-owner/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/reinstatement-contract-owner/index.tsx index c642c4c50..4d16fd419 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/reinstatement-contract-owner/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/reinstatement-contract-owner/index.tsx @@ -1,12 +1,12 @@ +import { ProjectStakeholderStructure } from "@/features/create-project/core/project.types"; import { completeReinstatementContractOwner, revertReinstatementContractOwner, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { getRenewableEnergyProjectAvailableLocalAuthoritiesStakeholders, getRenewableEnergyProjectAvailableStakeholders, -} from "@/features/create-project/application/renewable-energy/stakeholders.selectors"; -import { ProjectStakeholderStructure } from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/renewable-energy/selectors/stakeholders.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/site-purchased/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/site-purchased/index.tsx index 00b7614ed..4495755f7 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/site-purchased/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/stakeholders/site-purchased/index.tsx @@ -1,7 +1,7 @@ import { completeSitePurchase, revertWillSiteBePurchased, -} from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import SitePurchasedForm, { FormValues } from "./SitePurchasedForm"; diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/ProjectCreationDataSummary.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/ProjectCreationDataSummary.tsx index 7ed11eaef..6014ddacb 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/ProjectCreationDataSummary.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/ProjectCreationDataSummary.tsx @@ -10,8 +10,8 @@ import { sumListWithKey, } from "shared"; -import { SoilsCarbonStorageResult } from "@/features/create-project/application/soilsCarbonStorage.action"; -import { Schedule } from "@/features/create-project/domain/project.types"; +import { Schedule } from "@/features/create-project/core/project.types"; +import { SoilsCarbonStorageResult } from "@/features/create-project/core/soilsCarbonStorage.action"; import { getLabelForFinancialAssistanceRevenueSource, getLabelForPhotovoltaicInstallationExpensePurpose, diff --git a/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/index.tsx b/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/index.tsx index 2949aac6a..6f5ffc8b8 100644 --- a/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/index.tsx +++ b/apps/web/src/features/create-project/views/photovoltaic-power-station/summary/index.tsx @@ -1,8 +1,8 @@ -import { revertFinalSummaryStep } from "@/features/create-project/application/renewable-energy/renewableEnergy.actions"; -import { selectCreationData } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +import { revertFinalSummaryStep } from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { saveReconversionProject } from "@/features/create-project/core/renewable-energy/actions/saveReconversionProject.action"; +import { selectCreationData } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; -import { saveReconversionProject } from "../../../application/renewable-energy/saveReconversionProject.action"; import ProjectionCreationDataSummary from "./ProjectCreationDataSummary"; function ProjectionCreationDataSummaryContainer() { diff --git a/apps/web/src/features/create-project/views/project-types/index.tsx b/apps/web/src/features/create-project/views/project-types/index.tsx index 2a08c4866..dd99a0958 100644 --- a/apps/web/src/features/create-project/views/project-types/index.tsx +++ b/apps/web/src/features/create-project/views/project-types/index.tsx @@ -1,7 +1,7 @@ import { DevelopmentPlanCategory } from "shared"; import { BENEFRICHES_ENV } from "@/app/application/envVars"; -import { completeDevelopmentPlanCategories } from "@/features/create-project/application/createProject.reducer"; +import { completeDevelopmentPlanCategories } from "@/features/create-project/core/createProject.reducer"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectTypeForm from "./ProjectTypesForm"; diff --git a/apps/web/src/features/create-project/views/renewable-energy-types/index.tsx b/apps/web/src/features/create-project/views/renewable-energy-types/index.tsx index a904e3f91..a99c7b694 100644 --- a/apps/web/src/features/create-project/views/renewable-energy-types/index.tsx +++ b/apps/web/src/features/create-project/views/renewable-energy-types/index.tsx @@ -1,10 +1,10 @@ -import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; - import { completeRenewableEnergyType, revertRenewableEnergyType, -} from "../../application/renewable-energy/renewableEnergy.actions"; -import { selectRenewableEnergyType } from "../../application/renewable-energy/renewableEnergy.selector"; +} from "@/features/create-project/core/renewable-energy/actions/renewableEnergy.actions"; +import { selectRenewableEnergyType } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; +import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; + import RenewableEnergyTypeForm from "./RenewableEnergyTypeForm"; function ProjectRenewableEnergyTypesFormContainer() { diff --git a/apps/web/src/features/create-project/views/urban-project/Stepper.tsx b/apps/web/src/features/create-project/views/urban-project/Stepper.tsx index bd9f88bf2..d23dc7c52 100644 --- a/apps/web/src/features/create-project/views/urban-project/Stepper.tsx +++ b/apps/web/src/features/create-project/views/urban-project/Stepper.tsx @@ -1,6 +1,6 @@ import FormStepper from "@/shared/views/layout/WizardFormLayout/FormStepper"; -import { UrbanProjectCreationStep } from "../../application/urban-project/urbanProject.reducer"; +import { UrbanProjectCreationStep } from "../../core/urban-project/urbanProject.reducer"; const stepCategories = ["Type de projet", "Mode de création"] as const; diff --git a/apps/web/src/features/create-project/views/urban-project/UrbanProjectCreationWizard.tsx b/apps/web/src/features/create-project/views/urban-project/UrbanProjectCreationWizard.tsx index 135d8a2f0..69d6f7aad 100644 --- a/apps/web/src/features/create-project/views/urban-project/UrbanProjectCreationWizard.tsx +++ b/apps/web/src/features/create-project/views/urban-project/UrbanProjectCreationWizard.tsx @@ -1,15 +1,15 @@ -import { useAppSelector } from "@/shared/views/hooks/store.hooks"; -import SidebarLayout from "@/shared/views/layout/SidebarLayout/SidebarLayout"; - +import { + selectCreateMode, + selectCurrentStep, +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { UrbanProjectCreationStep, UrbanProjectCustomCreationStep, UrbanProjectExpressCreationStep, -} from "../../application/urban-project/urbanProject.reducer"; -import { - selectCreateMode, - selectCurrentStep, -} from "../../application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/urbanProject.reducer"; +import { useAppSelector } from "@/shared/views/hooks/store.hooks"; +import SidebarLayout from "@/shared/views/layout/SidebarLayout/SidebarLayout"; + import { useSyncCreationStepWithRouteQuery } from "../useSyncCreationStepWithRouteQuery"; import UrbanProjectCreationStepper from "./Stepper"; import CreateModeSelectionForm from "./create-mode-selection"; diff --git a/apps/web/src/features/create-project/views/urban-project/create-mode-selection/index.tsx b/apps/web/src/features/create-project/views/urban-project/create-mode-selection/index.tsx index 799479141..7aa9c616a 100644 --- a/apps/web/src/features/create-project/views/urban-project/create-mode-selection/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/create-mode-selection/index.tsx @@ -2,7 +2,7 @@ import { createModeStepReverted, customCreateModeSelected, expressCreateModeSelected, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import CreateModeSelectionForm, { FormValues } from "./CreateModeSelectionForm"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/UrbanProjectCustomSteps.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/UrbanProjectCustomSteps.tsx index 74d6b3d92..36505af7c 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/UrbanProjectCustomSteps.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/UrbanProjectCustomSteps.tsx @@ -1,7 +1,7 @@ import { hasBuildings, UrbanProjectCustomCreationStep, -} from "@/features/create-project/application/urban-project/urbanProject.reducer"; +} from "@/features/create-project/core/urban-project/urbanProject.reducer"; import { useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormStepper from "@/shared/views/layout/WizardFormLayout/FormStepper"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/EconomicActivitySurfaceArea.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/EconomicActivitySurfaceArea.tsx index 57d5f1a1c..36cb16166 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/EconomicActivitySurfaceArea.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/EconomicActivitySurfaceArea.tsx @@ -7,7 +7,7 @@ import { import { getDescriptionForBuildingFloorArea, getPictogramUrlForEconomicActivityUses, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import { getLabelForBuildingFloorArea } from "@/shared/domain/urbanProject"; import { formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import SurfaceAreaDistributionForm from "@/shared/views/components/form/SurfaceAreaDistributionForm/SurfaceAreaDistributionForm"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/index.tsx index 7fa1ca224..3eaa2d2fa 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/economic-activity-surface-area/index.tsx @@ -1,11 +1,11 @@ import { buildingsEconomicActivitySurfaceAreasCompleted, buildingsEconomicActivitySurfaceAreasReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectBuildingsEconomicActivitySurfaceDistributionWithUnit, selectBuildingsEconomicActivityUses, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import EconomicActivitiesSurfaceArea, { type FormValues } from "./EconomicActivitySurfaceArea"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/floor-surface-area/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/floor-surface-area/index.tsx index 6ede48eed..68d57a502 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/floor-surface-area/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/floor-surface-area/index.tsx @@ -1,11 +1,11 @@ import { buildingsFloorSurfaceAreaCompleted, buildingsFloorSurfaceAreaReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectBuildingsFloorSurfaceArea, selectBuildingsFootprintSurfaceArea, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import BuildingsFloorSurfaceArea from "./BuildingsFloorSurfaceArea"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/introduction/index.tsx index 4b11883ce..449b66e36 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/introduction/index.tsx @@ -1,8 +1,8 @@ import { buildingsIntroductionCompleted, buildingsIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectBuildingsFootprintSurfaceArea } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectBuildingsFootprintSurfaceArea } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import BuildingsIntroduction from "./BuildingsIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-introduction/index.tsx index d2be13383..c947af035 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-introduction/index.tsx @@ -1,7 +1,7 @@ import { buildingsUseIntroductionCompleted, buildingsUseIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import BuildingsUseIntroduction from "./BuildingsUseIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/BuildingsUseSurfaceAreas.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/BuildingsUseSurfaceAreas.tsx index f55733359..9feb34297 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/BuildingsUseSurfaceAreas.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/BuildingsUseSurfaceAreas.tsx @@ -6,7 +6,7 @@ import { getDescriptionForBuildingsUseCategory, getLabelForBuildingsUseCategory, getPictogramUrlForBuildingsUseCategory, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import { formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import SurfaceAreaDistributionForm from "@/shared/views/components/form/SurfaceAreaDistributionForm/SurfaceAreaDistributionForm"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/index.tsx index 057ab41a9..8d94a00ec 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/buildings/use-surface-areas/index.tsx @@ -3,12 +3,12 @@ import { SurfaceAreaDistributionJson } from "shared"; import { buildingsUseCategorySurfaceAreasCompleted, buildingsUseCategorySurfaceAreasReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectBuildingsFloorSurfaceArea, selectBuildingsFloorUseSurfaceAreas, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; -import { BuildingsUseCategory } from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; +import { BuildingsUseCategory } from "@/features/create-project/core/urban-project/urbanProject"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import BuildingsUseSurfaceAreas from "./BuildingsUseSurfaceAreas"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/installation-costs/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/installation-costs/index.tsx index 77547a2f0..d590aa674 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/installation-costs/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/installation-costs/index.tsx @@ -1,11 +1,11 @@ import { installationExpensesCompleted, installationExpensesReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectDefaultInstallationCosts, selectInstallationCosts, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import InstallationExpensesForm, { FormValues, } from "@/features/create-project/views/common-views/costs/installation-costs/InstallationCostsForm"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/introduction/index.tsx index 06df436e2..4db4140a1 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/introduction/index.tsx @@ -1,7 +1,7 @@ import { expensesIntroductionCompleted, expensesIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectExpensesIntroduction from "./ProjectCostsIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/reinstatement-costs/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/reinstatement-costs/index.tsx index 1f2f8edfd..20264f088 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/reinstatement-costs/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/reinstatement-costs/index.tsx @@ -1,12 +1,12 @@ import { ReinstatementExpense } from "shared"; -import { selectSiteSoilsDistribution } from "@/features/create-project/application/createProject.selectors"; -import { selectProjectSoilsDistribution } from "@/features/create-project/application/renewable-energy/renewableEnergy.selector"; +import { selectSiteSoilsDistribution } from "@/features/create-project/core/createProject.selectors"; +import { selectProjectSoilsDistribution } from "@/features/create-project/core/renewable-energy/selectors/renewableEnergy.selector"; import { reinstatementExpensesCompleted, reinstatementExpensesReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectCreationData } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectCreationData } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import ReinstatementsExpensesForm from "@/features/create-project/views/common-views/costs/reinstatement-costs"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/site-purchase-amounts/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/site-purchase-amounts/index.tsx index d77071f79..919893bf7 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/site-purchase-amounts/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/site-purchase-amounts/index.tsx @@ -1,8 +1,8 @@ import { sitePurchaseCompleted, sitePurchaseReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectSitePurchaseAmounts } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectSitePurchaseAmounts } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import SitePurchaseAmountsForm, { FormValues, } from "@/features/create-project/views/common-views/costs/site-purchase-amounts/SitePurchaseAmountsForm"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/yearly-projected-costs/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/yearly-projected-costs/index.tsx index 94942a82f..578b30c53 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/yearly-projected-costs/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/costs/yearly-projected-costs/index.tsx @@ -3,7 +3,7 @@ import { RecurringExpense } from "shared"; import { yearlyProjectedExpensesCompleted, yearlyProjectedExpensesReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import YearlyProjectedExpensesForm from "@/features/create-project/views/common-views/costs/yearly-projected-costs"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/creation-result/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/creation-result/index.tsx index 471d12e2e..89e410782 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/creation-result/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/creation-result/index.tsx @@ -1,10 +1,10 @@ import { useDispatch } from "react-redux"; -import { finalSummaryReverted } from "@/features/create-project/application/urban-project/urbanProject.actions"; +import { finalSummaryReverted } from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectProjectName, selectSaveState, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppSelector } from "@/shared/views/hooks/store.hooks"; import ProjectCreationResult from "../../../common-views/result"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/index.tsx index 48a94afeb..1c27e2a06 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/index.tsx @@ -1,6 +1,6 @@ import { ReactNode } from "react"; -import { UrbanProjectCustomCreationStep } from "@/features/create-project/application/urban-project/urbanProject.reducer"; +import { UrbanProjectCustomCreationStep } from "@/features/create-project/core/urban-project/urbanProject.reducer"; import SidebarLayout from "@/shared/views/layout/SidebarLayout/SidebarLayout"; import UrbanProjectCustomSteps from "./UrbanProjectCustomSteps"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/name-and-description/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/name-and-description/index.tsx index 30f3e9443..ee510d2c9 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/name-and-description/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/name-and-description/index.tsx @@ -1,8 +1,8 @@ import { namingCompleted, namingReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectNameAndDescriptionInitialValues } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectNameAndDescriptionInitialValues } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import ProjectNameAndDescriptionForm from "@/features/create-project/views/common-views/name-and-description/ProjectNameAndDescriptionForm"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/project-phase/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/project-phase/index.tsx index 1de21ee5d..c8fa13cdd 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/project-phase/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/project-phase/index.tsx @@ -3,8 +3,8 @@ import { URBAN_PROJECT_PHASE_VALUES } from "shared"; import { projectPhaseCompleted, projectPhaseReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectProjectPhase } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectProjectPhase } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { getHintTextForUrbanProjectPhase, getLabelForUrbanProjectPhase, diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/expected-resale/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/expected-resale/index.tsx index 7dbf9fed1..b57319014 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/expected-resale/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/expected-resale/index.tsx @@ -1,8 +1,8 @@ import { expectedSiteResaleRevenueCompleted, expectedSiteResaleRevenueReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectSiteResaleAmounts } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectSiteResaleAmounts } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ExpectedSiteResaleForm from "./ExpectedSiteResaleForm"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/financial-assistance/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/financial-assistance/index.tsx index 7758d9f0f..9c398b15c 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/financial-assistance/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/financial-assistance/index.tsx @@ -1,8 +1,8 @@ import { financialAssistanceRevenuesCompleted, financialAssistanceRevenuesReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectFinancialAssistanceRevenues } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectFinancialAssistanceRevenues } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import ProjectFinancialAssistanceRevenueForm from "@/features/create-project/views/common-views/revenues/financial-assistance"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/introduction/index.tsx index 509a25c60..eabc98602 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/introduction/index.tsx @@ -1,7 +1,7 @@ import { revenueIntroductionCompleted, revenueIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import ProjectRevenueIntroduction from "./ProjectRevenueIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/yearly-projected-revenue/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/yearly-projected-revenue/index.tsx index 24fd9289f..b8b3ff24a 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/yearly-projected-revenue/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/revenues/yearly-projected-revenue/index.tsx @@ -3,7 +3,7 @@ import { RecurringRevenue } from "shared"; import { yearlyProjectedRevenueCompleted, yearlyProjectedRevenueReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import YearlyProjectedsRevenueForm from "@/features/create-project/views/common-views/revenues/yearly-projected-revenue"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/introduction/index.tsx index 480205d6c..541ea3b0a 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/introduction/index.tsx @@ -1,7 +1,7 @@ import { scheduleIntroductionCompleted, scheduleIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import ScheduleIntroduction from "@/features/create-project/views/common-views/schedule/introduction/ScheduleIntroduction"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/projection/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/projection/index.tsx index b9a496f34..ef49c3a63 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/projection/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/schedule/projection/index.tsx @@ -1,8 +1,8 @@ import { scheduleCompleted, scheduleReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectProjectScheduleInitialValues } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectProjectScheduleInitialValues } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import ScheduleProjectionForm from "@/features/create-project/views/common-views/schedule/projection"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/intro/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/intro/index.tsx index 56029ad59..f75c9f982 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/intro/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/intro/index.tsx @@ -1,8 +1,8 @@ -import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/core/createProject.selectors"; import { soilsDecontaminationIntroductionCompleted, soilsDecontaminationIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import SoilsDecontaminationIntroduction from "@/features/create-project/views/common-views/soils-decontamination/introduction/SoilsDecontaminationIntroduction"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/selection/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/selection/index.tsx index 3ff4bb529..64e93a89b 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/selection/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/selection/index.tsx @@ -1,7 +1,7 @@ import { soilsDecontaminationSelectionCompleted, soilsDecontaminationSelectionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import SoilsDecontaminationSelection, { FormValues, } from "@/features/create-project/views/common-views/soils-decontamination/selection/SoilsDecontaminationSelection"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/surface-area/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/surface-area/index.tsx index ba2599989..b8a6243bd 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/surface-area/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/soils-decontamination/surface-area/index.tsx @@ -1,9 +1,9 @@ -import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteContaminatedSurfaceArea } from "@/features/create-project/core/createProject.selectors"; import { soilsDecontaminationSurfaceAreaCompleted, soilsDecontaminationSurfaceAreaReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectContaminatedSurfaceAreaPercentageToDecontaminate } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectContaminatedSurfaceAreaPercentageToDecontaminate } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import SoilsDecontaminationSurfaceArea from "@/features/create-project/views/common-views/soils-decontamination/surface-area/SoilsDecontaminationSurfaceArea"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/development-plan-introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/development-plan-introduction/index.tsx index 2223315b0..5b47908a9 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/development-plan-introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/development-plan-introduction/index.tsx @@ -1,7 +1,7 @@ import { spacesDevelopmentPlanIntroductionCompleted, spacesDevelopmentPlanIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import UrbanSpacesDevelopmentPlanIntroduction from "./UrbanSpacesDevelopmentPlanIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/introduction/index.tsx index 4ea8faf72..4d65b010f 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/introduction/index.tsx @@ -1,8 +1,8 @@ import { greenSpacesIntroductionCompleted, greenSpacesIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectSpaceCategorySurfaceArea } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectSpaceCategorySurfaceArea } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import UrbanGreenSpacesIntroduction from "./UrbanGreenSpacesIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/UrbanGreenSpacesDistribution.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/UrbanGreenSpacesDistribution.tsx index c003390ed..c9dab5329 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/UrbanGreenSpacesDistribution.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/UrbanGreenSpacesDistribution.tsx @@ -5,7 +5,7 @@ import { getDescriptionForUrbanGreenSpace, getLabelForUrbanGreenSpace, getPictogramUrlForUrbanGreenSpace, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import { formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import SurfaceAreaDistributionForm from "@/shared/views/components/form/SurfaceAreaDistributionForm/SurfaceAreaDistributionForm"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/index.tsx index d693a2e7e..a6baa6524 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/green-spaces/surface-area-distribution/index.tsx @@ -1,11 +1,11 @@ import { greenSpacesDistributionCompleted, greenSpacesDistributionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectGreenSpacesDistribution, selectSpaceCategorySurfaceArea, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import UrbanGreenSpacesDistribution, { FormValues } from "./UrbanGreenSpacesDistribution"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/introduction/index.tsx index c17e3f993..8b0b173ac 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/introduction/index.tsx @@ -1,7 +1,7 @@ import { spacesIntroductionCompleted, spacesIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import UrbanProjectSpacesIntroduction from "./SpacesIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/introduction/index.tsx index 0e8dbde5e..dbfdcd767 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/introduction/index.tsx @@ -1,8 +1,8 @@ import { livingAndActivitySpacesIntroductionCompleted, livingAndActivitySpacesIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectSpaceCategorySurfaceArea } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectSpaceCategorySurfaceArea } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import LivingAndActivitySpacesIntroduction from "./LivingAndActivitySpacesIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/LivingAndActivitySpacesDistribution.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/LivingAndActivitySpacesDistribution.tsx index 5e5de7643..36322fcbf 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/LivingAndActivitySpacesDistribution.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/LivingAndActivitySpacesDistribution.tsx @@ -8,7 +8,7 @@ import { getColorForUrbanLivingAndActivitySpace, getLabelForLivingAndActivitySpace, getPictogramUrlForUrbanLivingAndActivitySpace, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import { formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import SurfaceAreaDistributionForm from "@/shared/views/components/form/SurfaceAreaDistributionForm/SurfaceAreaDistributionForm"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/index.tsx index cb3934241..4f5f633ac 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/living-and-activity-spaces/surface-area-distribution/index.tsx @@ -1,11 +1,11 @@ import { livingAndActivitySpacesDistributionCompleted, livingAndActivitySpacesDistributionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectLivingAndActivitySpacessDistribution, selectSpaceCategorySurfaceArea, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import LivingAndActivitySpacesDistribution, { diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/introduction/index.tsx index afb8a31b1..7879a8a38 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/introduction/index.tsx @@ -1,8 +1,8 @@ import { publicSpacesIntroductionCompleted, publicSpacesIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectSpaceCategorySurfaceArea } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectSpaceCategorySurfaceArea } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import PublicSpacesIntroduction from "./PublicSpacesIntroduction"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/PublicSpacesDistribution.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/PublicSpacesDistribution.tsx index d3cbc365f..ac60b4e38 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/PublicSpacesDistribution.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/PublicSpacesDistribution.tsx @@ -5,7 +5,7 @@ import { getDescriptionForPublicSpace, getLabelForPublicSpace, getPictogramUrlForUrbanPublicSpace, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import { formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import SurfaceAreaDistributionForm from "@/shared/views/components/form/SurfaceAreaDistributionForm/SurfaceAreaDistributionForm"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/index.tsx index f1c42fd75..6707d9b29 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/public-spaces/surface-area-distribution/index.tsx @@ -1,11 +1,11 @@ import { publicSpacesDistributionCompleted, publicSpacesDistributionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectPublicSpacesDistribution, selectSpaceCategorySurfaceArea, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import PublicSpacesDistribution, { FormValues } from "./PublicSpacesDistribution"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/SpacesCategoriesSelection.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/SpacesCategoriesSelection.tsx index 54341f368..bfe6a1509 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/SpacesCategoriesSelection.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/SpacesCategoriesSelection.tsx @@ -5,7 +5,7 @@ import { getDescriptionForUrbanSpaceCategory, getLabelForSpaceCategory, getPictogramForUrbanSpaceCategory, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import Badge from "@/shared/views/components/Badge/Badge"; import CheckableTile from "@/shared/views/components/CheckableTile/CheckableTile"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/index.tsx index e5a5e687e..3da91c771 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/selection/index.tsx @@ -1,8 +1,8 @@ import { spacesSelectionCompleted, spacesSelectionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectSpacesCategories } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectSpacesCategories } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import UrbanProjectSpacesSelection, { FormValues } from "./SpacesCategoriesSelection"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-carbon-storage/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-carbon-storage/index.tsx index e1d5a94d9..f6b103a96 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-carbon-storage/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-carbon-storage/index.tsx @@ -1,15 +1,15 @@ import { useEffect } from "react"; -import { SoilsCarbonStorageResult } from "@/features/create-project/application/soilsCarbonStorage.action"; -import { fetchCurrentAndProjectedSoilsCarbonStorage } from "@/features/create-project/application/urban-project/soilsCarbonStorage.actions"; -import { - selectCurrentAndProjectedSoilsCarbonStorage, - selectLoadingState, -} from "@/features/create-project/application/urban-project/soilsCarbonStorage.selectors"; +import { SoilsCarbonStorageResult } from "@/features/create-project/core/soilsCarbonStorage.action"; +import { fetchCurrentAndProjectedSoilsCarbonStorage } from "@/features/create-project/core/urban-project/actions/soilsCarbonStorage.actions"; import { soilsCarbonStorageCompleted, soilsCarbonStorageReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { + selectCurrentAndProjectedSoilsCarbonStorage, + selectLoadingState, +} from "@/features/create-project/core/urban-project/selectors/soilsCarbonStorage.selectors"; import SoilsCarbonStorageComparison from "@/features/create-project/views/common-views/soils-carbon-storage-comparison"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-summary/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-summary/index.tsx index c0a559e81..2fc837191 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-summary/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/soils-summary/index.tsx @@ -1,9 +1,9 @@ -import { selectSiteSoilsDistribution } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteSoilsDistribution } from "@/features/create-project/core/createProject.selectors"; import { soilsSummaryCompleted, soilsSummaryReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { selectUrbanProjectSoilsDistribution } from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { selectUrbanProjectSoilsDistribution } from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import UrbanProjectSoilsSummary from "./UrbanProjectSoilsSummary"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/SpacesCategoriesSurfaceAreaDistributionForm.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/SpacesCategoriesSurfaceAreaDistributionForm.tsx index b62caacc2..9af2754dd 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/SpacesCategoriesSurfaceAreaDistributionForm.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/SpacesCategoriesSurfaceAreaDistributionForm.tsx @@ -4,7 +4,7 @@ import { getDescriptionForUrbanSpaceCategory, getLabelForSpaceCategory, getPictogramForUrbanSpaceCategory, -} from "@/features/create-project/domain/urbanProject"; +} from "@/features/create-project/core/urban-project/urbanProject"; import { formatSurfaceArea } from "@/shared/services/format-number/formatNumber"; import SurfaceAreaDistributionForm from "@/shared/views/components/form/SurfaceAreaDistributionForm/SurfaceAreaDistributionForm"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/index.tsx index d7adc980e..c363c1b48 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/spaces/surface-area/index.tsx @@ -1,12 +1,12 @@ -import { selectSiteSurfaceArea } from "@/features/create-project/application/createProject.selectors"; +import { selectSiteSurfaceArea } from "@/features/create-project/core/createProject.selectors"; import { spacesSurfaceAreaCompleted, spacesSurfaceAreaReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { selectSpacesCategories, selectSpacesCategoriesSurfaceDistribution, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import UrbanProjectSpaceCategoriesSurfaceAreaDistributionForm, { diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/developer/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/developer/index.tsx index 6d743f00f..b5de5abf3 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/developer/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/developer/index.tsx @@ -1,12 +1,12 @@ -import { - getUrbanProjectAvailableStakeholders, - getUrbanProjectAvailableLocalAuthoritiesStakeholders, -} from "@/features/create-project/application/urban-project/stakeholders.selectors"; +import { ProjectStakeholderStructure } from "@/features/create-project/core/project.types"; import { stakeholderProjectDeveloperCompleted, stakeholderProjectDeveloperReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { ProjectStakeholderStructure } from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { + getUrbanProjectAvailableStakeholders, + getUrbanProjectAvailableLocalAuthoritiesStakeholders, +} from "@/features/create-project/core/urban-project/selectors/stakeholders.selectors"; import StakeholderForm from "@/features/create-project/views/common-views/stakeholder-form"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/introduction/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/introduction/index.tsx index 24d6528a7..864f89a33 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/introduction/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/introduction/index.tsx @@ -1,7 +1,7 @@ import { stakeholderIntroductionCompleted, stakeholderIntroductionReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import ProjectStakeholdersIntroduction from "@/features/create-project/views/common-views/stakeholder-introduction/StakeholdersIntroduction"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/reinstatement-contract-owner/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/reinstatement-contract-owner/index.tsx index f5bd286bb..832dffaf9 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/reinstatement-contract-owner/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/stakeholders/reinstatement-contract-owner/index.tsx @@ -1,12 +1,12 @@ -import { - getUrbanProjectAvailableLocalAuthoritiesStakeholders, - getUrbanProjectAvailableStakeholders, -} from "@/features/create-project/application/urban-project/stakeholders.selectors"; +import { ProjectStakeholderStructure } from "@/features/create-project/core/project.types"; import { stakeholderReinstatementContractOwnerCompleted, stakeholderReinstatementContractOwnerReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; -import { ProjectStakeholderStructure } from "@/features/create-project/domain/project.types"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; +import { + getUrbanProjectAvailableLocalAuthoritiesStakeholders, + getUrbanProjectAvailableStakeholders, +} from "@/features/create-project/core/urban-project/selectors/stakeholders.selectors"; import StakeholderForm from "@/features/create-project/views/common-views/stakeholder-form"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import FormInfo from "@/shared/views/layout/WizardFormLayout/FormInfo"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/ProjectCreationDataSummary.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/ProjectCreationDataSummary.tsx index 2c5038125..735343460 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/ProjectCreationDataSummary.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/ProjectCreationDataSummary.tsx @@ -1,6 +1,6 @@ import { SoilsDistribution, UrbanProjectSpace } from "shared"; -import { UrbanProjectState } from "@/features/create-project/application/urban-project/urbanProject.reducer"; +import { UrbanProjectState } from "@/features/create-project/core/urban-project/urbanProject.reducer"; import ProjectFeaturesView from "@/features/projects/views/project-page/features/ProjectFeaturesView"; import BackNextButtonsGroup from "@/shared/views/components/BackNextButtons/BackNextButtons"; import WizardFormLayout from "@/shared/views/layout/WizardFormLayout/WizardFormLayout"; diff --git a/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/index.tsx b/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/index.tsx index f6cab7ba6..4694ed02c 100644 --- a/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/custom-forms/summary/index.tsx @@ -1,11 +1,11 @@ -import { selectProjectId } from "@/features/create-project/application/createProject.selectors"; -import { saveReconversionProject } from "@/features/create-project/application/urban-project/saveReconversionProject.action"; -import { finalSummaryReverted } from "@/features/create-project/application/urban-project/urbanProject.actions"; +import { selectProjectId } from "@/features/create-project/core/createProject.selectors"; +import { saveReconversionProject } from "@/features/create-project/core/urban-project/actions/saveReconversionProject.action"; +import { finalSummaryReverted } from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { getUrbanProjectSpaceDistribution, selectCreationData, selectUrbanProjectSoilsDistribution, -} from "@/features/create-project/application/urban-project/urbanProject.selectors"; +} from "@/features/create-project/core/urban-project/selectors/urbanProject.selectors"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; import ProjectCreationDataSummary from "./ProjectCreationDataSummary"; diff --git a/apps/web/src/features/create-project/views/urban-project/express-forms/UrbanProjectExpressStepper.tsx b/apps/web/src/features/create-project/views/urban-project/express-forms/UrbanProjectExpressStepper.tsx index 747c290c1..0979b2e51 100644 --- a/apps/web/src/features/create-project/views/urban-project/express-forms/UrbanProjectExpressStepper.tsx +++ b/apps/web/src/features/create-project/views/urban-project/express-forms/UrbanProjectExpressStepper.tsx @@ -1,4 +1,4 @@ -import { UrbanProjectExpressCreationStep } from "@/features/create-project/application/urban-project/urbanProject.reducer"; +import { UrbanProjectExpressCreationStep } from "@/features/create-project/core/urban-project/urbanProject.reducer"; import FormStepper from "@/shared/views/layout/WizardFormLayout/FormStepper"; const stepCategories = ["Type de projet", "Mode de création", "Récapitulatif"] as const; diff --git a/apps/web/src/features/create-project/views/urban-project/express-forms/creation-result/index.tsx b/apps/web/src/features/create-project/views/urban-project/express-forms/creation-result/index.tsx index b9d4243a6..893204bd3 100644 --- a/apps/web/src/features/create-project/views/urban-project/express-forms/creation-result/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/express-forms/creation-result/index.tsx @@ -1,6 +1,6 @@ import { useEffect } from "react"; -import { resultStepReverted } from "@/features/create-project/application/urban-project/urbanProject.actions"; +import { resultStepReverted } from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { fetchProjectFeatures } from "@/features/projects/application/project-features/projectFeatures.actions"; import { selectProjectFeatures } from "@/features/projects/application/project-features/projectFeatures.reducer"; import { useAppDispatch, useAppSelector } from "@/shared/views/hooks/store.hooks"; diff --git a/apps/web/src/features/create-project/views/urban-project/express-forms/express-category/index.tsx b/apps/web/src/features/create-project/views/urban-project/express-forms/express-category/index.tsx index ce5669ad0..d19bbcbe4 100644 --- a/apps/web/src/features/create-project/views/urban-project/express-forms/express-category/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/express-forms/express-category/index.tsx @@ -1,7 +1,7 @@ import { expressCategorySelected, expressCategoryStepReverted, -} from "@/features/create-project/application/urban-project/urbanProject.actions"; +} from "@/features/create-project/core/urban-project/actions/urbanProject.actions"; import { useAppDispatch } from "@/shared/views/hooks/store.hooks"; import UrbanProjectExpressCategory, { FormValues } from "./UrbanProjectExpressCategory"; diff --git a/apps/web/src/features/create-project/views/urban-project/express-forms/index.tsx b/apps/web/src/features/create-project/views/urban-project/express-forms/index.tsx index f929b46aa..306583742 100644 --- a/apps/web/src/features/create-project/views/urban-project/express-forms/index.tsx +++ b/apps/web/src/features/create-project/views/urban-project/express-forms/index.tsx @@ -1,4 +1,4 @@ -import { UrbanProjectExpressCreationStep } from "@/features/create-project/application/urban-project/urbanProject.reducer"; +import { UrbanProjectExpressCreationStep } from "@/features/create-project/core/urban-project/urbanProject.reducer"; import SidebarLayout from "@/shared/views/layout/SidebarLayout/SidebarLayout"; import UrbanProjectExpressStepper from "./UrbanProjectExpressStepper"; diff --git a/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageApi.ts b/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageApi.ts index 08fff16ba..1e2386667 100644 --- a/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageApi.ts +++ b/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageApi.ts @@ -2,7 +2,7 @@ import { GetSoilsCarbonStoragePayload, SoilsCarbonStorageGateway as ProjectSoilsCarbonStorageGateway, SoilsCarbonStorageResult, -} from "@/features/create-project/application/soilsCarbonStorage.action"; +} from "@/features/create-project/core/soilsCarbonStorage.action"; import { GetSiteSoilsCarbonStoragePayload, SiteSoilsCarbonStorageResult, diff --git a/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageMock.ts b/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageMock.ts index 9806caee5..3f362f5c9 100644 --- a/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageMock.ts +++ b/apps/web/src/shared/infrastructure/soils-carbon-storage-service/soilsCarbonStorageMock.ts @@ -1,7 +1,7 @@ import { SoilsCarbonStorageGateway as ProjectSoilsCarbonStorageGateway, SoilsCarbonStorageResult, -} from "@/features/create-project/application/soilsCarbonStorage.action"; +} from "@/features/create-project/core/soilsCarbonStorage.action"; import { SoilsCarbonStorageGateway as SiteSoilsCarbonStorageGateway } from "@/features/create-site/application/siteSoilsCarbonStorage.actions"; export class SoilsCarbonStorageMock