refactor: mega misc

app/(connected)/(full-page)/consentement-cgu/ConsentementCguPage.tsx

@@ -12,7 +12,7 @@ import { InputError } from 'components/ui/Form/InputError'
 import FailureAlert from 'components/ui/Notifications/FailureAlert'
 import { ValueWithError } from 'components/ValueWithError'
 import { estPassEmploi } from 'interfaces/conseiller'
-import { modifierDateSignatureCGU } from 'services/conseiller.service'
+import { modifierDateSignatureCGU } from 'services/conseillers.service'
 import { useConseiller } from 'utils/conseiller/conseillerContext'
 
 const HeaderCGUConseillerCEJ = dynamic(

app/(connected)/(full-page)/consentement-cgu/page.tsx

@@ -1,7 +1,7 @@
 import { Metadata } from 'next'
 
 import ConsentementCguPage from 'app/(connected)/(full-page)/consentement-cgu/ConsentementCguPage'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 
 export const metadata: Metadata = {

app/(connected)/(full-page)/emargement/[idEvenement]/page.tsx

@@ -6,7 +6,7 @@ import { PageHeaderPortal } from 'components/PageNavigationPortals'
 import { Conseiller, estUserMilo } from 'interfaces/conseiller'
 import { Evenement } from 'interfaces/evenement'
 import { Session } from 'interfaces/session'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getDetailsEvenement } from 'services/evenements.service'
 import { getDetailsSession } from 'services/sessions.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'

app/(connected)/(with-sidebar)/(with-chat)/(index)/HomePage.tsx

@@ -62,7 +62,7 @@ function HomePage({
     id?: string
     nom: string
   }): Promise<void> {
-    const { modifierAgence } = await import('services/conseiller.service')
+    const { modifierAgence } = await import('services/conseillers.service')
     await modifierAgence(agence)
     setConseiller({ ...conseiller, agence })
     setTrackingLabel('Succès ajout agence')

app/(connected)/(with-sidebar)/(with-chat)/(index)/page.tsx

@@ -8,7 +8,7 @@ import {
   doitSignerLesCGU,
   estMilo,
 } from 'interfaces/conseiller'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getAgencesServerSide } from 'services/referentiel.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 

app/(connected)/(with-sidebar)/(with-chat)/agenda/AgendaPage.tsx

@@ -141,7 +141,7 @@ function AgendaPage({ onglet, periodeIndexInitial }: AgendaPageProps) {
     id?: string
     nom: string
   }): Promise<void> {
-    const { modifierAgence } = await import('services/conseiller.service')
+    const { modifierAgence } = await import('services/conseillers.service')
     await modifierAgence(agence)
     setConseiller({ ...conseiller, agence })
     setTrackingTitle(initialTracking + ' - Succès ajout agence')

app/(connected)/(with-sidebar)/(with-chat)/etablissement/EtablissementPage.tsx

@@ -70,7 +70,7 @@ function EtablissementPage() {
     id?: string
     nom: string
   }): Promise<void> {
-    const { modifierAgence } = await import('services/conseiller.service')
+    const { modifierAgence } = await import('services/conseillers.service')
     await modifierAgence(agence)
     setConseiller({ ...conseiller, agence })
     setTrackingTitle(initialTracking + ' - Succès ajout agence')

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/PortefeuillePage.tsx

@@ -79,7 +79,7 @@ function PortefeuillePage({
     setIsRecuperationBeneficiairesLoading(true)
     try {
       const { recupererBeneficiaires: _recupererBeneficiaires } = await import(
-        'services/conseiller.service'
+        'services/beneficiaires.service'
       )
       await _recupererBeneficiaires()
       setAlerte(AlerteParam.recuperationBeneficiaires)

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/[idJeune]/FicheBeneficiairePage.tsx

@@ -130,7 +130,7 @@ function FicheBeneficiairePage(props: FicheBeneficiaireProps) {
 
       if (motifsSuppression.length === 0) {
         const { getMotifsSuppression } = await import(
-          'services/beneficiaires.service'
+          'services/referentiel.service'
         )
         const result = await getMotifsSuppression()
         setMotifsSuppression(result)

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/[idJeune]/actions/[idAction]/page.tsx

@@ -41,6 +41,7 @@ export default async function DetailAction({
   params: DetailActionParams
 }) {
   const { user, accessToken } = await getMandatorySessionServerSide()
+  console.log('>>>', { user })
   if (!estUserMilo(user)) notFound()
   const { idJeune, idAction } = params
 

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/[idJeune]/demarches/[idDemarche]/page.tsx

@@ -9,10 +9,8 @@ import {
   PageHeaderPortal,
 } from 'components/PageNavigationPortals'
 import { estUserCD } from 'interfaces/conseiller'
-import {
-  getDemarchesBeneficiaire,
-  getJeuneDetails,
-} from 'services/beneficiaires.service'
+import { getDemarchesBeneficiaire } from 'services/actions.service'
+import { getJeuneDetails } from 'services/beneficiaires.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 
 type DetailDemarcheParams = { idJeune: string; idDemarche: string }

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/[idJeune]/informations/page.tsx

@@ -11,10 +11,8 @@ import {
 } from 'components/PageNavigationPortals'
 import { getNomBeneficiaireComplet } from 'interfaces/beneficiaire'
 import { estUserMilo } from 'interfaces/conseiller'
-import {
-  getConseillersDuJeuneServerSide,
-  getJeuneDetails,
-} from 'services/beneficiaires.service'
+import { getJeuneDetails } from 'services/beneficiaires.service'
+import { getConseillersDuJeuneServerSide } from 'services/conseillers.service'
 import { getMetadonneesFavorisJeune } from 'services/favoris.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/[idJeune]/page.tsx

@@ -26,20 +26,20 @@ import {
   peutAccederAuxSessions,
 } from 'interfaces/conseiller'
 import { EvenementListItem, PeriodeEvenements } from 'interfaces/evenement'
-import { getActionsBeneficiaireServerSide } from 'services/actions.service'
 import {
+  getActionsBeneficiaireServerSide,
   getDemarchesBeneficiaire,
-  getJeuneDetails,
-} from 'services/beneficiaires.service'
-import { getConseillerServerSide } from 'services/conseiller.service'
+} from 'services/actions.service'
+import { getJeuneDetails } from 'services/beneficiaires.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getRendezVousJeune } from 'services/evenements.service'
 import {
   getMetadonneesFavorisJeune,
   getOffres,
   getRecherchesSauvegardees,
 } from 'services/favoris.service'
 import { getSituationsNonProfessionnelles } from 'services/referentiel.service'
-import { getSessionsMiloBeneficiaire } from 'services/sessions.service'
+import { getSessionsBeneficiaire } from 'services/sessions.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 import { compareDates } from 'utils/date'
 
@@ -149,7 +149,7 @@ async function renderFicheMilo(
     conseiller.structureMilo!.id === beneficiaire.structureMilo?.id
   ) {
     try {
-      sessionsMilo = await getSessionsMiloBeneficiaire(
+      sessionsMilo = await getSessionsBeneficiaire(
         beneficiaire.id,
         accessToken,
         DateTime.now().startOf('day')

app/(connected)/(with-sidebar)/(with-chat)/mes-jeunes/creation-jeune/CreationBeneficiaireMiloPage.tsx

@@ -32,7 +32,7 @@ function CreationBeneficiaireMiloPage() {
     clearDossier()
 
     try {
-      const { getDossierJeune } = await import('services/conseiller.service')
+      const { getDossierJeune } = await import('services/conseillers.service')
       const dossierJeune = await getDossierJeune(id)
       setDossier(dossierJeune)
       etapeRef.current!.focus()
@@ -52,7 +52,7 @@ function CreationBeneficiaireMiloPage() {
 
     try {
       const { createCompteJeuneMilo } = await import(
-        'services/conseiller.service'
+        'services/beneficiaires.service'
       )
       const beneficiaireCree = await createCompteJeuneMilo(
         beneficiaireData,

app/(connected)/(with-sidebar)/(with-chat)/pilotage/PilotagePage.tsx

@@ -126,7 +126,7 @@ function PilotagePage({
     id?: string
     nom: string
   }): Promise<void> {
-    const { modifierAgence } = await import('services/conseiller.service')
+    const { modifierAgence } = await import('services/conseillers.service')
     await modifierAgence(agence)
     setConseiller({ ...conseiller, agence })
     setTrackingLabel(pageTracking + ' - Succès ajout agence')

app/(connected)/(with-sidebar)/(with-chat)/pilotage/page.tsx

@@ -11,7 +11,7 @@ import {
 import { estUserMilo, peutAccederAuxSessions } from 'interfaces/conseiller'
 import { AnimationCollectivePilotage } from 'interfaces/evenement'
 import { getActionsAQualifierServerSide } from 'services/actions.service'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getAnimationsCollectivesACloreServerSide } from 'services/evenements.service'
 import { getSituationsNonProfessionnelles } from 'services/referentiel.service'
 import {

app/(connected)/(with-sidebar)/(with-chat)/profil/ProfilPage.tsx

@@ -60,7 +60,7 @@ function ProfilPage({ referentielAgences }: ProfilProps) {
     }
 
     const { modifierNotificationsSonores } = await import(
-      'services/conseiller.service'
+      'services/conseillers.service'
     )
     await modifierNotificationsSonores(
       conseiller.id,
@@ -73,7 +73,7 @@ function ProfilPage({ referentielAgences }: ProfilProps) {
     id?: string
     nom: string
   }): Promise<void> {
-    const { modifierAgence } = await import('services/conseiller.service')
+    const { modifierAgence } = await import('services/conseillers.service')
     await modifierAgence(agence)
     setConseiller({ ...conseiller, agence })
     setTrackingLabel('Profil - Succès ajout agence')
@@ -95,7 +95,7 @@ function ProfilPage({ referentielAgences }: ProfilProps) {
   async function supprimerCompteConseiller(): Promise<void> {
     try {
       const { supprimerConseiller } = await import(
-        'services/conseiller.service'
+        'services/conseillers.service'
       )
       await supprimerConseiller(conseiller.id)
       setShowModaleSuppressionCompte(false)

app/(connected)/(with-sidebar)/(with-chat)/profil/page.tsx

@@ -5,7 +5,7 @@ import ProfilPage from 'app/(connected)/(with-sidebar)/(with-chat)/profil/Profil
 import { PageHeaderPortal } from 'components/PageNavigationPortals'
 import { estUserMilo } from 'interfaces/conseiller'
 import { Agence } from 'interfaces/referentiel'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getAgencesServerSide } from 'services/referentiel.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 

app/(connected)/(with-sidebar)/(with-chat)/reaffectation/ReaffectationPage.tsx

@@ -702,7 +702,7 @@ const ChoixConseiller = forwardRef(
       if (queryConseiller.value.length < 2) return
       if (choixConseillers) return
 
-      const { getConseillers } = await import('services/conseiller.service')
+      const { getConseillers } = await import('services/conseillers.service')
       setRechercheConseillerEnCours(true)
       const conseillers = await getConseillers(
         queryConseiller.value,

app/(connected)/(with-sidebar)/(without-chat)/agenda/sessions/[idSession]/cloture/page.tsx

@@ -8,7 +8,7 @@ import {
 } from 'components/PageNavigationPortals'
 import { peutAccederAuxSessions } from 'interfaces/conseiller'
 import { StatutAnimationCollective } from 'interfaces/evenement'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getDetailsSession } from 'services/sessions.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 

app/(connected)/(with-sidebar)/(without-chat)/agenda/sessions/[idSession]/page.tsx

@@ -9,7 +9,7 @@ import {
 } from 'components/PageNavigationPortals'
 import { estUserMilo, peutAccederAuxSessions } from 'interfaces/conseiller'
 import { getBeneficiairesDeLaStructureMilo } from 'services/beneficiaires.service'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import { getDetailsSession } from 'services/sessions.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 import redirectedFromHome from 'utils/redirectedFromHome'

app/(connected)/(with-sidebar)/(without-chat)/mes-jeunes/edition-rdv/page.tsx

@@ -22,10 +22,8 @@ import {
   TypeEvenementReferentiel,
 } from 'interfaces/referentiel'
 import { getBeneficiairesDuConseillerServerSide } from 'services/beneficiaires.service'
-import {
-  getDetailsEvenement,
-  getTypesRendezVous,
-} from 'services/evenements.service'
+import { getDetailsEvenement } from 'services/evenements.service'
+import { getTypesRendezVous } from 'services/referentiel.service'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 import redirectedFromHome from 'utils/redirectedFromHome'
 

app/(connected)/(with-sidebar)/(without-chat)/offres/[typeOffre]/[idOffre]/partage/PartageOffrePage.tsx

@@ -2,7 +2,7 @@
 
 import { withTransaction } from '@elastic/apm-rum-react'
 import { useRouter } from 'next/navigation'
-import React, { FormEvent, useState } from 'react'
+import React, { FormEvent, ReactNode, useState } from 'react'
 
 import BeneficiairesMultiselectAutocomplete, {
   OptionBeneficiaire,
@@ -95,6 +95,13 @@ function PartageOffrePage({ offre, returnTo }: PartageOffrePageProps) {
     }
   }
 
+  const pouet: ReactNode = (
+    <>
+      <h3>Coucou</h3>
+      <p>Pouet</p>
+    </>
+  )
+
   function getCardOffre(): JSX.Element {
     switch (offre.type) {
       case TypeOffre.EMPLOI:

app/(connected)/(with-sidebar)/(without-chat)/offres/[typeOffre]/partage-recherche/PartageRecherchePage.tsx

@@ -144,7 +144,7 @@ function PartageRecherchePage({
       criteresRecherche as CriteresRechercheOffreEmploiProps
 
     const { partagerRechercheOffreEmploi: _partagerRechercheOffreEmploi } =
-      await import('services/suggestions.service')
+      await import('services/offres-emploi.service')
     await _partagerRechercheOffreEmploi({
       idsJeunes: idsDestinataires.value,
       titre,
@@ -161,7 +161,7 @@ function PartageRecherchePage({
       criteresRecherche as CriteresRechercheOffreEmploiProps
 
     const { partagerRechercheAlternance: _partagerRechercheAlternance } =
-      await import('services/suggestions.service')
+      await import('services/offres-emploi.service')
     await _partagerRechercheAlternance({
       idsJeunes: idsDestinataires.value,
       titre,
@@ -184,7 +184,7 @@ function PartageRecherchePage({
     } = criteresRecherche as CriteresRechercheImmersionProps
 
     const { partagerRechercheImmersion: _partagerRechercheImmersion } =
-      await import('services/suggestions.service')
+      await import('services/immersions.service')
     await _partagerRechercheImmersion({
       idsJeunes: idsDestinataires.value,
       titre,
@@ -202,7 +202,7 @@ function PartageRecherchePage({
 
     const {
       partagerRechercheServiceCivique: _partagerRechercheServiceCivique,
-    } = await import('services/suggestions.service')
+    } = await import('services/services-civiques.service')
     await _partagerRechercheServiceCivique({
       idsJeunes: idsDestinataires.value,
       titre,

app/(connected)/(with-sidebar)/messagerie/MessageriePage.tsx

@@ -9,7 +9,7 @@ import DetailMessageListeDeDiffusion from 'components/chat/DetailMessageListeDeD
 import MessagesListeDeDiffusion from 'components/chat/MessagesListeDeDiffusion'
 import { ConseillerHistorique } from 'interfaces/beneficiaire'
 import { MessageListeDiffusion } from 'interfaces/message'
-import { getConseillersDuJeuneClientSide } from 'services/beneficiaires.service'
+import { getConseillersDuJeuneClientSide } from 'services/conseillers.service'
 import useMatomo from 'utils/analytics/useMatomo'
 import { useChats } from 'utils/chat/chatsContext'
 import { useCurrentConversation } from 'utils/chat/currentConversationContext'

app/(connected)/layout.tsx

@@ -6,7 +6,7 @@ import { MODAL_ROOT_ID } from 'components/globals'
 import LiensEvitement from 'components/LiensEvitement'
 import { estUserPassEmploi } from 'interfaces/conseiller'
 import { getBeneficiairesDuConseillerServerSide } from 'services/beneficiaires.service'
-import { getConseillerServerSide } from 'services/conseiller.service'
+import { getConseillerServerSide } from 'services/conseillers.service'
 import AppContextProviders from 'utils/AppContextProviders'
 import { getMandatorySessionServerSide } from 'utils/auth/auth'
 

clients/api.client.ts

@@ -8,15 +8,15 @@ const apiPrefix = process.env.NEXT_PUBLIC_API_ENDPOINT
 export async function apiGet<T>(
   path: string,
   accessToken: string,
-  cacheTag: string
+  cacheTags: string | string[]
 ): Promise<{ content: T; headers: Headers }> {
   const headers = new Headers({
     Authorization: `Bearer ${accessToken}`,
   })
 
   return fetchJson(`${apiPrefix}${path}`, {
     headers,
-    next: { tags: [cacheTag] },
+    next: { tags: typeof cacheTags === 'string' ? [cacheTags] : cacheTags },
   })
 }
 

components/NavLinks.tsx

@@ -13,7 +13,7 @@ import {
   estSuperviseur,
   utiliseChat,
 } from 'interfaces/conseiller'
-import { modifierDateVisionnageActus } from 'services/conseiller.service'
+import { modifierDateVisionnageActus } from 'services/conseillers.service'
 import { useActualites } from 'utils/actualitesContext'
 import { trackEvent } from 'utils/analytics/matomo'
 import { useConseiller } from 'utils/conseiller/conseillerContext'

components/chat/ChatContainer.tsx

@@ -9,7 +9,7 @@ import {
   ConseillerHistorique,
 } from 'interfaces/beneficiaire'
 import { ListeDeDiffusion } from 'interfaces/liste-de-diffusion'
-import { getConseillersDuJeuneClientSide } from 'services/beneficiaires.service'
+import { getConseillersDuJeuneClientSide } from 'services/conseillers.service'
 import { getListesDeDiffusionClientSide } from 'services/listes-de-diffusion.service'
 import { useChats } from 'utils/chat/chatsContext'
 import { useCurrentConversation } from 'utils/chat/currentConversationContext'

fixtures/auth.ts

@@ -0,0 +1,18 @@
+import { Session } from 'next-auth'
+
+export function unUtilisateur(
+  overrides: Partial<Session.HydratedUser> = {}
+): Session.HydratedUser {
+  const utilisateur: Session.HydratedUser = {
+    email: '[email protected]',
+    estConseiller: true,
+    estSuperviseur: false,
+    estSuperviseurResponsable: false,
+    id: 'id-conseiller',
+    image: undefined,
+    name: 'Nils',
+    structure: 'MILO',
+  }
+
+  return { ...utilisateur, ...overrides }
+}