OSIS-10709: Mise à jour openapi generator

contrib/forms/training.py

@@ -33,8 +33,8 @@
 from django.utils.translation import get_language
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
-from osis_parcours_doctoral_sdk.model.parcours_doctoral_dto import ParcoursDoctoralDTO
-from osis_parcours_doctoral_sdk.model.type_enum import TypeEnum as PaperTypeEnum
+from osis_parcours_doctoral_sdk.models.parcours_doctoral_dto import ParcoursDoctoralDTO
+from osis_parcours_doctoral_sdk.models.type_enum import TypeEnum as PaperTypeEnum
 
 from admission.contrib.forms import get_past_academic_years_choices
 from base.models.person import Person

contrib/views/autocomplete.py

@@ -31,9 +31,9 @@
 from django.http import JsonResponse
 from django.utils.translation import get_language
 from django.utils.translation import gettext_lazy as _
-from osis_organisation_sdk.model.entite_type_enum import EntiteTypeEnum
-from osis_reference_sdk.model.scholarship import Scholarship
-from osis_reference_sdk.model.university import University
+from osis_organisation_sdk.models.entite_type_enum import EntiteTypeEnum
+from osis_reference_sdk.models.scholarship import Scholarship
+from osis_reference_sdk.models.university import University
 
 from base.models.enums.entity_type import INSTITUTE
 from parcours_doctoral.constants import BE_ISO_CODE

contrib/views/details_tabs/admissibility.py

@@ -29,7 +29,7 @@
 from django.utils.functional import cached_property
 from django.views.generic import RedirectView, TemplateView
 from osis_document_components.enums import PostProcessingWanted
-from osis_parcours_doctoral_sdk.model.admissibility_dto import AdmissibilityDTO
+from osis_parcours_doctoral_sdk.models.admissibility_dto import AdmissibilityDTO
 
 from parcours_doctoral.contrib.views.mixins import LoadViewMixin
 from parcours_doctoral.services.doctorate import DoctorateJuryService, DoctorateService

contrib/views/details_tabs/authorization_distribution.py

@@ -29,10 +29,10 @@
 from django.utils.functional import cached_property
 from django.views.generic import RedirectView, TemplateView
 from osis_document_components.enums import PostProcessingWanted
