Skip to content

[OS-1739] Add the language to the supervision members dtos to fix the external member form #3080

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

Open
jcougnaud wants to merge 1 commit into
base: qa
Choose a base branch
from
Open

[OS-1739] Add the language to the supervision members dtos to fix the external member form #3080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 2 additions & 0 deletions ddd/admission/doctorat/preparation/dtos/groupe_supervision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions infrastructure/admission/doctorat/preparation/domain/service/in_memory/membre_CA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class MembreCA:
institution: str = ''
ville: str = ''
pays: str = ''
langue: str = 'fr-be'


class MembreCAInMemoryTranslator(IMembreCATranslator):
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/admission/doctorat/preparation/domain/service/in_memory/promoteur.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/admission/doctorat/preparation/domain/service/membre_CA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/admission/doctorat/preparation/domain/service/promoteur.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/admission/doctorat/preparation/repository/groupe_de_supervision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions infrastructure/admission/doctorat/preparation/repository/in_memory/groupe_de_supervision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,4 +312,5 @@ def initialize_supervision_group_from_proposition(
institute=member.institution,
city=member.ville,
country_code=member.code_pays,
language=member.langue,
)
8 changes: 7 additions & 1 deletion schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down