From 931074ebe3bad07011ec66ab241846c7ff4fe95f Mon Sep 17 00:00:00 2001
From: Gaetan BUSATO <gaetan.busato@gmail.com>
Date: Tue, 4 Feb 2025 14:18:13 +0100
Subject: [PATCH] =?UTF-8?q?fix(console):=20modification=20des=20requ=C3=AA?=
 =?UTF-8?q?tes=20pour=20le=20tag=20formation=20renovee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deps/getFormationEtablissementsQuery.dep.ts       | 11 ++++++++---
 .../getFormations/deps/getFormationsQuery.dep.ts      | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/server/src/modules/data/usecases/getFormationEtablissements/deps/getFormationEtablissementsQuery.dep.ts b/server/src/modules/data/usecases/getFormationEtablissements/deps/getFormationEtablissementsQuery.dep.ts
index 03b28f31c..c3a52e378 100644
--- a/server/src/modules/data/usecases/getFormationEtablissements/deps/getFormationEtablissementsQuery.dep.ts
+++ b/server/src/modules/data/usecases/getFormationEtablissements/deps/getFormationEtablissementsQuery.dep.ts
@@ -3,6 +3,7 @@ import { jsonBuildObject } from "kysely/helpers/postgres";
 import { CURRENT_IJ_MILLESIME, CURRENT_RENTREE } from "shared";
 import { TypeFormationSpecifiqueEnum } from "shared/enum/formationSpecifiqueEnum";
 import { PositionQuadrantEnum } from "shared/enum/positionQuadrantEnum";
+import { getDateRentreeScolaire } from "shared/utils/getRentreeScolaire";
 import { MAX_LIMIT } from "shared/utils/maxLimit";
 
 import { getKbdClient } from "@/db/db";
@@ -160,9 +161,13 @@ export const getFormationEtablissementsQuery = async ({
         .as("continuumEtablissement"),
       eb
         .selectFrom("formationHistorique")
-        .select("formationHistorique.cfd")
-        .whereRef("formationHistorique.cfd", "=", "formationView.cfd")
-        .where("formationHistorique.ancienCFD", "in", (eb) => eb.selectFrom("formationEtablissement").select("cfd"))
+        .innerJoin("formationView as fva", "fva.cfd", "formationHistorique.ancienCFD")
+        .select("formationHistorique.ancienCFD")
+        .where(wb => wb.and([
+          wb(wb.ref("formationHistorique.cfd"), "=", wb.ref("formationView.cfd")),
+          wb("fva.dateFermeture", "is not", null),
+          wb("fva.dateFermeture", ">", sql<Date>`${getDateRentreeScolaire(rentreeScolaire[0])}`)
+        ]))
         .limit(1)
         .as("isFormationRenovee"),
       isFormationActionPrioritaire({
diff --git a/server/src/modules/data/usecases/getFormations/deps/getFormationsQuery.dep.ts b/server/src/modules/data/usecases/getFormations/deps/getFormationsQuery.dep.ts
index 98529238b..bce8fb8b0 100644
--- a/server/src/modules/data/usecases/getFormations/deps/getFormationsQuery.dep.ts
+++ b/server/src/modules/data/usecases/getFormations/deps/getFormationsQuery.dep.ts
@@ -2,6 +2,7 @@ import { sql } from "kysely";
 import { CURRENT_IJ_MILLESIME, CURRENT_RENTREE } from "shared";
 import { TypeFormationSpecifiqueEnum } from "shared/enum/formationSpecifiqueEnum";
 import { PositionQuadrantEnum } from "shared/enum/positionQuadrantEnum";
+import { getDateRentreeScolaire } from "shared/utils/getRentreeScolaire";
 import { MAX_LIMIT } from "shared/utils/maxLimit";
 
 import { getKbdClient } from "@/db/db";
@@ -201,9 +202,13 @@ export const getFormationsQuery = async ({
       "formationHistorique.cfd as formationRenovee",
       eb
         .selectFrom("formationHistorique")
-        .select("formationHistorique.cfd")
-        .whereRef("formationHistorique.cfd", "=", "formationView.cfd")
-        .where("formationHistorique.ancienCFD", "in", (eb) => eb.selectFrom("formationEtablissement").select("cfd"))
+        .innerJoin("formationView as fva", "fva.cfd", "formationHistorique.ancienCFD")
+        .select("formationHistorique.ancienCFD")
+        .where(wb => wb.and([
+          wb(wb.ref("formationHistorique.cfd"), "=", wb.ref("formationView.cfd")),
+          wb("fva.dateFermeture", "is not", null),
+          wb("fva.dateFermeture", ">", sql<Date>`${getDateRentreeScolaire(rentreeScolaire[0])}`)
+        ]))
         .limit(1)
         .as("isFormationRenovee"),
       sql<string | null>`