Commit 68899dae authored by Thomas Hamel's avatar Thomas Hamel
Browse files

[WIP] ajout de l'import/synchro des composantes d'enseignements depuis octopus

parent 53735351
Loading
Loading
Loading
Loading
+11 −10
Changes for bin/run-import.sh: 11 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -56,16 +56,17 @@ if [ -z "$SERVICE" ]; then
  SERVICES[1]='etablissement'
  SERVICES[2]='ecole-doctorale'
  SERVICES[3]='unite-recherche'
  SERVICES[4]='individu'
  SERVICES[5]='doctorant'
  SERVICES[6]='these'
  SERVICES[7]='these-annee-univ'
  SERVICES[8]='role'
  SERVICES[9]='acteur'
  SERVICES[10]='origine-financement'
  SERVICES[11]='financement'
  SERVICES[12]='titre-acces'
  SERVICES[13]='variable'
  SERVICES[4]='composante-enseignement'
  SERVICES[5]='individu'
  SERVICES[6]='doctorant'
  SERVICES[7]='these'
  SERVICES[8]='these-annee-univ'
  SERVICES[9]='role'
  SERVICES[10]='acteur'
  SERVICES[11]='origine-financement'
  SERVICES[12]='financement'
  SERVICES[13]='titre-acces'
  SERVICES[14]='variable'
  for SERVICE in ${SERVICES[@]}; do
    run ${SERVICE}
  done
+58 −0
Changes for config/autoload/global.php: 58 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ namespace Application;
use Application\Entity\Db\Source;
use Application\Navigation\NavigationFactoryFactory;
use Import\Filter\PrefixEtabColumnValueFilter;
use Import\Filter\SetTypeStructureIdFilter;
use Import\Model\ImportObserv;
use Import\Model\ImportObservResult;
use Retraitement\Filter\Command\RetraitementShellCommandMines;
use Structure\Entity\Db\TypeStructure;

