diff --git a/api/schema.py b/api/schema.py index 0660da20f..b5df77111 100644 --- a/api/schema.py +++ b/api/schema.py @@ -25,7 +25,7 @@ # ############################################################################## from drf_spectacular.generators import SchemaGenerator -ADMISSION_SDK_VERSION = "1.1.16" +ADMISSION_SDK_VERSION = "1.1.16.dev1739" class AdmissionSchemaGenerator(SchemaGenerator): diff --git a/ddd/admission/doctorat/preparation/dtos/groupe_supervision.py b/ddd/admission/doctorat/preparation/dtos/groupe_supervision.py index aeadf9fef..6c8ef8a16 100644 --- a/ddd/admission/doctorat/preparation/dtos/groupe_supervision.py +++ b/ddd/admission/doctorat/preparation/dtos/groupe_supervision.py @@ -45,6 +45,7 @@ class PromoteurDTO(interface.DTO): code_pays: str = "" pays: str = "" est_externe: bool = False + langue: str = '' @attr.dataclass(frozen=True, slots=True) @@ -60,6 +61,7 @@ class MembreCADTO(interface.DTO): code_pays: str = "" pays: str = "" est_externe: bool = False + langue: str = '' @attr.dataclass(frozen=True, slots=True) diff --git a/infrastructure/admission/doctorat/preparation/domain/service/in_memory/membre_CA.py b/infrastructure/admission/doctorat/preparation/domain/service/in_memory/membre_CA.py index 137c0f68d..30c9ee68f 100644 --- a/infrastructure/admission/doctorat/preparation/domain/service/in_memory/membre_CA.py +++ b/infrastructure/admission/doctorat/preparation/domain/service/in_memory/membre_CA.py @@ -43,6 +43,7 @@ class MembreCA: institution: str = '' ville: str = '' pays: str = '' + langue: str = 'fr-be' class MembreCAInMemoryTranslator(IMembreCATranslator): @@ -87,6 +88,7 @@ def get_dto(cls, membre_ca_id: 'MembreCAIdentity') -> 'MembreCADTO': institution=p.institution, ville=p.ville, pays=p.pays, + langue=p.langue, ) except StopIteration: # pragma: no cover raise MembreCANonTrouveException diff --git a/infrastructure/admission/doctorat/preparation/domain/service/in_memory/promoteur.py b/infrastructure/admission/doctorat/preparation/domain/service/in_memory/promoteur.py index f7b31e739..62dda7178 100644 --- a/infrastructure/admission/doctorat/preparation/domain/service/in_memory/promoteur.py +++ b/infrastructure/admission/doctorat/preparation/domain/service/in_memory/promoteur.py @@ -115,6 +115,7 @@ def _build_dto_from_model(cls, promoteur: 'Promoteur') -> 'PromoteurDTO': ville=promoteur.ville, pays=promoteur.pays, est_externe=promoteur.externe, + langue=promoteur.langue, ) @classmethod diff --git a/infrastructure/admission/doctorat/preparation/domain/service/membre_CA.py b/infrastructure/admission/doctorat/preparation/domain/service/membre_CA.py index 11135d47d..1b388f0ab 100644 --- a/infrastructure/admission/doctorat/preparation/domain/service/membre_CA.py +++ b/infrastructure/admission/doctorat/preparation/domain/service/membre_CA.py @@ -73,6 +73,7 @@ def get_dto(cls, membre_ca_id: 'MembreCAIdentity') -> MembreCADTO: code_pays=actor.country_id and actor.country.iso_code or '', pays=actor.country_id and getattr(actor.country, 'name_en' if get_language() == 'en' else 'name') or '', est_externe=actor.is_external, + langue=actor.language, ) @classmethod diff --git a/infrastructure/admission/doctorat/preparation/domain/service/promoteur.py b/infrastructure/admission/doctorat/preparation/domain/service/promoteur.py index 16bbc9ad4..213221a71 100644 --- a/infrastructure/admission/doctorat/preparation/domain/service/promoteur.py +++ b/infrastructure/admission/doctorat/preparation/domain/service/promoteur.py @@ -78,6 +78,7 @@ def _build_dto_from_model(cls, actor: 'SupervisionActor') -> 'PromoteurDTO': code_pays=actor.country_id and actor.country.iso_code or '', pays=actor.country_id and getattr(actor.country, 'name_en' if get_language() == 'en' else 'name') or '', est_externe=actor.is_external, + langue=actor.language, ) @classmethod diff --git a/infrastructure/admission/doctorat/preparation/repository/groupe_de_supervision.py b/infrastructure/admission/doctorat/preparation/repository/groupe_de_supervision.py index 53103956a..1e80de4b7 100644 --- a/infrastructure/admission/doctorat/preparation/repository/groupe_de_supervision.py +++ b/infrastructure/admission/doctorat/preparation/repository/groupe_de_supervision.py @@ -374,6 +374,7 @@ def get_members(cls, groupe_id: 'GroupeDeSupervisionIdentity') -> List[Union['Pr and getattr(actor.country, 'name_en' if get_language() == 'en' else 'name') or '', est_externe=actor.is_external, + langue=actor.language, ) ) return members diff --git a/infrastructure/admission/doctorat/preparation/repository/in_memory/groupe_de_supervision.py b/infrastructure/admission/doctorat/preparation/repository/in_memory/groupe_de_supervision.py index 55d64a208..1133c310c 100644 --- a/infrastructure/admission/doctorat/preparation/repository/in_memory/groupe_de_supervision.py +++ b/infrastructure/admission/doctorat/preparation/repository/in_memory/groupe_de_supervision.py @@ -312,4 +312,5 @@ def initialize_supervision_group_from_proposition( institute=member.institution, city=member.ville, country_code=member.code_pays, + language=member.langue, ) diff --git a/schema.yml b/schema.yml index 977958566..52576ab7a 100644 --- a/schema.yml +++ b/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: Admission API - version: 1.1.16 + version: 1.1.16.dev1739 description: This API delivers data for the Admission project. contact: name: UCLouvain - OSIS @@ -9541,12 +9541,15 @@ components: type: string est_externe: type: boolean + langue: + type: string required: - code_pays - email - est_docteur - est_externe - institution + - langue - nom - pays - prenom @@ -10245,12 +10248,15 @@ components: type: string est_externe: type: boolean + langue: + type: string required: - code_pays - email - est_docteur - est_externe - institution + - langue - nom - pays - prenom