-from osis_parcours_doctoral_sdk.model.authorization_distribution_dto import (
+from osis_parcours_doctoral_sdk.models.authorization_distribution_dto import (
     AuthorizationDistributionDTO,
 )
-from osis_parcours_doctoral_sdk.model.private_defense_dto import PrivateDefenseDTO
+from osis_parcours_doctoral_sdk.models.private_defense_dto import PrivateDefenseDTO
 
 from parcours_doctoral.contrib.views.mixins import LoadViewMixin
 from parcours_doctoral.services.doctorate import DoctorateJuryService, DoctorateService

contrib/views/details_tabs/jury.py

@@ -33,7 +33,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, TemplateView
 from django.views.generic.edit import BaseFormView
-from osis_parcours_doctoral_sdk.model.jury_dto import JuryDTO
+from osis_parcours_doctoral_sdk.models.jury_dto import JuryDTO
 
 from parcours_doctoral.contrib.enums import (
     ChoixStatutDoctorat,

contrib/views/details_tabs/manuscript_validation.py

@@ -28,7 +28,7 @@
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy
 from django.views.generic import FormView
-from osis_parcours_doctoral_sdk.model.authorization_distribution_dto import (
+from osis_parcours_doctoral_sdk.models.authorization_distribution_dto import (
     AuthorizationDistributionDTO,
 )
 

contrib/views/details_tabs/private_defense.py

@@ -29,7 +29,7 @@
 from django.utils.functional import cached_property
 from django.views.generic import RedirectView, TemplateView
 from osis_document_components.enums import PostProcessingWanted
-from osis_parcours_doctoral_sdk.model.private_defense_dto import PrivateDefenseDTO
+from osis_parcours_doctoral_sdk.models.private_defense_dto import PrivateDefenseDTO
 
 from parcours_doctoral.contrib.views.mixins import LoadViewMixin
 from parcours_doctoral.services.doctorate import DoctorateJuryService, DoctorateService

contrib/views/details_tabs/training.py

@@ -35,8 +35,8 @@
 from django.utils.translation import get_language
 from django.views.generic import FormView
 from django.views.generic.edit import FormMixin
-from osis_parcours_doctoral_sdk.model.category_enum import CategoryEnum
-from osis_parcours_doctoral_sdk.model.context_enum import ContextEnum
+from osis_parcours_doctoral_sdk.models.category_enum import CategoryEnum
+from osis_parcours_doctoral_sdk.models.context_enum import ContextEnum
 
 from parcours_doctoral.contrib.enums.training import (
     CategorieActivite,

contrib/views/form_tabs/confirmation_paper.py

@@ -26,7 +26,7 @@
 from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
 from django.views.generic import FormView
-from osis_parcours_doctoral_sdk.model.confirmation_paper_dto import ConfirmationPaperDTO
+from osis_parcours_doctoral_sdk.models.confirmation_paper_dto import ConfirmationPaperDTO
 
 from parcours_doctoral.contrib.forms.confirmation_paper import (
     ConfirmationPaperForm,

contrib/views/form_tabs/extension_request.py

@@ -28,7 +28,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView
 
-from osis_parcours_doctoral_sdk.model.confirmation_paper_dto import ConfirmationPaperDTO
+from osis_parcours_doctoral_sdk.models.confirmation_paper_dto import ConfirmationPaperDTO
 from parcours_doctoral.contrib.enums import ChoixStatutDoctorat
 from parcours_doctoral.contrib.forms.extension_request import ExtensionRequestForm
 from parcours_doctoral.contrib.views.mixins import LoadViewMixin

requirements.txt

@@ -1 +1 @@
-git+https://github.com/uclouvain/[email protected].8
+git+https://github.com/uclouvain/osis-parcours-doctoral-sdk.git@wip-build-1.1.9

services/doctorate.py

@@ -32,70 +32,70 @@
 from django.utils.translation import get_language
 from osis_parcours_doctoral_sdk import ApiException
 from osis_parcours_doctoral_sdk.api import doctorate_api
-from osis_parcours_doctoral_sdk.model.accept_thesis_by_lead_promoter import (
+from osis_parcours_doctoral_sdk.models.accept_thesis_by_lead_promoter import (
     AcceptThesisByLeadPromoter,
 )
-from osis_parcours_doctoral_sdk.model.admissibility_dto import AdmissibilityDTO
-from osis_parcours_doctoral_sdk.model.admissibility_minutes_canvas import (
+from osis_parcours_doctoral_sdk.models.admissibility_dto import AdmissibilityDTO
+from osis_parcours_doctoral_sdk.models.admissibility_minutes_canvas import (
     AdmissibilityMinutesCanvas,
 )
-from osis_parcours_doctoral_sdk.model.approuver_jury_command import ApprouverJuryCommand
-from osis_parcours_doctoral_sdk.model.approuver_jury_par_pdf_command import (
+from osis_parcours_doctoral_sdk.models.approuver_jury_command import ApprouverJuryCommand
+from osis_parcours_doctoral_sdk.models.approuver_jury_par_pdf_command import (
     ApprouverJuryParPdfCommand,
 )
-from osis_parcours_doctoral_sdk.model.authorization_distribution_dto import (
+from osis_parcours_doctoral_sdk.models.authorization_distribution_dto import (
     AuthorizationDistributionDTO,
 )
-from osis_parcours_doctoral_sdk.model.confirmation_paper_canvas import (
+from osis_parcours_doctoral_sdk.models.confirmation_paper_canvas import (
     ConfirmationPaperCanvas,
 )
-from osis_parcours_doctoral_sdk.model.confirmation_paper_dto import ConfirmationPaperDTO
-from osis_parcours_doctoral_sdk.model.jury_dto import JuryDTO
-from osis_parcours_doctoral_sdk.model.membre_jury_identity_dto import (
+from osis_parcours_doctoral_sdk.models.confirmation_paper_dto import ConfirmationPaperDTO
+from osis_parcours_doctoral_sdk.models.jury_dto import JuryDTO
+from osis_parcours_doctoral_sdk.models.membre_jury_identity_dto import (
     MembreJuryIdentityDTO,
 )
-from osis_parcours_doctoral_sdk.model.parcours_doctoral_dto import ParcoursDoctoralDTO
-from osis_parcours_doctoral_sdk.model.parcours_doctoral_identity_dto import (
+from osis_parcours_doctoral_sdk.models.parcours_doctoral_dto import ParcoursDoctoralDTO
+from osis_parcours_doctoral_sdk.models.parcours_doctoral_identity_dto import (
     ParcoursDoctoralIdentityDTO,
 )
-from osis_parcours_doctoral_sdk.model.private_defense_dto import PrivateDefenseDTO
-from osis_parcours_doctoral_sdk.model.private_defense_minutes_canvas import (
+from osis_parcours_doctoral_sdk.models.private_defense_dto import PrivateDefenseDTO
+from osis_parcours_doctoral_sdk.models.private_defense_minutes_canvas import (
     PrivateDefenseMinutesCanvas,
 )
-from osis_parcours_doctoral_sdk.model.public_defense_minutes_canvas import (
+from osis_parcours_doctoral_sdk.models.public_defense_minutes_canvas import (
     PublicDefenseMinutesCanvas,
 )
-from osis_parcours_doctoral_sdk.model.refuser_jury_command import RefuserJuryCommand
-from osis_parcours_doctoral_sdk.model.reject_thesis_by_lead_promoter import (
+from osis_parcours_doctoral_sdk.models.refuser_jury_command import RefuserJuryCommand
+from osis_parcours_doctoral_sdk.models.reject_thesis_by_lead_promoter import (
     RejectThesisByLeadPromoter,
 )
-from osis_parcours_doctoral_sdk.model.renvoyer_invitation_signature_externe import (
+from osis_parcours_doctoral_sdk.models.renvoyer_invitation_signature_externe import (
     RenvoyerInvitationSignatureExterne,
 )
-from osis_parcours_doctoral_sdk.model.send_authorization_distribution_to_promoter import (
+from osis_parcours_doctoral_sdk.models.send_authorization_distribution_to_promoter import (
     SendAuthorizationDistributionToPromoter,
 )
-from osis_parcours_doctoral_sdk.model.submit_admissibility import SubmitAdmissibility
-from osis_parcours_doctoral_sdk.model.submit_admissibility_minutes_and_opinions import (
+from osis_parcours_doctoral_sdk.models.submit_admissibility import SubmitAdmissibility
+from osis_parcours_doctoral_sdk.models.submit_admissibility_minutes_and_opinions import (
     SubmitAdmissibilityMinutesAndOpinions,
 )
-from osis_parcours_doctoral_sdk.model.submit_private_defense import SubmitPrivateDefense
-from osis_parcours_doctoral_sdk.model.submit_private_defense_minutes import (
+from osis_parcours_doctoral_sdk.models.submit_private_defense import SubmitPrivateDefense
+from osis_parcours_doctoral_sdk.models.submit_private_defense_minutes import (
     SubmitPrivateDefenseMinutes,
 )
-from osis_parcours_doctoral_sdk.model.submit_private_public_defenses import (
+from osis_parcours_doctoral_sdk.models.submit_private_public_defenses import (
     SubmitPrivatePublicDefenses,
 )
-from osis_parcours_doctoral_sdk.model.submit_private_public_defenses_minutes import (
+from osis_parcours_doctoral_sdk.models.submit_private_public_defenses_minutes import (
     SubmitPrivatePublicDefensesMinutes,
 )
-from osis_parcours_doctoral_sdk.model.submit_public_defense import SubmitPublicDefense
-from osis_parcours_doctoral_sdk.model.submit_public_defense_minutes import (
+from osis_parcours_doctoral_sdk.models.submit_public_defense import SubmitPublicDefense
+from osis_parcours_doctoral_sdk.models.submit_public_defense_minutes import (
     SubmitPublicDefenseMinutes,
 )
-from osis_parcours_doctoral_sdk.model.supervision_canvas import SupervisionCanvas
-from osis_parcours_doctoral_sdk.model.supervision_dto import SupervisionDTO
-from osis_parcours_doctoral_sdk.model.update_authorization_distribution import (
+from osis_parcours_doctoral_sdk.models.supervision_canvas import SupervisionCanvas
+from osis_parcours_doctoral_sdk.models.supervision_dto import SupervisionDTO
+from osis_parcours_doctoral_sdk.models.update_authorization_distribution import (
     UpdateAuthorizationDistribution,
 )
 

services/education_group.py

@@ -25,7 +25,7 @@
 # ##############################################################################
 from osis_education_group_sdk import ApiClient, ApiException
 from osis_education_group_sdk.api import trainings_api
-from osis_education_group_sdk.model.training_detailed import TrainingDetailed
+from osis_education_group_sdk.models.training_detailed import TrainingDetailed
 
 from frontoffice.settings.osis_sdk import education_group as education_group_sdk
 from frontoffice.settings.osis_sdk.utils import build_mandatory_auth_headers

services/reference.py

@@ -35,7 +35,7 @@
     superior_non_universities_api,
     universities_api,
 )
-from osis_reference_sdk.model.academic_year import AcademicYear
+from osis_reference_sdk.models.academic_year import AcademicYear
 
 from frontoffice.settings.osis_sdk import reference as reference_sdk
 from frontoffice.settings.osis_sdk.utils import build_mandatory_auth_headers

services/training.py

@@ -28,7 +28,7 @@
 import osis_parcours_doctoral_sdk
 from django.http import HttpResponseBadRequest
 from osis_parcours_doctoral_sdk.api import doctorate_api
-from osis_parcours_doctoral_sdk.model.type_enum import TypeEnum
+from osis_parcours_doctoral_sdk.models.type_enum import TypeEnum
 
 from frontoffice.settings.osis_sdk import parcours_doctoral as parcours_doctoral_sdk
 from frontoffice.settings.osis_sdk.utils import (
@@ -128,7 +128,7 @@ def update_activity(cls, person, doctorate_uuid, activity_uuid, **kwargs):
     @classmethod
     def _get_activity(cls, kwargs):
         class_name = kwargs["object_type"]
-        module = import_module(f'osis_parcours_doctoral_sdk.model.{to_snake_case(class_name)}')
+        module = import_module(f'osis_parcours_doctoral_sdk.models.{to_snake_case(class_name)}')
         activity_class = getattr(module, class_name)
         return activity_class(**kwargs)
 

templatetags/parcours_doctoral.py

@@ -45,9 +45,9 @@
     NotFoundException,
     UnauthorizedException,
 )
-from osis_parcours_doctoral_sdk.model.membre_cadto_nested import MembreCADTONested
-from osis_parcours_doctoral_sdk.model.membre_jury_dto_nested import MembreJuryDTONested
-from osis_parcours_doctoral_sdk.model.promoteur_dto_nested import PromoteurDTONested
+from osis_parcours_doctoral_sdk.models.membre_cadto_nested import MembreCADTONested
+from osis_parcours_doctoral_sdk.models.membre_jury_dto_nested import MembreJuryDTONested
+from osis_parcours_doctoral_sdk.models.promoteur_dto_nested import PromoteurDTONested
 
 from parcours_doctoral.constants import READ_ACTIONS_BY_TAB, UPDATE_ACTIONS_BY_TAB
 from parcours_doctoral.contrib.enums.training import (

tests/mixins.py

@@ -29,27 +29,27 @@
 from uuid import uuid4
 
 from django.test import override_settings
-from osis_parcours_doctoral_sdk.model.action_link import ActionLink
-from osis_parcours_doctoral_sdk.model.cotutelle_dto_nested import CotutelleDTONested
-from osis_parcours_doctoral_sdk.model.entite_gestion_dto_nested import (
+from osis_parcours_doctoral_sdk.models.action_link import ActionLink
+from osis_parcours_doctoral_sdk.models.cotutelle_dto_nested import CotutelleDTONested
+from osis_parcours_doctoral_sdk.models.entite_gestion_dto_nested import (
     EntiteGestionDTONested,
 )
-from osis_parcours_doctoral_sdk.model.financement_dto_nested import FinancementDTONested
-from osis_parcours_doctoral_sdk.model.formation_dto_nested import FormationDTONested
-from osis_parcours_doctoral_sdk.model.jury_dto import JuryDTO
-from osis_parcours_doctoral_sdk.model.membre_jury_dto_nested import MembreJuryDTONested
-from osis_parcours_doctoral_sdk.model.parcours_doctoral_dto import ParcoursDoctoralDTO
-from osis_parcours_doctoral_sdk.model.parcours_doctoral_dto_links import (
+from osis_parcours_doctoral_sdk.models.financement_dto_nested import FinancementDTONested
+from osis_parcours_doctoral_sdk.models.formation_dto_nested import FormationDTONested
+from osis_parcours_doctoral_sdk.models.jury_dto import JuryDTO
+from osis_parcours_doctoral_sdk.models.membre_jury_dto_nested import MembreJuryDTONested
+from osis_parcours_doctoral_sdk.models.parcours_doctoral_dto import ParcoursDoctoralDTO
+from osis_parcours_doctoral_sdk.models.parcours_doctoral_dto_links import (
     ParcoursDoctoralDTOLinks,
 )
-from osis_parcours_doctoral_sdk.model.projet_dto_nested import ProjetDTONested
-from osis_parcours_doctoral_sdk.model.signature_membre_jury_dto_nested import (
+from osis_parcours_doctoral_sdk.models.projet_dto_nested import ProjetDTONested
+from osis_parcours_doctoral_sdk.models.signature_membre_jury_dto_nested import (
     SignatureMembreJuryDTONested,
 )
-from osis_reference_sdk.model.country import Country
-from osis_reference_sdk.model.language import Language
-from osis_reference_sdk.model.paginated_country import PaginatedCountry
-from osis_reference_sdk.model.scholarship import Scholarship
+from osis_reference_sdk.models.country import Country
+from osis_reference_sdk.models.language import Language
+from osis_reference_sdk.models.paginated_country import PaginatedCountry
+from osis_reference_sdk.models.scholarship import Scholarship
 
 from base.tests.factories.person import PersonFactory
 from base.tests.test_case import OsisPortalTestCase

tests/test_templatetags.py

@@ -35,8 +35,8 @@
 from django.utils.translation import pgettext
 from django.views.generic import FormView
 from osis_parcours_doctoral_sdk.exceptions import UnauthorizedException
-from osis_parcours_doctoral_sdk.model.action_link import ActionLink
-from osis_parcours_doctoral_sdk.model.parcours_doctoral_dto_links import (
+from osis_parcours_doctoral_sdk.models.action_link import ActionLink
+from osis_parcours_doctoral_sdk.models.parcours_doctoral_dto_links import (
     ParcoursDoctoralDTOLinks,
 )
 

tests/utils/test_utils.py

@@ -25,9 +25,9 @@
 # ##############################################################################
 
 from django.test import TestCase
-from osis_organisation_sdk.model.address import Address
-from osis_organisation_sdk.model.entite import Entite
-from osis_reference_sdk.model.scholarship import Scholarship
+from osis_organisation_sdk.models.address import Address
+from osis_organisation_sdk.models.entite import Entite
+from osis_reference_sdk.models.scholarship import Scholarship
 
 from parcours_doctoral.contrib.enums.scholarship import TypeBourse
 from parcours_doctoral.utils import *

tests/views/test_admissibility.py

@@ -27,13 +27,13 @@
 import uuid
 
 from django.shortcuts import resolve_url
-from osis_parcours_doctoral_sdk.model.action_link import ActionLink
-from osis_parcours_doctoral_sdk.model.admissibility_dto import AdmissibilityDTO
-from osis_parcours_doctoral_sdk.model.admissibility_minutes_canvas import (
+from osis_parcours_doctoral_sdk.models.action_link import ActionLink
+from osis_parcours_doctoral_sdk.models.admissibility_dto import AdmissibilityDTO
+from osis_parcours_doctoral_sdk.models.admissibility_minutes_canvas import (
     AdmissibilityMinutesCanvas,
 )
-from osis_parcours_doctoral_sdk.model.submit_admissibility import SubmitAdmissibility
-from osis_parcours_doctoral_sdk.model.submit_admissibility_minutes_and_opinions import (
+from osis_parcours_doctoral_sdk.models.submit_admissibility import SubmitAdmissibility
+from osis_parcours_doctoral_sdk.models.submit_admissibility_minutes_and_opinions import (
     SubmitAdmissibilityMinutesAndOpinions,
 )
 

tests/views/test_assessment_enrollment.py

@@ -26,8 +26,8 @@
 import uuid
 
 from django.shortcuts import resolve_url
-from osis_parcours_doctoral_sdk.model.action_link import ActionLink
-from osis_parcours_doctoral_sdk.model.inscription_evaluation_dto import (
+from osis_parcours_doctoral_sdk.models.action_link import ActionLink
+from osis_parcours_doctoral_sdk.models.inscription_evaluation_dto import (
     InscriptionEvaluationDTO,
 )
 

tests/views/test_authorization_distribution.py

@@ -29,14 +29,14 @@
 from django.shortcuts import resolve_url
 from django.template.loader import render_to_string
 from django.utils.translation.trans_real import gettext
-from osis_parcours_doctoral_sdk.model.action_link import ActionLink
-from osis_parcours_doctoral_sdk.model.authorization_distribution_dto import (
+from osis_parcours_doctoral_sdk.models.action_link import ActionLink
+from osis_parcours_doctoral_sdk.models.authorization_distribution_dto import (
     AuthorizationDistributionDTO,
 )
-from osis_parcours_doctoral_sdk.model.send_authorization_distribution_to_promoter import (
+from osis_parcours_doctoral_sdk.models.send_authorization_distribution_to_promoter import (
     SendAuthorizationDistributionToPromoter,
 )
-from osis_parcours_doctoral_sdk.model.update_authorization_distribution import (
+from osis_parcours_doctoral_sdk.models.update_authorization_distribution import (
     UpdateAuthorizationDistribution,
 )