$config = [
    'api-tools-content-negotiation' => [
@@ -186,6 +188,40 @@ $config = [
 * Ce qui suit n'est que la config "commune".
 */
const CONFIG_IMPORTS = [
    [
        'name' => 'composante-enseignement-%s',
        'order' => 10,
        'source' => [
            'name' => '%s',
            'connection' => 'sygal-import-octopus-composante-ens',
            'select' => '/structure-light?type=2',
            'source_code_column' => 'SOURCE_CODE',
            'code' => 'UCN::octopus',
            'column_value_filter' => PrefixEtabColumnValueFilter::class,
            'page_size' => 0,
            'columns' => [
                'sigle',
                'libelleLong',
                'code',
            ],
            'column_name_filter' => [
                'sigle' => 'SIGLE',
                'libelleLong' => 'LIBELLE_LONG',
                'code' => 'SOURCE_CODE',
            ],
            'extra' => [
                /** cf. injection dans {@see \Application\generateConfigImportsForEtabs()} */
            ],
        ],
        'destination' => [
            'name' => 'Application',
            'table' => 'tmp_composante_ens',
            'connection' => 'default',
            'source_code_column' => 'SOURCE_CODE',
            'id_strategy' => null,
            'id_sequence' => null,
        ],
    ],
    [
        'name' => 'structure-%s',
        'order' => 10,
@@ -690,6 +726,26 @@ const CONFIG_SYNCHROS = [
            'update_on_deleted_enabled_column' => 'synchro_update_on_deleted_enabled', // pour activer la màj des substitués (historisés)
        ],
    ],
    [
        'name' => 'composante-enseignement-%s',
        'order' => 150,
        'source' => [
            'name' => 'SyGAL',
            'code' => 'app',
            'table' => 'SRC_COMPOSANTE_ENS',
            'connection' => 'default',
            'source_code_column' => 'SOURCE_CODE',
        ],
        'destination' => [
            'name' => 'Application',
            'table' => 'COMPOSANTE_ENS',
            'connection' => 'default',
            'source_code_column' => 'SOURCE_CODE',
            'intermediate_table_auto_drop' => false,
            'id_strategy' => 'SEQUENCE',
            'id_sequence' => null,
        ],
    ],
    ////////////////////////////////////////////// ETABLISSEMENT //////////////////////////////////////////////
    [
        ////// ETABLISSEMENT : sans doublons non historisés.
@@ -981,6 +1037,7 @@ function generateConfigImportsForEtabs(array $etabs): array
            $array['source']['name'] = generateNameForEtab($array['source']['name'], $etab);
            $array['source']['connection'] = generateNameForEtab($array['source']['connection'], $etab);
            $array['source']['extra'] = [
                SetTypeStructureIdFilter::PARAM_CODE_TYPE_STRUCTURE => TypeStructure::CODE_COMPOSANTE_ENSEIGNEMENT,
                PrefixEtabColumnValueFilter::PARAM_CODE_ETABLISSEMENT => $etab,
            ];
            $synchros[] = $array;
@@ -1019,6 +1076,7 @@ function generateNameForEtab(string $nameTemplate, string $codeEtablissement): s
}

/**
 *
 * Génère la clause à utiliser dans un WHERE pour cibler un établissement précis.
 * @param string $codeEtablissement Code établissement maison unique, ex : 'UCN', 'URN', etc.
 * @return string Ex : "d.source_id = (... like 'UCN::%')"
+461 −113

File changed.

Preview size limit exceeded, changes collapsed.

+4 −42
Changes for module/Admission/config/module.config.php: 4 added lines, 42 removed lines.
Original line number Diff line number Diff line
@@ -114,10 +114,9 @@ return array(
                            AdmissionPrivileges::ADMISSION_VERIFIER,
                            AdmissionPrivileges::ADMISSION_ACCEDER_COMMENTAIRES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_INCOMPLET,
                            AdmissionPrivileges::ADMISSION_GENERER_RECAPITULATIF
                            AdmissionPrivileges::ADMISSION_GENERER_RECAPITULATIF,
                            AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION_DANS_LISTE
                        ],
                        'resources'  => ['Admission'],
                        'assertion'  => AdmissionAssertion::class,
@@ -136,6 +135,7 @@ return array(
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_LISTER_MES_DOSSIERS_ADMISSION,
                        AdmissionPrivileges::ADMISSION_INITIALISER_ADMISSION
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
@@ -150,6 +150,7 @@ return array(
                        'generer-statut-dossier'
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_INITIALISER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION,
                        AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION,
@@ -169,16 +170,6 @@ return array(
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'notifier-gestionnaire',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
@@ -196,7 +187,6 @@ return array(
                        'notifier-dossier-incomplet',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET,
                        AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_INCOMPLET,
                    ],
                    'assertion' => AdmissionAssertion::class,
@@ -259,34 +249,6 @@ return array(
                            ],
                        ],
                    ],
                    'notifier-gestionnaire' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/notifier-gestionnaire/:admission',
                            'constraints' => [
                                'admission' => '[0-9]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action' => 'notifier-gestionnaire',
                                /* @see AdmissionController::notifierGestionnaireAction() */
                            ],
                        ],
                    ],
                    'notifier-dossier-complet' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/notifier-dossier-complet/:admission',
                            'constraints' => [
                                'admission' => '[0-9]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action' => 'notifier-dossier-complet',
                                /* @see AdmissionController::notifierDossierCompletAction() */
                            ],
                        ],
                    ],
                    'notifier-dossier-incomplet' => [
                        'type' => Segment::class,
                        'options' => [
+1 −1
Changes for module/Admission/config/others/convention.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ return array(
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/generer-convention-formation/:admission',
                            'route'    => '/generer-convention-formation/:admission/convention-formation-doctorale',
                            'defaults' => [
                                'controller' => ConventionFormationDoctoraleController::class,
                                'action'     => 'generer-convention-formation',
Loading