From 92099d0c64f26b1d328d0603cf9390a10b92c482 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Mon, 12 Sep 2022 19:29:09 +0300
Subject: [PATCH 01/14] fix: add timezone to service call

Due to complexity to put browser timezone in Next.js calls, we do not make initial call on server side
---
 pages/mes-rendezvous.tsx        | 90 +++++++++++++--------------------
 services/rendez-vous.service.ts | 43 +++++-----------
 2 files changed, 50 insertions(+), 83 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 083bf52f0..61fb381e5 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -16,12 +16,8 @@ import useMatomo from 'utils/analytics/useMatomo'
 import { withMandatorySessionOrRedirect } from 'utils/auth/withMandatorySessionOrRedirect'
 import { useConseiller } from 'utils/conseiller/conseillerContext'
 import { useDependance } from 'utils/injectionDependances'
-import withDependance from 'utils/injectionDependances/withDependance'
 
 interface MesRendezvousProps extends PageProps {
-  rendezVous: RdvListItem[]
-  dateDebut: string
-  dateFin: string
   creationSuccess?: boolean
   modificationSuccess?: boolean
   suppressionSuccess?: boolean
@@ -30,9 +26,6 @@ interface MesRendezvousProps extends PageProps {
 }
 
 function MesRendezvous({
-  rendezVous,
-  dateDebut,
-  dateFin,
   creationSuccess,
   modificationSuccess,
   suppressionSuccess,
@@ -43,9 +36,9 @@ function MesRendezvous({
 
   const [conseiller] = useConseiller()
 
-  const [rdvs, setRdvs] = useState<RdvListItem[]>([])
-  const [debutPeriode, setDebutPeriode] = useState<string>(dateDebut)
-  const [finPeriode, setFinPeriode] = useState<string>(dateFin)
+  const [rdvs, setRdvs] = useState<RdvListItem[] | undefined>()
+  const [debutPeriode, setDebutPeriode] = useState<DateTime | undefined>()
+  const [finPeriode, setFinPeriode] = useState<DateTime | undefined>()
 
   let initialTracking = `Mes rendez-vous`
   if (creationSuccess) initialTracking += ' - Creation rdv succès'
@@ -57,54 +50,59 @@ function MesRendezvous({
   useMatomo(trackingTitle)
 
   async function allerRdvsPasses() {
-    const FIN_RDVS_PASSES = DateTime.fromFormat(
-      debutPeriode,
-      'dd/MM/yyyy'
-    ).minus({ day: 1 })
-    const DEBUT_RDVS_PASSES = FIN_RDVS_PASSES.minus({ day: 6 })
+    const DEBUT_RDVS_PASSES = debutPeriode!.minus({ day: 7 })
+    const FIN_RDVS_PASSES = finPeriode!.minus({ day: 7 })
 
     const rdvsPasses =
       await rendezVousService.getRendezVousConseillerClientSide(
         conseiller!.id,
-        DEBUT_RDVS_PASSES.toFormat('yyyy-MM-dd'),
-        FIN_RDVS_PASSES.toFormat('yyyy-MM-dd')
+        DEBUT_RDVS_PASSES,
+        FIN_RDVS_PASSES
       )
 
     setRdvs(rdvsPasses.map(rdvToListItem))
-    setDebutPeriode(DEBUT_RDVS_PASSES.toFormat('dd/MM/yyyy'))
-    setFinPeriode(FIN_RDVS_PASSES.toFormat('dd/MM/yyyy'))
+    setDebutPeriode(DEBUT_RDVS_PASSES)
+    setFinPeriode(FIN_RDVS_PASSES)
     setTrackingTitle(`${trackingTitle} passés`)
   }
 
-  function allerRdvsSemaineCourante() {
-    const AUJOURDHUI = DateTime.now()
-    const FIN_SEMAINE_COURANTE = AUJOURDHUI.plus({ day: 6 })
+  async function allerRdvsSemaineCourante() {
+    const AUJOURDHUI = DateTime.now().startOf('day')
+    const FIN_SEMAINE_COURANTE = AUJOURDHUI.plus({ day: 6 }).endOf('day')
 
-    setRdvs(rendezVous)
-    setDebutPeriode(AUJOURDHUI.toFormat('dd/MM/yyyy'))
-    setFinPeriode(FIN_SEMAINE_COURANTE.toFormat('dd/MM/yyyy'))
+    const rdvsSemaineCourante =
+      await rendezVousService.getRendezVousConseillerClientSide(
+        conseiller!.id,
+        AUJOURDHUI,
+        FIN_SEMAINE_COURANTE
+      )
+
+    setRdvs(rdvsSemaineCourante.map(rdvToListItem))
+    setDebutPeriode(AUJOURDHUI)
+    setFinPeriode(FIN_SEMAINE_COURANTE)
   }
 
   async function allerRdvsSemaineFuture() {
-    const FORMAT_DATE_DEBUT = DateTime.fromFormat(finPeriode, 'dd/MM/yyyy')
-    const DEBUT_RDVS_FUTURS = FORMAT_DATE_DEBUT.plus({ day: 1 })
-    const FIN_RDVS_FUTURS = DEBUT_RDVS_FUTURS.plus({ day: 6 })
+    const DEBUT_RDVS_FUTURS = debutPeriode!.plus({ day: 7 })
+    const FIN_RDVS_FUTURS = finPeriode!.plus({ day: 7 })
 
     const rdvsFuturs =
       await rendezVousService.getRendezVousConseillerClientSide(
         conseiller!.id,
-        DEBUT_RDVS_FUTURS.toFormat('yyyy-MM-dd'),
-        FIN_RDVS_FUTURS.toFormat('yyyy-MM-dd')
+        DEBUT_RDVS_FUTURS,
+        FIN_RDVS_FUTURS
       )
     setRdvs(rdvsFuturs.map(rdvToListItem))
-    setDebutPeriode(DEBUT_RDVS_FUTURS.toFormat('dd/MM/yyyy'))
-    setFinPeriode(FIN_RDVS_FUTURS.toFormat('dd/MM/yyyy'))
+    setDebutPeriode(DEBUT_RDVS_FUTURS)
+    setFinPeriode(FIN_RDVS_FUTURS)
     setTrackingTitle(`${trackingTitle} futurs`)
   }
 
   useEffect(() => {
-    setRdvs(rendezVous)
-  }, [rendezVous])
+    if (!rdvs && conseiller) {
+      allerRdvsSemaineCourante()
+    }
+  }, [rdvs, conseiller])
 
   return (
     <>
@@ -126,7 +124,8 @@ function MesRendezvous({
 
         <div className='flex items-center mt-1'>
           <p className='text-m-bold text-primary mr-6'>
-            du {debutPeriode} au {finPeriode}
+            du {debutPeriode?.toFormat('dd/MM/yyyy')} au{' '}
+            {finPeriode?.toFormat('dd/MM/yyyy')}
           </p>
           <button
             aria-label='Aller à la semaine précédente'
@@ -155,7 +154,7 @@ function MesRendezvous({
 
       <TableauRdv
         idConseiller={conseiller?.id ?? ''}
-        rdvs={rdvs}
+        rdvs={rdvs ?? []}
         withIntercalaires={true}
       />
     </>
@@ -171,30 +170,13 @@ export const getServerSideProps: GetServerSideProps<
   }
 
   const {
-    session: { user, accessToken },
+    session: { user },
   } = sessionOrRedirect
   if (user.structure === StructureConseiller.POLE_EMPLOI) {
     return { notFound: true }
   }
 
-  const AUJOURDHUI = DateTime.now()
-  const FIN_SEMAINE_COURANTE = AUJOURDHUI.plus({ day: 6 })
-
-  const rendezVousService =
-    withDependance<RendezVousService>('rendezVousService')
-
-  const rendezVousSemaineCourante =
-    await rendezVousService.getRendezVousConseillerServerSide(
-      user.id,
-      accessToken,
-      AUJOURDHUI.toFormat('yyyy-MM-dd'),
-      FIN_SEMAINE_COURANTE.toFormat('yyyy-MM-dd')
-    )
-
   const props: MesRendezvousProps = {
-    rendezVous: rendezVousSemaineCourante.map(rdvToListItem),
-    dateDebut: AUJOURDHUI.toFormat('dd/MM/yyyy'),
-    dateFin: FIN_SEMAINE_COURANTE.toFormat('dd/MM/yyyy'),
     pageTitle: 'Tableau de bord - Mes rendez-vous',
     pageHeader: 'Mes rendez-vous',
   }
diff --git a/services/rendez-vous.service.ts b/services/rendez-vous.service.ts
index 701b1efe9..08c5c3a0b 100644
--- a/services/rendez-vous.service.ts
+++ b/services/rendez-vous.service.ts
@@ -10,19 +10,13 @@ import {
 } from 'interfaces/json/rdv'
 import { Rdv, TypeRendezVous } from 'interfaces/rdv'
 import { ApiError } from 'utils/httpClient'
+import { DateTime } from 'luxon'
 
 export interface RendezVousService {
-  getRendezVousConseillerServerSide(
-    idConseiller: string,
-    accessToken: string,
-    dateDebut: string,
-    dateFin: string
-  ): Promise<Rdv[]>
-
   getRendezVousConseillerClientSide(
     idConseiller: string,
-    dateDebut?: string,
-    dateFin?: string
+    dateDebut: DateTime,
+    dateFin: DateTime
   ): Promise<Rdv[]>
 
   getRendezVousJeune(idJeune: string, accessToken: string): Promise<Rdv[]>
@@ -44,31 +38,22 @@ export interface RendezVousService {
 export class RendezVousApiService implements RendezVousService {
   constructor(private readonly apiClient: ApiClient) {}
 
-  async getRendezVousConseillerServerSide(
-    idConseiller: string,
-    accessToken: string,
-    dateDebut: string,
-    dateFin: string
-  ): Promise<Rdv[]> {
-    const { content: rdvs } = await this.apiClient.get<RdvJson[]>(
-      `/v2/conseillers/${idConseiller}/rendezvous?dateDebut=${dateDebut}&dateFin=${dateFin}`,
-      accessToken
-    )
-    return rdvs.map(jsonToRdv)
-  }
-
   async getRendezVousConseillerClientSide(
     idConseiller: string,
-    dateDebut: string,
-    dateFin: string
+    dateDebut: DateTime,
+    dateFin: DateTime
   ): Promise<Rdv[]> {
     const session = await getSession()
-    return this.getRendezVousConseillerServerSide(
-      idConseiller,
-      session!.accessToken,
-      dateDebut,
-      dateFin
+    console.log('BEFORE URI')
+    const dateDebutUrlEncoded = encodeURIComponent(dateDebut.toISO())
+    const dateFinUrlEncoded = encodeURIComponent(dateFin.toISO())
+    console.log('dateDebutUrlEncoded', dateDebutUrlEncoded)
+    console.log('dateFinUrlEncoded', dateFinUrlEncoded)
+    const { content: rdvs } = await this.apiClient.get<RdvJson[]>(
+      `/v2/conseillers/${idConseiller}/rendezvous?dateDebut=${dateDebutUrlEncoded}&dateFin=${dateFinUrlEncoded}`,
+      session!.accessToken
     )
+    return rdvs.map(jsonToRdv)
   }
 
   async getRendezVousJeune(

From ba1e3ab514e9dda592f8156692e67f72a5a3cd8e Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Mon, 12 Sep 2022 20:29:40 +0300
Subject: [PATCH 02/14] refactor: use semaine index to make service call

---
 pages/mes-rendezvous.tsx        | 75 +++++++++++++++------------------
 services/rendez-vous.service.ts |  3 --
 2 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 61fb381e5..c9624ea84 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -36,9 +36,11 @@ function MesRendezvous({
 
   const [conseiller] = useConseiller()
 
+  const AUJOURDHUI = DateTime.now().startOf('day')
+  const FIN_SEMAINE_COURANTE = AUJOURDHUI.plus({ day: 6 }).endOf('day')
+
+  const [numeroSemaineAffichee, setNumeroSemaineAffichee] = useState<number>(0)
   const [rdvs, setRdvs] = useState<RdvListItem[] | undefined>()
-  const [debutPeriode, setDebutPeriode] = useState<DateTime | undefined>()
-  const [finPeriode, setFinPeriode] = useState<DateTime | undefined>()
 
   let initialTracking = `Mes rendez-vous`
   if (creationSuccess) initialTracking += ' - Creation rdv succès'
@@ -50,60 +52,49 @@ function MesRendezvous({
   useMatomo(trackingTitle)
 
   async function allerRdvsPasses() {
-    const DEBUT_RDVS_PASSES = debutPeriode!.minus({ day: 7 })
-    const FIN_RDVS_PASSES = finPeriode!.minus({ day: 7 })
-
-    const rdvsPasses =
-      await rendezVousService.getRendezVousConseillerClientSide(
-        conseiller!.id,
-        DEBUT_RDVS_PASSES,
-        FIN_RDVS_PASSES
-      )
-
-    setRdvs(rdvsPasses.map(rdvToListItem))
-    setDebutPeriode(DEBUT_RDVS_PASSES)
-    setFinPeriode(FIN_RDVS_PASSES)
+    setNumeroSemaineAffichee(numeroSemaineAffichee - 1)
     setTrackingTitle(`${trackingTitle} passés`)
   }
 
   async function allerRdvsSemaineCourante() {
-    const AUJOURDHUI = DateTime.now().startOf('day')
-    const FIN_SEMAINE_COURANTE = AUJOURDHUI.plus({ day: 6 }).endOf('day')
-
-    const rdvsSemaineCourante =
-      await rendezVousService.getRendezVousConseillerClientSide(
-        conseiller!.id,
-        AUJOURDHUI,
-        FIN_SEMAINE_COURANTE
-      )
-
-    setRdvs(rdvsSemaineCourante.map(rdvToListItem))
-    setDebutPeriode(AUJOURDHUI)
-    setFinPeriode(FIN_SEMAINE_COURANTE)
+    setNumeroSemaineAffichee(0)
+    setTrackingTitle(trackingTitle)
   }
 
   async function allerRdvsSemaineFuture() {
-    const DEBUT_RDVS_FUTURS = debutPeriode!.plus({ day: 7 })
-    const FIN_RDVS_FUTURS = finPeriode!.plus({ day: 7 })
-
-    const rdvsFuturs =
-      await rendezVousService.getRendezVousConseillerClientSide(
-        conseiller!.id,
-        DEBUT_RDVS_FUTURS,
-        FIN_RDVS_FUTURS
-      )
-    setRdvs(rdvsFuturs.map(rdvToListItem))
-    setDebutPeriode(DEBUT_RDVS_FUTURS)
-    setFinPeriode(FIN_RDVS_FUTURS)
+    setNumeroSemaineAffichee(numeroSemaineAffichee + 1)
     setTrackingTitle(`${trackingTitle} futurs`)
   }
 
+  async function allerRdvsSemaine() {
+    const rdvs = await rendezVousService.getRendezVousConseillerClientSide(
+      conseiller!.id,
+      jourDeDebutDesRdvs(),
+      jourDeFinDesRdvs()
+    )
+    setRdvs(rdvs.map(rdvToListItem))
+  }
+
+  function jourDeDebutDesRdvs() {
+    return AUJOURDHUI.plus({ day: 7 * numeroSemaineAffichee })
+  }
+
+  function jourDeFinDesRdvs() {
+    return FIN_SEMAINE_COURANTE.plus({ day: 7 * numeroSemaineAffichee })
+  }
+
   useEffect(() => {
     if (!rdvs && conseiller) {
       allerRdvsSemaineCourante()
     }
   }, [rdvs, conseiller])
 
+  useEffect(() => {
+    if (conseiller) {
+      allerRdvsSemaine()
+    }
+  }, [numeroSemaineAffichee, conseiller])
+
   return (
     <>
       <ButtonLink href={'/mes-jeunes/edition-rdv'} className='mb-6 w-fit'>
@@ -124,8 +115,8 @@ function MesRendezvous({
 
         <div className='flex items-center mt-1'>
           <p className='text-m-bold text-primary mr-6'>
-            du {debutPeriode?.toFormat('dd/MM/yyyy')} au{' '}
-            {finPeriode?.toFormat('dd/MM/yyyy')}
+            du {jourDeDebutDesRdvs().toFormat('dd/MM/yyyy')} au{' '}
+            {jourDeFinDesRdvs().toFormat('dd/MM/yyyy')}
           </p>
           <button
             aria-label='Aller à la semaine précédente'
diff --git a/services/rendez-vous.service.ts b/services/rendez-vous.service.ts
index 08c5c3a0b..91aaaeac7 100644
--- a/services/rendez-vous.service.ts
+++ b/services/rendez-vous.service.ts
@@ -44,11 +44,8 @@ export class RendezVousApiService implements RendezVousService {
     dateFin: DateTime
   ): Promise<Rdv[]> {
     const session = await getSession()
-    console.log('BEFORE URI')
     const dateDebutUrlEncoded = encodeURIComponent(dateDebut.toISO())
     const dateFinUrlEncoded = encodeURIComponent(dateFin.toISO())
-    console.log('dateDebutUrlEncoded', dateDebutUrlEncoded)
-    console.log('dateFinUrlEncoded', dateFinUrlEncoded)
     const { content: rdvs } = await this.apiClient.get<RdvJson[]>(
       `/v2/conseillers/${idConseiller}/rendezvous?dateDebut=${dateDebutUrlEncoded}&dateFin=${dateFinUrlEncoded}`,
       session!.accessToken

From e23252daf17dfeab28be68353806f6caf611b821 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Mon, 12 Sep 2022 20:49:45 +0300
Subject: [PATCH 03/14] test: fix rendez-vous.service.test.ts

---
 tests/services/rendez-vous.service.test.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/services/rendez-vous.service.test.ts b/tests/services/rendez-vous.service.test.ts
index 08f3bb0d8..0f61215d9 100644
--- a/tests/services/rendez-vous.service.test.ts
+++ b/tests/services/rendez-vous.service.test.ts
@@ -1,7 +1,6 @@
 import { ApiClient } from 'clients/api.client'
 import {
   typesDeRendezVous,
-  uneListeDeRdv,
   unRendezVous,
   unRendezVousJson,
 } from 'fixtures/rendez-vous'
@@ -13,6 +12,7 @@ import {
 } from 'services/rendez-vous.service'
 import { FakeApiClient } from 'tests/utils/fakeApiClient'
 import { ApiError } from 'utils/httpClient'
+import { DateTime } from 'luxon'
 
 jest.mock('next-auth/react', () => ({
   getSession: jest.fn(async () => ({
@@ -147,19 +147,18 @@ describe('RendezVousApiService', () => {
     })
   })
   describe('.getRendezVousConseiller', () => {
-    it('renvoie les rendez-vous d’un conseiller sur une période définie', async () => {
+    it('url encode les date en paramètres et renvoie les rendez-vous d’un conseiller sur une période définie', async () => {
       // Given
       const accessToken = 'accessToken'
       const listeRdvs = [unRendezVousJson()]
       ;(apiClient.get as jest.Mock).mockResolvedValue({
         content: listeRdvs,
       })
-      const dateDebut = '2022-08-23'
-      const dateFin = '2022-08-29'
+      const dateDebut = DateTime.fromJSDate(new Date(2022, 9, 23))
+      const dateFin = DateTime.fromJSDate(new Date(2022, 9, 29))
 
       // When
-      const actual = await rendezVousService.getRendezVousConseillerServerSide(
-        'id-conseiller',
+      const actual = await rendezVousService.getRendezVousConseillerClientSide(
         accessToken,
         dateDebut,
         dateFin
@@ -167,7 +166,7 @@ describe('RendezVousApiService', () => {
 
       // Then
       expect(apiClient.get).toHaveBeenCalledWith(
-        `/v2/conseillers/id-conseiller/rendezvous?dateDebut=${dateDebut}&dateFin=${dateFin}`,
+        `/v2/conseillers/accessToken/rendezvous?dateDebut=2022-10-23T00%3A00%3A00.000%2B03%3A00&dateFin=2022-10-29T00%3A00%3A00.000%2B03%3A00`,
         accessToken
       )
       expect(actual).toEqual([unRendezVous()])

From c575fadbc502740770b5281d282c227aa6e07389 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 12:34:30 +0200
Subject: [PATCH 04/14] refactor: remove second useEffect for better
 readability

---
 pages/mes-rendezvous.tsx | 44 +++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index c9624ea84..a4f5f0815 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -49,51 +49,53 @@ function MesRendezvous({
   if (messageEnvoiGroupeSuccess) initialTracking += ' - Succès envoi message'
   const [trackingTitle, setTrackingTitle] = useState<string>(initialTracking)
 
-  useMatomo(trackingTitle)
-
   async function allerRdvsPasses() {
-    setNumeroSemaineAffichee(numeroSemaineAffichee - 1)
+    const numeroSemainePassee = numeroSemaineAffichee - 1
+    await chargerRdvsSemaine(numeroSemainePassee)
+    setNumeroSemaineAffichee(numeroSemainePassee)
     setTrackingTitle(`${trackingTitle} passés`)
   }
 
   async function allerRdvsSemaineCourante() {
-    setNumeroSemaineAffichee(0)
+    const numeroSemaineCourante = 0
+    await chargerRdvsSemaine(numeroSemaineCourante)
+    setNumeroSemaineAffichee(numeroSemaineCourante)
     setTrackingTitle(trackingTitle)
   }
 
   async function allerRdvsSemaineFuture() {
-    setNumeroSemaineAffichee(numeroSemaineAffichee + 1)
+    const numeroSemaineFuture = numeroSemaineAffichee + 1
+    await chargerRdvsSemaine(numeroSemaineFuture)
+    setNumeroSemaineAffichee(numeroSemaineFuture)
     setTrackingTitle(`${trackingTitle} futurs`)
   }
 
-  async function allerRdvsSemaine() {
+  async function chargerRdvsSemaine(numeroSemaine: number) {
     const rdvs = await rendezVousService.getRendezVousConseillerClientSide(
       conseiller!.id,
-      jourDeDebutDesRdvs(),
-      jourDeFinDesRdvs()
+      jourDeDebutDesRdvs(numeroSemaine),
+      jourDeFinDesRdvs(numeroSemaine)
     )
     setRdvs(rdvs.map(rdvToListItem))
   }
 
-  function jourDeDebutDesRdvs() {
-    return AUJOURDHUI.plus({ day: 7 * numeroSemaineAffichee })
+  function jourDeDebutDesRdvs(numeroSemaine?: number) {
+    return AUJOURDHUI.plus({
+      day: 7 * (numeroSemaine ?? numeroSemaineAffichee),
+    })
   }
 
-  function jourDeFinDesRdvs() {
-    return FIN_SEMAINE_COURANTE.plus({ day: 7 * numeroSemaineAffichee })
+  function jourDeFinDesRdvs(numeroSemaine?: number) {
+    return FIN_SEMAINE_COURANTE.plus({
+      day: 7 * (numeroSemaine ?? numeroSemaineAffichee),
+    })
   }
 
-  useEffect(() => {
-    if (!rdvs && conseiller) {
-      allerRdvsSemaineCourante()
-    }
-  }, [rdvs, conseiller])
+  useMatomo(trackingTitle)
 
   useEffect(() => {
-    if (conseiller) {
-      allerRdvsSemaine()
-    }
-  }, [numeroSemaineAffichee, conseiller])
+    if (!rdvs && conseiller) allerRdvsSemaineCourante()
+  }, [rdvs, conseiller])
 
   return (
     <>

From 5913f92631e0580af75909b9b6442790541d9fff Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 15:26:08 +0200
Subject: [PATCH 05/14] test: update MesRendezvous.page.test.tsx

---
 tests/pages/MesRendezvous.page.test.tsx | 203 +++++++++++-------------
 1 file changed, 97 insertions(+), 106 deletions(-)

diff --git a/tests/pages/MesRendezvous.page.test.tsx b/tests/pages/MesRendezvous.page.test.tsx
index 8628d770d..5bf04139c 100644
--- a/tests/pages/MesRendezvous.page.test.tsx
+++ b/tests/pages/MesRendezvous.page.test.tsx
@@ -1,14 +1,10 @@
-import { screen } from '@testing-library/react'
+import { act, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { DateTime } from 'luxon'
 import { GetServerSidePropsContext } from 'next/types'
 import React from 'react'
 
-import {
-  desRdvListItems,
-  unRdvListItem,
-  unRendezVous,
-} from 'fixtures/rendez-vous'
+import { unRendezVous } from 'fixtures/rendez-vous'
 import { mockedRendezVousService } from 'fixtures/services'
 import MesRendezvous, { getServerSideProps } from 'pages/mes-rendezvous'
 import { RendezVousService } from 'services/rendez-vous.service'
@@ -21,37 +17,50 @@ jest.mock('utils/injectionDependances/withDependance')
 
 describe('MesRendezvous', () => {
   describe('client side', () => {
-    const AUJOURDHUI = '2022-08-24'
-    const FIN_SEMAINE_COURANTE = '2022-08-30'
+    const AOUT_25_0H = DateTime.fromISO('2022-08-25T00:00:00.000+02:00')
+    const AOUT_31_23H = DateTime.fromISO('2022-08-31T23:59:59.999+02:00')
+    const SEPTEMBRE_1_0H = DateTime.fromISO('2022-09-01T00:00:00.000+02:00')
+    const SEPTEMBRE_1_14H = DateTime.fromISO('2022-09-01T14:00:00.000+02:00')
+    const SEPTEMBRE_7_23H = DateTime.fromISO('2022-09-07T23:59:59.999+02:00')
+    const SEPTEMBRE_8_0H = DateTime.fromISO('2022-09-08T00:00:00.000+02:00')
+    const SEPTEMBRE_14_23H = DateTime.fromISO('2022-09-14T23:59:59.999+02:00')
 
-    const rendezVousSemaineCourante = [
-      unRdvListItem({ id: '1', date: '2022-08-24T10:00:00.000Z' }),
-      unRdvListItem({ id: '2', date: '2022-08-26T10:00:00.000Z' }),
-      unRdvListItem({ id: '3', date: '2022-08-30T10:00:00.000Z' }),
-    ]
+    let rendezVousService: RendezVousService
 
-    describe('contenu', () => {
-      beforeEach(() => {
-        renderWithContexts(
-          <MesRendezvous
-            rendezVous={rendezVousSemaineCourante}
-            pageTitle=''
-            dateDebut={AUJOURDHUI}
-            dateFin={FIN_SEMAINE_COURANTE}
-          />
-        )
-      })
+    beforeEach(() => {
+      jest.spyOn(DateTime, 'now').mockReturnValue(SEPTEMBRE_1_14H)
+    })
 
+    describe('contenu', () => {
       it('a un lien pour fixer un rendez-vous', () => {
+        // Given
+        rendezVousService = mockedRendezVousService()
+        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
+
+        renderWithContexts(<MesRendezvous pageTitle='' />, {
+          customDependances: { rendezVousService },
+        })
+
+        // When
         const addRdv = screen.getByRole('link', {
           name: 'Fixer un rendez-vous',
         })
 
+        // Then
         expect(addRdv).toBeInTheDocument()
         expect(addRdv).toHaveAttribute('href', '/mes-jeunes/edition-rdv')
       })
 
       it('a deux boutons de navigation', () => {
+        // Given
+        rendezVousService = mockedRendezVousService()
+        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
+
+        renderWithContexts(<MesRendezvous pageTitle='' />, {
+          customDependances: { rendezVousService },
+        })
+
+        // When
         const semaineFutures = screen.getByRole('button', {
           name: 'Aller à la semaine suivante',
         })
@@ -60,37 +69,70 @@ describe('MesRendezvous', () => {
           name: 'Aller à la semaine précédente',
         })
 
+        // Then
         expect(semaineFutures).toBeInTheDocument()
         expect(semainePassees).toBeInTheDocument()
       })
 
-      it('affiche la semaine courante par défaut', () => {
-        const table = screen.getByRole('table')
+      it('affiche la semaine courante par défaut', async () => {
+        // Given
+        rendezVousService = mockedRendezVousService({
+          getRendezVousConseillerClientSide: jest.fn(async () => [
+            unRendezVous({ id: '1', date: '2022-09-03T09:00:00.000Z' }),
+          ]),
+        })
+        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
 
-        const rowsWithoutTableHeader = screen.getAllByRole('row').length - 1
-        expect(table).toBeInTheDocument()
-        expect(rowsWithoutTableHeader).toBe(9)
+        // When
+        await act(async () => {
+          renderWithContexts(<MesRendezvous pageTitle='' />, {
+            customDependances: { rendezVousService },
+          })
+        })
+
+        // Then
+        expect(
+          rendezVousService.getRendezVousConseillerClientSide
+        ).toHaveBeenCalledWith('1', SEPTEMBRE_1_0H, SEPTEMBRE_7_23H)
+        expect(screen.getByRole('table')).toBeInTheDocument()
+        expect(screen.getByText('samedi 3 septembre')).toBeInTheDocument()
+        expect(screen.getByText('Matin')).toBeInTheDocument()
+        expect(screen.getByText('11h00 - 125 min')).toBeInTheDocument()
       })
 
       it('au clic affiche la semaine courante', async () => {
+        // Given
+        rendezVousService = mockedRendezVousService({
+          getRendezVousConseillerClientSide: jest.fn(async () => [
+            unRendezVous({ id: '1', date: '2022-09-03T09:00:00.000Z' }),
+          ]),
+        })
+        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
+
+        await act(async () => {
+          renderWithContexts(<MesRendezvous pageTitle='' />, {
+            customDependances: { rendezVousService },
+          })
+        })
+
+        // When
         const buttonRdvsSemaineCourante = screen.getByRole('button', {
           name: 'Aller à la Semaine en cours',
         })
 
+        // When
         await userEvent.click(buttonRdvsSemaineCourante)
 
-        const table = screen.getByRole('table')
-
-        const rowsWithoutTableHeader = screen.getAllByRole('row').length - 1
-
-        expect(table).toBeInTheDocument()
-        expect(rowsWithoutTableHeader).toBe(9)
+        // Then
+        expect(screen.getByRole('table')).toBeInTheDocument()
+        // Service should be called twice: on page display and on button click
+        expect(
+          rendezVousService.getRendezVousConseillerClientSide
+        ).toBeCalledTimes(2)
       })
     })
 
     describe('rendez-vous passés', () => {
-      let rendezVousService: RendezVousService
-
       it('affiche les rdvs de la semaine précédente quand on clique sur le bouton pour aller aux rendez-vous précédents', async () => {
         // Given
         rendezVousService = mockedRendezVousService({
@@ -99,29 +141,14 @@ describe('MesRendezvous', () => {
           ]),
         })
         ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
-        const date = DateTime.fromFormat('2022-09-01', 'yyyy-MM-dd', {
-          locale: 'fr-FR',
-        })
 
-        jest.spyOn(DateTime, 'fromFormat').mockReturnValue(date)
-
-        const rendezVousPasses = desRdvListItems()
-
-        renderWithContexts(
-          <MesRendezvous
-            rendezVous={rendezVousPasses}
-            pageTitle=''
-            dateDebut={''}
-            dateFin={''}
-          />,
-          { customDependances: { rendezVousService } }
-        )
+        renderWithContexts(<MesRendezvous pageTitle='' />, {
+          customDependances: { rendezVousService },
+        })
 
         const rdvsPassesButton = screen.getByRole('button', {
           name: 'Aller à la semaine précédente',
         })
-        const table = screen.getByRole('table')
-        const rowsWithoutHeader = screen.getAllByRole('row').length - 1
 
         // When
         await userEvent.click(rdvsPassesButton)
@@ -129,47 +156,31 @@ describe('MesRendezvous', () => {
         // Then
         expect(
           rendezVousService.getRendezVousConseillerClientSide
-        ).toHaveBeenCalledWith('1', '2022-08-25', '2022-08-31')
-        expect(table).toBeInTheDocument()
-        expect(rowsWithoutHeader).toBe(6)
+        ).toHaveBeenLastCalledWith('1', AOUT_25_0H, AOUT_31_23H)
+        expect(screen.getByRole('table')).toBeInTheDocument()
+        expect(screen.getByText('jeudi 25 août')).toBeInTheDocument()
+        expect(screen.getByText('Matin')).toBeInTheDocument()
+        expect(screen.getByText('12h00 - 125 min')).toBeInTheDocument()
       })
     })
 
     describe('rendez-vous futurs', () => {
-      let rendezVousService: RendezVousService
-
       it('affiche les rdvs de la semaine suivante quand on clique sur le bouton pour aller à la semaine suivante', async () => {
         // Given
         rendezVousService = mockedRendezVousService({
           getRendezVousConseillerClientSide: jest.fn(async () => [
-            unRendezVous({ id: '1', date: '2022-09-14T10:00:00.000Z' }),
+            unRendezVous({ id: '1', date: '2022-09-14T14:00:00.000Z' }),
           ]),
         })
         ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
-        const date = DateTime.fromFormat('2022-09-01', 'yyyy-MM-dd', {
-          locale: 'fr-FR',
-        })
 
-        jest.spyOn(DateTime, 'fromFormat').mockReturnValue(date)
-        const rendezVousFuturs = [
-          unRdvListItem({ id: '1', date: '2022-09-14T10:00:00.000Z' }),
-        ]
-
-        renderWithContexts(
-          <MesRendezvous
-            rendezVous={rendezVousFuturs}
-            pageTitle=''
-            dateDebut={''}
-            dateFin={''}
-          />,
-          { customDependances: { rendezVousService } }
-        )
+        renderWithContexts(<MesRendezvous pageTitle='' />, {
+          customDependances: { rendezVousService },
+        })
 
         const rdvsFutursButton = screen.getByRole('button', {
           name: 'Aller à la semaine suivante',
         })
-        const table = screen.getByRole('table')
-        const rowsWithoutHeader = screen.getAllByRole('row').length - 1
 
         // When
         await userEvent.click(rdvsFutursButton)
@@ -177,23 +188,16 @@ describe('MesRendezvous', () => {
         // Then
         expect(
           rendezVousService.getRendezVousConseillerClientSide
-        ).toHaveBeenCalledWith('1', '2022-09-02', '2022-09-08')
-        expect(table).toBeInTheDocument()
-        expect(rowsWithoutHeader).toBe(3)
+        ).toHaveBeenLastCalledWith('1', SEPTEMBRE_8_0H, SEPTEMBRE_14_23H)
+        expect(screen.getByRole('table')).toBeInTheDocument()
+        expect(screen.getByText('mercredi 14 septembre')).toBeInTheDocument()
+        expect(screen.getByText('Après-midi')).toBeInTheDocument()
+        expect(screen.getByText('16h00 - 125 min')).toBeInTheDocument()
       })
     })
   })
 
   describe('server side', () => {
-    beforeEach(() => {
-      const rendezVousService = mockedRendezVousService({
-        getRendezVousConseillerServerSide: jest.fn(async () => [
-          unRendezVous(),
-        ]),
-      })
-      ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
-    })
-
     describe('Pour un conseiller Pole Emploi', () => {
       it('renvoie une 404', async () => {
         // Given
@@ -214,12 +218,8 @@ describe('MesRendezvous', () => {
     })
 
     describe('quand le conseiller est connecté', () => {
-      it('récupère les rendez-vous du conseiller', async () => {
+      it('récupère le titre de la page', async () => {
         // Given
-        const date = DateTime.fromFormat('2022-08-26', 'yyyy-MM-dd', {
-          locale: 'fr-FR',
-        })
-        jest.spyOn(DateTime, 'now').mockReturnValue(date)
         ;(withMandatorySessionOrRedirect as jest.Mock).mockResolvedValue({
           validSession: true,
           session: { user: { structure: 'MILO' } },
@@ -233,15 +233,6 @@ describe('MesRendezvous', () => {
         // Then
         expect(actual).toEqual({
           props: {
-            dateDebut: '26/08/2022',
-            dateFin: '01/09/2022',
-            rendezVous: [
-              expect.objectContaining({
-                beneficiaires: 'kenji Jirac',
-                idCreateur: '1',
-                type: 'Autre',
-              }),
-            ],
             pageTitle: 'Tableau de bord - Mes rendez-vous',
             pageHeader: 'Mes rendez-vous',
           },

From 23ca50c3f83e1e3d1c024a24461a84180b189711 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 15:38:13 +0200
Subject: [PATCH 06/14] fix: fix rendez-vous.service.test.ts

---
 tests/services/rendez-vous.service.test.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/services/rendez-vous.service.test.ts b/tests/services/rendez-vous.service.test.ts
index 0f61215d9..1828d24c2 100644
--- a/tests/services/rendez-vous.service.test.ts
+++ b/tests/services/rendez-vous.service.test.ts
@@ -154,8 +154,9 @@ describe('RendezVousApiService', () => {
       ;(apiClient.get as jest.Mock).mockResolvedValue({
         content: listeRdvs,
       })
-      const dateDebut = DateTime.fromJSDate(new Date(2022, 9, 23))
-      const dateFin = DateTime.fromJSDate(new Date(2022, 9, 29))
+
+      const dateDebut = DateTime.fromISO('2022-09-01T00:00:00.000+02:00')
+      const dateFin = DateTime.fromISO('2022-09-07T23:59:59.999+02:00')
 
       // When
       const actual = await rendezVousService.getRendezVousConseillerClientSide(
@@ -166,7 +167,7 @@ describe('RendezVousApiService', () => {
 
       // Then
       expect(apiClient.get).toHaveBeenCalledWith(
-        `/v2/conseillers/accessToken/rendezvous?dateDebut=2022-10-23T00%3A00%3A00.000%2B03%3A00&dateFin=2022-10-29T00%3A00%3A00.000%2B03%3A00`,
+        `/v2/conseillers/accessToken/rendezvous?dateDebut=2022-09-01T00%3A00%3A00.000%2B02%3A00&dateFin=2022-09-07T23%3A59%3A59.999%2B02%3A00`,
         accessToken
       )
       expect(actual).toEqual([unRendezVous()])

From a5a434f24ab30fcdf8017a4938df99671d8e2de7 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 15:44:48 +0200
Subject: [PATCH 07/14] fix: handle null check in  mes-rendezvous.tsx

---
 pages/mes-rendezvous.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index a4f5f0815..04e9dded6 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -76,7 +76,7 @@ function MesRendezvous({
       jourDeDebutDesRdvs(numeroSemaine),
       jourDeFinDesRdvs(numeroSemaine)
     )
-    setRdvs(rdvs.map(rdvToListItem))
+    if (rdvs) setRdvs(rdvs.map(rdvToListItem))
   }
 
   function jourDeDebutDesRdvs(numeroSemaine?: number) {

From b1f9c6eb1d57dfab78fb2701114bf1ec5dd1ca33 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 15:52:08 +0200
Subject: [PATCH 08/14] fix: remove obsolete method from
 mockedRendezVousService

---
 fixtures/services.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fixtures/services.ts b/fixtures/services.ts
index 1074c35b7..99fc84e2f 100644
--- a/fixtures/services.ts
+++ b/fixtures/services.ts
@@ -71,7 +71,6 @@ export function mockedRendezVousService(
   overrides: Partial<RendezVousService> = {}
 ): RendezVousService {
   const defaults: RendezVousService = {
-    getRendezVousConseillerServerSide: jest.fn(),
     getRendezVousConseillerClientSide: jest.fn(),
     getRendezVousJeune: jest.fn(),
     getDetailsRendezVous: jest.fn(),

From d2e452ba8b80d59e5ded5d4e20cb6c63cf3409a4 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 15:59:28 +0200
Subject: [PATCH 09/14] chore: fix Sonar smell

---
 pages/mes-rendezvous.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 04e9dded6..917418437 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -71,12 +71,13 @@ function MesRendezvous({
   }
 
   async function chargerRdvsSemaine(numeroSemaine: number) {
-    const rdvs = await rendezVousService.getRendezVousConseillerClientSide(
-      conseiller!.id,
-      jourDeDebutDesRdvs(numeroSemaine),
-      jourDeFinDesRdvs(numeroSemaine)
-    )
-    if (rdvs) setRdvs(rdvs.map(rdvToListItem))
+    const rdvsSemaine =
+      await rendezVousService.getRendezVousConseillerClientSide(
+        conseiller!.id,
+        jourDeDebutDesRdvs(numeroSemaine),
+        jourDeFinDesRdvs(numeroSemaine)
+      )
+    if (rdvsSemaine) setRdvs(rdvsSemaine.map(rdvToListItem))
   }
 
   function jourDeDebutDesRdvs(numeroSemaine?: number) {

From 7984f6840b78a117d3f71e68cedfe757c694021a Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 17:51:46 +0200
Subject: [PATCH 10/14] refactor: handle code review returns

---
 pages/mes-rendezvous.tsx | 57 ++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 917418437..38c2a8292 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -37,10 +37,9 @@ function MesRendezvous({
   const [conseiller] = useConseiller()
 
   const AUJOURDHUI = DateTime.now().startOf('day')
-  const FIN_SEMAINE_COURANTE = AUJOURDHUI.plus({ day: 6 }).endOf('day')
 
-  const [numeroSemaineAffichee, setNumeroSemaineAffichee] = useState<number>(0)
-  const [rdvs, setRdvs] = useState<RdvListItem[] | undefined>()
+  const [index7JoursAffiches, setIndex7JoursAffiches] = useState<number>(0)
+  const [rdvs, setRdvs] = useState<RdvListItem[]>([])
 
   let initialTracking = `Mes rendez-vous`
   if (creationSuccess) initialTracking += ' - Creation rdv succès'
@@ -49,54 +48,54 @@ function MesRendezvous({
   if (messageEnvoiGroupeSuccess) initialTracking += ' - Succès envoi message'
   const [trackingTitle, setTrackingTitle] = useState<string>(initialTracking)
 
-  async function allerRdvsPasses() {
-    const numeroSemainePassee = numeroSemaineAffichee - 1
-    await chargerRdvsSemaine(numeroSemainePassee)
-    setNumeroSemaineAffichee(numeroSemainePassee)
+  async function allerRdvs7JoursPrecedants() {
+    const index7JoursPrecedants = index7JoursAffiches - 1
+    await chargerRdvs7Jours(index7JoursPrecedants)
+    setIndex7JoursAffiches(index7JoursPrecedants)
     setTrackingTitle(`${trackingTitle} passés`)
   }
 
-  async function allerRdvsSemaineCourante() {
-    const numeroSemaineCourante = 0
-    await chargerRdvsSemaine(numeroSemaineCourante)
-    setNumeroSemaineAffichee(numeroSemaineCourante)
+  async function allerRdvs7JoursActuels() {
+    const index7JoursActuels = 0
+    await chargerRdvs7Jours(index7JoursActuels)
+    setIndex7JoursAffiches(index7JoursActuels)
     setTrackingTitle(trackingTitle)
   }
 
-  async function allerRdvsSemaineFuture() {
-    const numeroSemaineFuture = numeroSemaineAffichee + 1
-    await chargerRdvsSemaine(numeroSemaineFuture)
-    setNumeroSemaineAffichee(numeroSemaineFuture)
+  async function allerRdvs7JoursSuivants() {
+    const index7JoursSuivants = index7JoursAffiches + 1
+    await chargerRdvs7Jours(index7JoursSuivants)
+    setIndex7JoursAffiches(index7JoursSuivants)
     setTrackingTitle(`${trackingTitle} futurs`)
   }
 
-  async function chargerRdvsSemaine(numeroSemaine: number) {
+  async function chargerRdvs7Jours(index7Jours: number) {
     const rdvsSemaine =
       await rendezVousService.getRendezVousConseillerClientSide(
         conseiller!.id,
-        jourDeDebutDesRdvs(numeroSemaine),
-        jourDeFinDesRdvs(numeroSemaine)
+        jourDeDebutDesRdvs(index7Jours),
+        jourDeFinDesRdvs(index7Jours)
       )
     if (rdvsSemaine) setRdvs(rdvsSemaine.map(rdvToListItem))
   }
 
-  function jourDeDebutDesRdvs(numeroSemaine?: number) {
+  function jourDeDebutDesRdvs(index7Jours?: number) {
     return AUJOURDHUI.plus({
-      day: 7 * (numeroSemaine ?? numeroSemaineAffichee),
+      day: 7 * (index7Jours ?? index7JoursAffiches),
     })
   }
 
-  function jourDeFinDesRdvs(numeroSemaine?: number) {
-    return FIN_SEMAINE_COURANTE.plus({
-      day: 7 * (numeroSemaine ?? numeroSemaineAffichee),
-    })
+  function jourDeFinDesRdvs(index7Jours?: number) {
+    return jourDeDebutDesRdvs(index7Jours ?? index7JoursAffiches)
+      .plus({ day: 6 })
+      .endOf('day')
   }
 
   useMatomo(trackingTitle)
 
   useEffect(() => {
-    if (!rdvs && conseiller) allerRdvsSemaineCourante()
-  }, [rdvs, conseiller])
+    if (conseiller) chargerRdvs7Jours(index7JoursAffiches)
+  }, [conseiller, index7JoursAffiches])
 
   return (
     <>
@@ -110,7 +109,7 @@ function MesRendezvous({
           <Button
             type='button'
             style={ButtonStyle.SECONDARY}
-            onClick={allerRdvsSemaineCourante}
+            onClick={allerRdvs7JoursActuels}
           >
             <span className='sr-only'>Aller à la</span> Semaine en cours
           </Button>
@@ -123,7 +122,7 @@ function MesRendezvous({
           </p>
           <button
             aria-label='Aller à la semaine précédente'
-            onClick={allerRdvsPasses}
+            onClick={allerRdvs7JoursPrecedants}
           >
             <IconComponent
               name={IconName.ChevronLeft}
@@ -134,7 +133,7 @@ function MesRendezvous({
           </button>
           <button
             aria-label='Aller à la semaine suivante'
-            onClick={allerRdvsSemaineFuture}
+            onClick={allerRdvs7JoursSuivants}
           >
             <IconComponent
               name={IconName.ChevronRight}

From 999159be57830c55424008aa7c1d367eaf5ae519 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 17:54:47 +0200
Subject: [PATCH 11/14] refactor: BGSR

---
 pages/mes-rendezvous.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 38c2a8292..8f2bc4b5f 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -70,13 +70,13 @@ function MesRendezvous({
   }
 
   async function chargerRdvs7Jours(index7Jours: number) {
-    const rdvsSemaine =
+    const rdvs7Jours =
       await rendezVousService.getRendezVousConseillerClientSide(
         conseiller!.id,
         jourDeDebutDesRdvs(index7Jours),
         jourDeFinDesRdvs(index7Jours)
       )
-    if (rdvsSemaine) setRdvs(rdvsSemaine.map(rdvToListItem))
+    if (rdvs7Jours) setRdvs(rdvs7Jours.map(rdvToListItem))
   }
 
   function jourDeDebutDesRdvs(index7Jours?: number) {

From a6235229fb7cb00e509beb26ccae6a673d31fb28 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 18:33:01 +0200
Subject: [PATCH 12/14] refactor: mutualize set up and expects

---
 tests/pages/MesRendezvous.page.test.tsx | 167 +++++++++---------------
 1 file changed, 65 insertions(+), 102 deletions(-)

diff --git a/tests/pages/MesRendezvous.page.test.tsx b/tests/pages/MesRendezvous.page.test.tsx
index 5bf04139c..6798346c0 100644
--- a/tests/pages/MesRendezvous.page.test.tsx
+++ b/tests/pages/MesRendezvous.page.test.tsx
@@ -31,16 +31,17 @@ describe('MesRendezvous', () => {
       jest.spyOn(DateTime, 'now').mockReturnValue(SEPTEMBRE_1_14H)
     })
 
-    describe('contenu', () => {
-      it('a un lien pour fixer un rendez-vous', () => {
-        // Given
+    describe('navigation', () => {
+      beforeEach(() => {
         rendezVousService = mockedRendezVousService()
         ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
 
         renderWithContexts(<MesRendezvous pageTitle='' />, {
           customDependances: { rendezVousService },
         })
+      })
 
+      it('a un lien pour fixer un rendez-vous', () => {
         // When
         const addRdv = screen.getByRole('link', {
           name: 'Fixer un rendez-vous',
@@ -52,14 +53,6 @@ describe('MesRendezvous', () => {
       })
 
       it('a deux boutons de navigation', () => {
-        // Given
-        rendezVousService = mockedRendezVousService()
-        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
-
-        renderWithContexts(<MesRendezvous pageTitle='' />, {
-          customDependances: { rendezVousService },
-        })
-
         // When
         const semaineFutures = screen.getByRole('button', {
           name: 'Aller à la semaine suivante',
@@ -73,126 +66,96 @@ describe('MesRendezvous', () => {
         expect(semaineFutures).toBeInTheDocument()
         expect(semainePassees).toBeInTheDocument()
       })
+    })
 
-      it('affiche la semaine courante par défaut', async () => {
-        // Given
+    describe('rendez-vous', () => {
+      beforeEach(async () => {
         rendezVousService = mockedRendezVousService({
-          getRendezVousConseillerClientSide: jest.fn(async () => [
-            unRendezVous({ id: '1', date: '2022-09-03T09:00:00.000Z' }),
-          ]),
+          getRendezVousConseillerClientSide: jest
+              .fn()
+              .mockImplementation(function (_, dateDebut) {
+                const rendezVous = unRendezVous({
+                  date: dateDebut.plus({ day: 3 }).toISO(),
+                })
+                return [rendezVous]
+              }),
         })
-        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
 
-        // When
         await act(async () => {
           renderWithContexts(<MesRendezvous pageTitle='' />, {
             customDependances: { rendezVousService },
           })
         })
+      })
 
-        // Then
-        expect(
-          rendezVousService.getRendezVousConseillerClientSide
-        ).toHaveBeenCalledWith('1', SEPTEMBRE_1_0H, SEPTEMBRE_7_23H)
+      afterEach(() => {
         expect(screen.getByRole('table')).toBeInTheDocument()
-        expect(screen.getByText('samedi 3 septembre')).toBeInTheDocument()
         expect(screen.getByText('Matin')).toBeInTheDocument()
-        expect(screen.getByText('11h00 - 125 min')).toBeInTheDocument()
+        expect(screen.getByText('00h00 - 125 min')).toBeInTheDocument()
       })
 
-      it('au clic affiche la semaine courante', async () => {
-        // Given
-        rendezVousService = mockedRendezVousService({
-          getRendezVousConseillerClientSide: jest.fn(async () => [
-            unRendezVous({ id: '1', date: '2022-09-03T09:00:00.000Z' }),
-          ]),
-        })
-        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
-
-        await act(async () => {
-          renderWithContexts(<MesRendezvous pageTitle='' />, {
-            customDependances: { rendezVousService },
-          })
-        })
+      describe('des 7 jours actuels', () => {
+        it('sont affichés par défaut', async () => {
+          // Then
+          expect(
+            rendezVousService.getRendezVousConseillerClientSide
+          ).toHaveBeenCalledWith('1', SEPTEMBRE_1_0H, SEPTEMBRE_7_23H)
 
-        // When
-        const buttonRdvsSemaineCourante = screen.getByRole('button', {
-          name: 'Aller à la Semaine en cours',
+          expect(screen.getByText('dimanche 4 septembre')).toBeInTheDocument()
         })
 
-        // When
-        await userEvent.click(buttonRdvsSemaineCourante)
-
-        // Then
-        expect(screen.getByRole('table')).toBeInTheDocument()
-        // Service should be called twice: on page display and on button click
-        expect(
-          rendezVousService.getRendezVousConseillerClientSide
-        ).toBeCalledTimes(2)
-      })
-    })
+        it('au clic sur le bouton Semaine en cours, les affiche de nouveaux', async () => {
+          // Given
+          const buttonRdvsSemaineCourante = screen.getByRole('button', {
+            name: 'Aller à la Semaine en cours',
+          })
 
-    describe('rendez-vous passés', () => {
-      it('affiche les rdvs de la semaine précédente quand on clique sur le bouton pour aller aux rendez-vous précédents', async () => {
-        // Given
-        rendezVousService = mockedRendezVousService({
-          getRendezVousConseillerClientSide: jest.fn(async () => [
-            unRendezVous({ id: '1', date: '2022-08-25T10:00:00.000Z' }),
-          ]),
-        })
-        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
+          // When
+          await userEvent.click(buttonRdvsSemaineCourante)
 
-        renderWithContexts(<MesRendezvous pageTitle='' />, {
-          customDependances: { rendezVousService },
+          // Then service should be called twice: on page display and on button click
+          expect(
+            rendezVousService.getRendezVousConseillerClientSide
+          ).toBeCalledTimes(2)
         })
+      })
 
-        const rdvsPassesButton = screen.getByRole('button', {
-          name: 'Aller à la semaine précédente',
-        })
+      describe('des 7 jours précédants', () => {
+        it('affiche les rdvs des 7 jours précédants quand on clique sur le bouton pour aller aux rendez-vous précédents', async () => {
+          // Given
+          const rdvsPassesButton = screen.getByRole('button', {
+            name: 'Aller à la semaine précédente',
+          })
 
-        // When
-        await userEvent.click(rdvsPassesButton)
+          // When
+          await userEvent.click(rdvsPassesButton)
 
-        // Then
-        expect(
-          rendezVousService.getRendezVousConseillerClientSide
-        ).toHaveBeenLastCalledWith('1', AOUT_25_0H, AOUT_31_23H)
-        expect(screen.getByRole('table')).toBeInTheDocument()
-        expect(screen.getByText('jeudi 25 août')).toBeInTheDocument()
-        expect(screen.getByText('Matin')).toBeInTheDocument()
-        expect(screen.getByText('12h00 - 125 min')).toBeInTheDocument()
-      })
-    })
+          // Then
+          expect(
+              rendezVousService.getRendezVousConseillerClientSide
+          ).toHaveBeenLastCalledWith('1', AOUT_25_0H, AOUT_31_23H)
 
-    describe('rendez-vous futurs', () => {
-      it('affiche les rdvs de la semaine suivante quand on clique sur le bouton pour aller à la semaine suivante', async () => {
-        // Given
-        rendezVousService = mockedRendezVousService({
-          getRendezVousConseillerClientSide: jest.fn(async () => [
-            unRendezVous({ id: '1', date: '2022-09-14T14:00:00.000Z' }),
-          ]),
+          expect(screen.getByText('dimanche 28 août')).toBeInTheDocument()
         })
-        ;(withDependance as jest.Mock).mockReturnValue(rendezVousService)
+      })
 
-        renderWithContexts(<MesRendezvous pageTitle='' />, {
-          customDependances: { rendezVousService },
-        })
+      describe('des 7 jours suivants', () => {
+        it('affiche les rdvs des 7 jours précédants quand on clique sur le bouton pour aller à la semaine suivante', async () => {
+          // Given
+          const rdvsFutursButton = screen.getByRole('button', {
+            name: 'Aller à la semaine suivante',
+          })
 
-        const rdvsFutursButton = screen.getByRole('button', {
-          name: 'Aller à la semaine suivante',
-        })
+          // When
+          await userEvent.click(rdvsFutursButton)
 
-        // When
-        await userEvent.click(rdvsFutursButton)
+          // Then
+          expect(
+              rendezVousService.getRendezVousConseillerClientSide
+          ).toHaveBeenLastCalledWith('1', SEPTEMBRE_8_0H, SEPTEMBRE_14_23H)
 
-        // Then
-        expect(
-          rendezVousService.getRendezVousConseillerClientSide
-        ).toHaveBeenLastCalledWith('1', SEPTEMBRE_8_0H, SEPTEMBRE_14_23H)
-        expect(screen.getByRole('table')).toBeInTheDocument()
-        expect(screen.getByText('mercredi 14 septembre')).toBeInTheDocument()
-        expect(screen.getByText('Après-midi')).toBeInTheDocument()
-        expect(screen.getByText('16h00 - 125 min')).toBeInTheDocument()
+          expect(screen.getByText('dimanche 11 septembre')).toBeInTheDocument()
+        })
       })
     })
   })

From e1f95697666d1d99e7be6aa3e9fdf799437cd0e9 Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 18:36:40 +0200
Subject: [PATCH 13/14] refactor: handle last code revue returns

---
 fixtures/services.ts                       |  2 +-
 pages/mes-rendezvous.tsx                   |  6 ++---
 services/rendez-vous.service.ts            |  4 ++--
 tests/pages/MesRendezvous.page.test.tsx    | 26 ++++++++++------------
 tests/services/rendez-vous.service.test.ts |  2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/fixtures/services.ts b/fixtures/services.ts
index 99fc84e2f..a74a99ea2 100644
--- a/fixtures/services.ts
+++ b/fixtures/services.ts
@@ -71,7 +71,7 @@ export function mockedRendezVousService(
   overrides: Partial<RendezVousService> = {}
 ): RendezVousService {
   const defaults: RendezVousService = {
-    getRendezVousConseillerClientSide: jest.fn(),
+    getRendezVousConseiller: jest.fn(),
     getRendezVousJeune: jest.fn(),
     getDetailsRendezVous: jest.fn(),
     getTypesRendezVous: jest.fn(),
diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 8f2bc4b5f..10e4f4c10 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -71,7 +71,7 @@ function MesRendezvous({
 
   async function chargerRdvs7Jours(index7Jours: number) {
     const rdvs7Jours =
-      await rendezVousService.getRendezVousConseillerClientSide(
+      await rendezVousService.getRendezVousConseiller(
         conseiller!.id,
         jourDeDebutDesRdvs(index7Jours),
         jourDeFinDesRdvs(index7Jours)
@@ -79,13 +79,13 @@ function MesRendezvous({
     if (rdvs7Jours) setRdvs(rdvs7Jours.map(rdvToListItem))
   }
 
-  function jourDeDebutDesRdvs(index7Jours?: number) {
+  function jourDeDebutDesRdvs(index7Jours?: number): DateTime {
     return AUJOURDHUI.plus({
       day: 7 * (index7Jours ?? index7JoursAffiches),
     })
   }
 
-  function jourDeFinDesRdvs(index7Jours?: number) {
+  function jourDeFinDesRdvs(index7Jours?: number): DateTime {
     return jourDeDebutDesRdvs(index7Jours ?? index7JoursAffiches)
       .plus({ day: 6 })
       .endOf('day')
diff --git a/services/rendez-vous.service.ts b/services/rendez-vous.service.ts
index 91aaaeac7..554388a39 100644
--- a/services/rendez-vous.service.ts
+++ b/services/rendez-vous.service.ts
@@ -13,7 +13,7 @@ import { ApiError } from 'utils/httpClient'
 import { DateTime } from 'luxon'
 
 export interface RendezVousService {
-  getRendezVousConseillerClientSide(
+  getRendezVousConseiller(
     idConseiller: string,
     dateDebut: DateTime,
     dateFin: DateTime
@@ -38,7 +38,7 @@ export interface RendezVousService {
 export class RendezVousApiService implements RendezVousService {
   constructor(private readonly apiClient: ApiClient) {}
 
-  async getRendezVousConseillerClientSide(
+  async getRendezVousConseiller(
     idConseiller: string,
     dateDebut: DateTime,
     dateFin: DateTime
diff --git a/tests/pages/MesRendezvous.page.test.tsx b/tests/pages/MesRendezvous.page.test.tsx
index 6798346c0..ba050f77a 100644
--- a/tests/pages/MesRendezvous.page.test.tsx
+++ b/tests/pages/MesRendezvous.page.test.tsx
@@ -71,14 +71,14 @@ describe('MesRendezvous', () => {
     describe('rendez-vous', () => {
       beforeEach(async () => {
         rendezVousService = mockedRendezVousService({
-          getRendezVousConseillerClientSide: jest
-              .fn()
-              .mockImplementation(function (_, dateDebut) {
-                const rendezVous = unRendezVous({
-                  date: dateDebut.plus({ day: 3 }).toISO(),
-                })
-                return [rendezVous]
-              }),
+          getRendezVousConseiller: jest
+            .fn()
+            .mockImplementation(function (_, dateDebut) {
+              const rendezVous = unRendezVous({
+                date: dateDebut.plus({ day: 3 }).toISO(),
+              })
+              return [rendezVous]
+            }),
         })
 
         await act(async () => {
@@ -98,7 +98,7 @@ describe('MesRendezvous', () => {
         it('sont affichés par défaut', async () => {
           // Then
           expect(
-            rendezVousService.getRendezVousConseillerClientSide
+            rendezVousService.getRendezVousConseiller
           ).toHaveBeenCalledWith('1', SEPTEMBRE_1_0H, SEPTEMBRE_7_23H)
 
           expect(screen.getByText('dimanche 4 septembre')).toBeInTheDocument()
@@ -114,9 +114,7 @@ describe('MesRendezvous', () => {
           await userEvent.click(buttonRdvsSemaineCourante)
 
           // Then service should be called twice: on page display and on button click
-          expect(
-            rendezVousService.getRendezVousConseillerClientSide
-          ).toBeCalledTimes(2)
+          expect(rendezVousService.getRendezVousConseiller).toBeCalledTimes(2)
         })
       })
 
@@ -132,7 +130,7 @@ describe('MesRendezvous', () => {
 
           // Then
           expect(
-              rendezVousService.getRendezVousConseillerClientSide
+            rendezVousService.getRendezVousConseiller
           ).toHaveBeenLastCalledWith('1', AOUT_25_0H, AOUT_31_23H)
 
           expect(screen.getByText('dimanche 28 août')).toBeInTheDocument()
@@ -151,7 +149,7 @@ describe('MesRendezvous', () => {
 
           // Then
           expect(
-              rendezVousService.getRendezVousConseillerClientSide
+            rendezVousService.getRendezVousConseiller
           ).toHaveBeenLastCalledWith('1', SEPTEMBRE_8_0H, SEPTEMBRE_14_23H)
 
           expect(screen.getByText('dimanche 11 septembre')).toBeInTheDocument()
diff --git a/tests/services/rendez-vous.service.test.ts b/tests/services/rendez-vous.service.test.ts
index 1828d24c2..0547c18ad 100644
--- a/tests/services/rendez-vous.service.test.ts
+++ b/tests/services/rendez-vous.service.test.ts
@@ -159,7 +159,7 @@ describe('RendezVousApiService', () => {
       const dateFin = DateTime.fromISO('2022-09-07T23:59:59.999+02:00')
 
       // When
-      const actual = await rendezVousService.getRendezVousConseillerClientSide(
+      const actual = await rendezVousService.getRendezVousConseiller(
         accessToken,
         dateDebut,
         dateFin

From 43b4716d75bc4b8e6ff97d7c0d34688d461228da Mon Sep 17 00:00:00 2001
From: "gabriel.adgeg" <gad@octo.com>
Date: Tue, 13 Sep 2022 18:48:50 +0200
Subject: [PATCH 14/14] fix: fix linter issue

---
 pages/mes-rendezvous.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pages/mes-rendezvous.tsx b/pages/mes-rendezvous.tsx
index 10e4f4c10..1efe27b0d 100644
--- a/pages/mes-rendezvous.tsx
+++ b/pages/mes-rendezvous.tsx
@@ -70,12 +70,11 @@ function MesRendezvous({
   }
 
   async function chargerRdvs7Jours(index7Jours: number) {
-    const rdvs7Jours =
-      await rendezVousService.getRendezVousConseiller(
-        conseiller!.id,
-        jourDeDebutDesRdvs(index7Jours),
-        jourDeFinDesRdvs(index7Jours)
-      )
+    const rdvs7Jours = await rendezVousService.getRendezVousConseiller(
+      conseiller!.id,
+      jourDeDebutDesRdvs(index7Jours),
+      jourDeFinDesRdvs(index7Jours)
+    )
     if (rdvs7Jours) setRdvs(rdvs7Jours.map(rdvToListItem))
   }