From 07cdd29716c3aa658edbd18032d979ef8c751bb2 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 28 Apr 2022 03:24:37 +0200
Subject: [PATCH] API: /etudiants/courant/long et /etudiants/courant

---
 app/api/etudiants.py    | 12 +++++++-----
 app/models/etudiants.py | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/api/etudiants.py b/app/api/etudiants.py
index 964dcde98..1f22463ec 100644
--- a/app/api/etudiants.py
+++ b/app/api/etudiants.py
@@ -12,12 +12,12 @@ from app.models import FormSemestreInscription, FormSemestre, Identite
 from app.scodoc import sco_bulletins
 from app.scodoc import sco_groups
 from app.scodoc.sco_permissions import Permission
-from app.scodoc import notesdb as ndb
 
 
-@bp.route("/etudiants/courant", methods=["GET"])
+@bp.route("/etudiants/courant", defaults={"long": False})
+@bp.route("/etudiants/courant/long", defaults={"long": True})
 @token_permission_required(Permission.APIView)
-def etudiants_courant():
+def etudiants_courant(long=False):
     """
     Retourne la liste des étudiants courant
 
@@ -55,8 +55,10 @@ def etudiants_courant():
         FormSemestre.date_debut <= app.db.func.now(),
         FormSemestre.date_fin >= app.db.func.now(),
     )
-
-    data = [etu.to_dict_bul(include_urls=False) for etu in etuds]
+    if long:
+        data = [etud.to_dict_bul(include_urls=False) for etud in etuds]
+    else:
+        data = [etud.to_dict_short() for etud in etuds]
 
     return jsonify(data)
 
diff --git a/app/models/etudiants.py b/app/models/etudiants.py
index b1fec6092..917b01363 100644
--- a/app/models/etudiants.py
+++ b/app/models/etudiants.py
@@ -141,7 +141,18 @@ class Identite(db.Model):
         "Le mail associé à la première adrese de l'étudiant, ou None"
         return getattr(self.adresses[0], field) if self.adresses.count() > 0 else None
 
-    def to_dict_scodoc7(self):
+    def to_dict_short(self) -> dict:
+        """Les champs essentiels"""
+        return {
+            "id": self.id,
+            "nip": self.code_nip,
+            "nom": self.nom,
+            "nom_usuel": self.nom_usuel,
+            "prenom": self.prenom,
+            "civilite": self.civilite,
+        }
+
+    def to_dict_scodoc7(self) -> dict:
         """Représentation dictionnaire,
         compatible ScoDoc7 mais sans infos admission
         """