From bc86fa3c956597ff669bda7addce550e483f2d4b Mon Sep 17 00:00:00 2001 From: Fabien Mercier Date: Thu, 2 May 2024 10:11:30 +0200 Subject: [PATCH] Renommage repository vers repositories --- package.json | 5 ++++- src/app/(connecte)/indicateurs-cles/page.tsx | 4 ++-- src/app/(connecte)/inventaire/page.tsx | 4 ++-- src/app/(connecte)/liste-equipements/page.tsx | 4 ++-- src/app/(connecte)/page.tsx | 2 +- src/components/CreerUnInventaire/action.ts | 2 +- src/components/Inventaire/action.ts | 4 ++-- src/components/Inventaire/modele.ts | 2 +- src/components/commun/action.ts | 2 +- src/presenters/indicateursClesPresenter.ts | 4 ++-- src/presenters/inventairePresenter.ts | 2 +- src/presenters/listeEquipementsPresenter.ts | 2 +- prisma/db.ts => src/repositories/database.ts | 0 src/{repository => repositories}/indicateursRepository.ts | 2 +- src/{repository => repositories}/inventairesRepository.ts | 2 +- src/{repository => repositories}/modelesRepository.ts | 2 +- .../typesEquipementsRepository.ts | 2 +- {prisma => src}/schema.prisma | 0 18 files changed, 24 insertions(+), 21 deletions(-) rename prisma/db.ts => src/repositories/database.ts (100%) rename src/{repository => repositories}/indicateursRepository.ts (97%) rename src/{repository => repositories}/inventairesRepository.ts (98%) rename src/{repository => repositories}/modelesRepository.ts (99%) rename src/{repository => repositories}/typesEquipementsRepository.ts (94%) rename {prisma => src}/schema.prisma (100%) diff --git a/package.json b/package.json index a618f16..0556743 100644 --- a/package.json +++ b/package.json @@ -58,5 +58,8 @@ "engines": { "node": "20.12.2" }, - "packageManager": "yarn@4.1.1" + "packageManager": "yarn@4.1.1", + "prisma": { + "schema": "src/schema.prisma" + } } diff --git a/src/app/(connecte)/indicateurs-cles/page.tsx b/src/app/(connecte)/indicateurs-cles/page.tsx index a8ce838..69913bb 100644 --- a/src/app/(connecte)/indicateurs-cles/page.tsx +++ b/src/app/(connecte)/indicateurs-cles/page.tsx @@ -6,8 +6,8 @@ import { getProfileAtih } from '../../../authentification' import Breadcrumb from '../../../components/commun/Breadcrumb' import IndicateursCles from '../../../components/IndicateursCles/IndicateursCles' import { indicateursClesPresenter } from '../../../presenters/indicateursClesPresenter' -import { recupererLesIndicateursImpactsEquipementsRepository, recupererLesIndicateursImpactsEquipementsSommesRepository } from '../../../repository/indicateursRepository' -import { recupererLesReferentielsTypesEquipementsRepository } from '../../../repository/typesEquipementsRepository' +import { recupererLesIndicateursImpactsEquipementsRepository, recupererLesIndicateursImpactsEquipementsSommesRepository } from '../../../repositories/indicateursRepository' +import { recupererLesReferentielsTypesEquipementsRepository } from '../../../repositories/typesEquipementsRepository' const title = 'Indicateurs clés' export const metadata: Metadata = { diff --git a/src/app/(connecte)/inventaire/page.tsx b/src/app/(connecte)/inventaire/page.tsx index d4b53b0..b588883 100644 --- a/src/app/(connecte)/inventaire/page.tsx +++ b/src/app/(connecte)/inventaire/page.tsx @@ -7,8 +7,8 @@ import Breadcrumb from '../../../components/commun/Breadcrumb' import Inventaire from '../../../components/Inventaire/Inventaire' import { inventairePresenter } from '../../../presenters/inventairePresenter' import { StatutsInventaire } from '../../../presenters/sharedPresenter' -import { recupererLesModelesRepository } from '../../../repository/modelesRepository' -import { recupererLesReferentielsTypesEquipementsRepository } from '../../../repository/typesEquipementsRepository' +import { recupererLesModelesRepository } from '../../../repositories/modelesRepository' +import { recupererLesReferentielsTypesEquipementsRepository } from '../../../repositories/typesEquipementsRepository' const title = 'Renseigner les équipements' export const metadata: Metadata = { diff --git a/src/app/(connecte)/liste-equipements/page.tsx b/src/app/(connecte)/liste-equipements/page.tsx index 4a4a46d..44560e3 100644 --- a/src/app/(connecte)/liste-equipements/page.tsx +++ b/src/app/(connecte)/liste-equipements/page.tsx @@ -6,8 +6,8 @@ import { getProfileAtih } from '../../../authentification' import Breadcrumb from '../../../components/commun/Breadcrumb' import ListeEquipements from '../../../components/ListeEquipements/ListeEquipements' import { listeEquipementsPresenter } from '../../../presenters/listeEquipementsPresenter' -import { recupererLesModelesRepository } from '../../../repository/modelesRepository' -import { recupererLesReferentielsTypesEquipementsRepository } from '../../../repository/typesEquipementsRepository' +import { recupererLesModelesRepository } from '../../../repositories/modelesRepository' +import { recupererLesReferentielsTypesEquipementsRepository } from '../../../repositories/typesEquipementsRepository' const title = 'Liste d’équipements' export const metadata: Metadata = { diff --git a/src/app/(connecte)/page.tsx b/src/app/(connecte)/page.tsx index c54c067..f36d7c0 100644 --- a/src/app/(connecte)/page.tsx +++ b/src/app/(connecte)/page.tsx @@ -4,7 +4,7 @@ import { ReactElement } from 'react' import { getProfileAtih } from '../../authentification' import InventairesLayout from '../../components/Inventaires/InventairesLayout' import { inventairesPresenter } from '../../presenters/inventairesPresenter' -import { recupererLesInventairesRepository } from '../../repository/inventairesRepository' +import { recupererLesInventairesRepository } from '../../repositories/inventairesRepository' export const metadata: Metadata = { title: 'Accueil', diff --git a/src/components/CreerUnInventaire/action.ts b/src/components/CreerUnInventaire/action.ts index 1771dbf..ff48002 100644 --- a/src/components/CreerUnInventaire/action.ts +++ b/src/components/CreerUnInventaire/action.ts @@ -1,7 +1,7 @@ 'use server' import { getProfileAtih } from '../../authentification' -import { recupererUnInventaireRepository } from '../../repository/inventairesRepository' +import { recupererUnInventaireRepository } from '../../repositories/inventairesRepository' export async function estCeQueLeNomInventaireExisteAction(nomInventaire: string): Promise { const profile = await getProfileAtih() diff --git a/src/components/Inventaire/action.ts b/src/components/Inventaire/action.ts index ea17c58..1cc1b68 100644 --- a/src/components/Inventaire/action.ts +++ b/src/components/Inventaire/action.ts @@ -1,7 +1,7 @@ 'use server' -import { creerUnInventaireRepository, enregistrerUnInventaireNonCalculeRepository } from '../../repository/inventairesRepository' -import { Modele } from '../../repository/modelesRepository' +import { creerUnInventaireRepository, enregistrerUnInventaireNonCalculeRepository } from '../../repositories/inventairesRepository' +import { Modele } from '../../repositories/modelesRepository' export async function enregistrerUnInventaireNonCalculeAction(nomEtablissement: string, nomInventaire: string, modeles: ReadonlyArray): Promise { await enregistrerUnInventaireNonCalculeRepository(nomEtablissement, nomInventaire, modeles) diff --git a/src/components/Inventaire/modele.ts b/src/components/Inventaire/modele.ts index 2e69c1f..95dc2ce 100644 --- a/src/components/Inventaire/modele.ts +++ b/src/components/Inventaire/modele.ts @@ -1,4 +1,4 @@ -import { Modele } from '../../repository/modelesRepository' +import { Modele } from '../../repositories/modelesRepository' export const modelesSelectionnes = (): Array => { const equipements = document.querySelectorAll('form [data-nom-equipement]') diff --git a/src/components/commun/action.ts b/src/components/commun/action.ts index 765c23c..175aa94 100644 --- a/src/components/commun/action.ts +++ b/src/components/commun/action.ts @@ -1,6 +1,6 @@ 'use server' -import { supprimerUnInventaireRepository } from '../../repository/inventairesRepository' +import { supprimerUnInventaireRepository } from '../../repositories/inventairesRepository' export async function supprimerInventaireAction(nomEtablissement: string, nomInventaire: string): Promise { await supprimerUnInventaireRepository(nomEtablissement, nomInventaire) diff --git a/src/presenters/indicateursClesPresenter.ts b/src/presenters/indicateursClesPresenter.ts index e05a5aa..92bb57e 100644 --- a/src/presenters/indicateursClesPresenter.ts +++ b/src/presenters/indicateursClesPresenter.ts @@ -1,8 +1,8 @@ import { indicateurImpactEquipementModel } from '@prisma/client' import { formaterDeuxChiffresApresLaVirgule, formaterLaDateEnFrancais } from './sharedPresenter' -import { IndicateurImpactEquipementSommeModel } from '../repository/indicateursRepository' -import { ReferentielTypeEquipementModel } from '../repository/typesEquipementsRepository' +import { IndicateurImpactEquipementSommeModel } from '../repositories/indicateursRepository' +import { ReferentielTypeEquipementModel } from '../repositories/typesEquipementsRepository' type IndicateursImpactsEquipements = Readonly<{ acidification: string diff --git a/src/presenters/inventairePresenter.ts b/src/presenters/inventairePresenter.ts index ff9222c..a0d7834 100644 --- a/src/presenters/inventairePresenter.ts +++ b/src/presenters/inventairePresenter.ts @@ -2,7 +2,7 @@ import { modeleModel } from '@prisma/client' import { StatutsInventaire, calculerLaDureeDeVie, convertirLeTauxUtilisationEnHeureUtilisation, formaterLaDateEnFrancais, genererUnIdentifiantUnique } from './sharedPresenter' import { ModeleReducer } from '../components/Inventaire/useEquipement' -import { ReferentielTypeEquipementModel } from '../repository/typesEquipementsRepository' +import { ReferentielTypeEquipementModel } from '../repositories/typesEquipementsRepository' export type EquipementAvecSesModelesPresenter = Readonly<{ modeles: Array diff --git a/src/presenters/listeEquipementsPresenter.ts b/src/presenters/listeEquipementsPresenter.ts index 6991478..dd9903c 100644 --- a/src/presenters/listeEquipementsPresenter.ts +++ b/src/presenters/listeEquipementsPresenter.ts @@ -1,7 +1,7 @@ import { modeleModel } from '@prisma/client' import { calculerLaDureeDeVie, convertirLeTauxUtilisationEnHeureUtilisation, formaterLaDateEnFrancais } from './sharedPresenter' -import { ReferentielTypeEquipementModel } from '../repository/typesEquipementsRepository' +import { ReferentielTypeEquipementModel } from '../repositories/typesEquipementsRepository' export type EquipementPresenter = Readonly<{ dateInventaire: Readonly diff --git a/prisma/db.ts b/src/repositories/database.ts similarity index 100% rename from prisma/db.ts rename to src/repositories/database.ts diff --git a/src/repository/indicateursRepository.ts b/src/repositories/indicateursRepository.ts similarity index 97% rename from src/repository/indicateursRepository.ts rename to src/repositories/indicateursRepository.ts index c866983..e43e2a4 100644 --- a/src/repository/indicateursRepository.ts +++ b/src/repositories/indicateursRepository.ts @@ -1,6 +1,6 @@ import { indicateurImpactEquipementModel } from '@prisma/client' -import prisma from '../../prisma/db' +import prisma from './database' export type IndicateurImpactEquipementSommeModel = Readonly<{ _sum: Readonly<{ diff --git a/src/repository/inventairesRepository.ts b/src/repositories/inventairesRepository.ts similarity index 98% rename from src/repository/inventairesRepository.ts rename to src/repositories/inventairesRepository.ts index ac664c8..7f79a5f 100644 --- a/src/repository/inventairesRepository.ts +++ b/src/repositories/inventairesRepository.ts @@ -1,8 +1,8 @@ import { inventaireModel } from '@prisma/client' +import prisma from './database' import { supprimerLesIndicateursImpactsEquipementsRepository } from './indicateursRepository' import { Modele, calculerEmpreinteRepository, enregistrerLesModelesRepository, supprimerLesModelesRepository } from './modelesRepository' -import prisma from '../../prisma/db' export async function recupererLesInventairesRepository(nomEtablissement: string, isAdmin: boolean): Promise> { const nomOrganisation = isAdmin ? { startsWith: '%' } : nomEtablissement diff --git a/src/repository/modelesRepository.ts b/src/repositories/modelesRepository.ts similarity index 99% rename from src/repository/modelesRepository.ts rename to src/repositories/modelesRepository.ts index d5fa4f8..b42d3b9 100644 --- a/src/repository/modelesRepository.ts +++ b/src/repositories/modelesRepository.ts @@ -1,7 +1,7 @@ import { modeleModel } from '@prisma/client' +import prisma from './database' import { passerATraiteUnInventaireRepository } from './inventairesRepository' -import prisma from '../../prisma/db' type ApiError = Readonly<{ code: string diff --git a/src/repository/typesEquipementsRepository.ts b/src/repositories/typesEquipementsRepository.ts similarity index 94% rename from src/repository/typesEquipementsRepository.ts rename to src/repositories/typesEquipementsRepository.ts index 00b13b2..a215332 100644 --- a/src/repository/typesEquipementsRepository.ts +++ b/src/repositories/typesEquipementsRepository.ts @@ -1,4 +1,4 @@ -import prisma from '../../prisma/db' +import prisma from './database' export type ReferentielTypeEquipementModel = Readonly<{ dureeDeVie: number diff --git a/prisma/schema.prisma b/src/schema.prisma similarity index 100% rename from prisma/schema.prisma rename to src/schema.prisma