Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: listes nominatives champs manquants #3851

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix: listes nominatives champs manquants #3851

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e73a46
fix: listes nominatives champs manquants
nkrmr Oct 8, 2024
aa05e8f
Merge branch 'master' into feat/tm-1519
nkrmr Oct 8, 2024
0580afc
fix: mise à jour des tests
nkrmr Oct 8, 2024
d113ff1
Merge branch 'master' into feat/tm-1519
nkrmr Oct 14, 2024
676ec6a
fix: suppression log
nkrmr Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 78 additions & 12 deletions server/src/common/actions/indicateurs/indicateurs.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ export async function getEffectifsNominatifsGenerique(
return [t];
}
};

const indicateurs = (await db
.aggregate([
{
Expand All @@ -524,7 +525,7 @@ export async function getEffectifsNominatifsGenerique(
buildDECAFilter(decaMode),
...buildEffectifMongoFilters(filters, ctx.acl.effectifsNominatifs[type]),
{
"_computed.organisme.fiable": true, // TODO : a supprimer si on permet de choisir de voir les effectifs des non fiables
"_computed.organisme.fiable": true,
}
),
},
Expand All @@ -547,13 +548,11 @@ export async function getEffectifsNominatifsGenerique(
},
},
{
$match: { "_computed.statut.parcours": { $not: { $size: 0 } } },
$match: { "_computed.statut.parcours": { $ne: [] } },
},
{
$addFields: {
statut_apprenant_at_date: {
$last: "$_computed.statut.parcours",
},
statut_apprenant_at_date: { $last: "$_computed.statut.parcours" },
},
},
{
Expand All @@ -577,11 +576,9 @@ export async function getEffectifsNominatifsGenerique(
$project: {
uai: 1,
siret: 1,
nom: {
$ifNull: ["$enseigne", "$raison_sociale"],
},
nom: { $ifNull: ["$enseigne", "$raison_sociale"] },
nature: {
$ifNull: ["$nature", "inconnue"], // On devrait plutôt remplir automatiquement la nature
$ifNull: ["$nature", "inconnue"],
},
},
},
Expand All @@ -594,6 +591,74 @@ export async function getEffectifsNominatifsGenerique(
preserveNullAndEmptyArrays: true,
},
},
{
$lookup: {
from: "formations",
let: { localCfd: "$formation.cfd", localRncp: "$formation.rncp" },
pipeline: [
{
$match: {
$expr: {
$and: [{ $eq: ["$cfd", "$$localCfd"] }, { $in: ["$$localRncp", "$rncps"] }],
},
},
},
],
as: "formation_details",
},
},
{
$unwind: {
path: "$formation_details",
preserveNullAndEmptyArrays: true,
},
},
{
$addFields: {
formation_date_debut_formation: {
$cond: {
if: { $gt: [{ $size: { $ifNull: ["$formation.periode", []] } }, 0] },
then: { $arrayElemAt: ["$formation.periode", 0] },
else: {
$min: {
$map: {
input: {
$filter: {
input: "$_computed.statut.parcours",
as: "parcours",
cond: { $eq: ["$$parcours.valeur", "INSCRIT"] },
},
},
as: "inscrit",
in: { $toInt: { $substr: [{ $toString: "$$inscrit.date" }, 0, 4] } },
},
},
},
},
},
formation_date_fin_formation: {
$cond: {
if: { $gt: [{ $size: { $ifNull: ["$formation.periode", []] } }, 0] },
then: { $arrayElemAt: ["$formation.periode", 1] },
else: {
$max: {
$map: {
input: {
$filter: {
input: "$_computed.statut.parcours",
as: "parcours",
cond: { $eq: ["$$parcours.valeur", "FIN_DE_FORMATION"] },
},
},
as: "fin_formation",
in: { $toInt: { $substr: [{ $toString: "$$fin_formation.date" }, 0, 4] } },
},
},
},
},
},
},
},
{
$project: {
_id: 1,
Expand All @@ -607,11 +672,11 @@ export async function getEffectifsNominatifsGenerique(
apprenant_date_de_naissance: { $substr: ["$apprenant.date_de_naissance", 0, 10] },
formation_cfd: "$formation.cfd",
formation_rncp: "$formation.rncp",
formation_libelle_long: "$formation.libelle_long",
formation_libelle_long: { $ifNull: ["$formation_details.libelle", "$formation.libelle_long"] },
formation_annee: "$formation.annee",
formation_niveau: "$formation.niveau",
formation_date_debut_formation: { $arrayElemAt: ["$formation.periode", 0] },
formation_date_fin_formation: { $arrayElemAt: ["$formation.periode", 1] },
formation_date_debut_formation: "$formation_date_debut_formation",
formation_date_fin_formation: "$formation_date_fin_formation",
...(shouldDisplayContactInEffectifNominatif(ctx.organisation.type)
? {
apprenant_courriel: "$apprenant.courriel",
Expand All @@ -622,6 +687,7 @@ export async function getEffectifsNominatifsGenerique(
},
])
.toArray()) as IndicateursEffectifsAvecOrganisme[];

return indicateurs;
}

Expand Down
Loading