Commit c54839da authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'fix-import-observ'

parents 13dbfe82 c143665e
Loading
Loading
Loading
Loading
Loading
+101 −99
Changes for data/SQL/notification.sql: 101 added lines, 99 removed lines.
Original line number Diff line number Diff line
@@ -5,12 +5,8 @@
-- ------------------------------------------------------------------------------------------------

--
-- 0/ Désactiver le job de synchro automatique.
-- 0/ Désactiver la synchro CRONée.
--
BEGIN
  DBMS_SCHEDULER.disable(name => '"SODOCT"."synchronisation"', force => TRUE);
END;
/

--
-- 0/ Recherche des SOURCE_CODE des thèses.
@@ -29,91 +25,87 @@ select SOURCE_CODE from these where id in (25948);
create or replace view src_these as
  with v as (
      -- script initial de la vue src_these A VERIFIER !
      select
        null id,
        thd.id thesard_id,
        ed.id ecole_doct_id,
        ur.id unite_rech_id,
        mv.lib_ths as titre,
        mv.eta_ths as etat_these,
        mv.LIB_INT1_DIS as lib_disc,
        mv.dat_deb_ths as date_prem_insc,
        mv.cod_eqr as cod_unit_rech,
        mv.lib_eqr as lib_unit_rech,
        mv.dat_prev_sou as date_prev_soutenance,
        mv.dat_sou_ths as date_soutenance,
        mv.dat_fin_cfd_ths as date_fin_confid,
        mv.lib_etab_cotut as lib_etab_cotut,
        mv.lib_pays_cotut as lib_pays_cotut,
        to_number(mv.cod_neg_tre) as resultat,
        mv.correction_possible as CORREC_AUTORISEE,
        mv.SOURCE_ID,
        mv.SOURCE_CODE
      from
        MV_THESE mv
        join THESARD thd on thd.SOURCE_CODE = mv.z_thesard_fk
        left join ecole_doct ed on ed.SOURCE_CODE = mv.z_ecole_doct_fk
        left join unite_rech ur on ur.SOURCE_CODE = mv.z_unite_rech_fk
      order by to_number(mv.SOURCE_CODE)
      SELECT
        NULL                            AS id,
        tmp.SOURCE_CODE                 AS SOURCE_CODE,
        src.ID                          AS source_id,
        e.id                            AS etablissement_id,
        d.id                            AS doctorant_id,
        coalesce(ed_substit.id, ed.id)  AS ecole_doct_id,
        coalesce(ur_substit.id, ur.id)  AS unite_rech_id,
        --     ed.id  AS ecole_doct_id,
        --     ur.id  AS unite_rech_id,
        ed.id                           AS ecole_doct_id_orig,
        ur.id                           AS unite_rech_id_orig,
        tmp.lib_ths                     AS titre,
        tmp.eta_ths                     AS etat_these,
        to_number(tmp.cod_neg_tre)      AS resultat,
        tmp.lib_int1_dis                AS lib_disc,
        tmp.dat_deb_ths                 AS date_prem_insc,
        tmp.dat_prev_sou                AS date_prev_soutenance,
        tmp.dat_sou_ths                 AS date_soutenance,
        tmp.dat_fin_cfd_ths             AS date_fin_confid,
        tmp.lib_etab_cotut              AS lib_etab_cotut,
        tmp.lib_pays_cotut              AS lib_pays_cotut,
        tmp.correction_possible         AS CORREC_AUTORISEE,
        tem_sou_aut_ths                 AS soutenance_autoris,
        dat_aut_sou_ths                 AS date_autoris_soutenance,
        tem_avenant_cotut               AS tem_avenant_cotut
      FROM TMP_THESE tmp
        JOIN STRUCTURE s ON s.CODE = tmp.ETABLISSEMENT_ID
        JOIN ETABLISSEMENT e ON e.STRUCTURE_ID = s.ID
        JOIN SOURCE src ON src.CODE = tmp.SOURCE_ID
        JOIN DOCTORANT d ON d.SOURCE_CODE = tmp.DOCTORANT_ID

        LEFT JOIN ECOLE_DOCT ed ON ed.SOURCE_CODE = tmp.ECOLE_DOCT_ID
        LEFT JOIN UNITE_RECH ur ON ur.SOURCE_CODE = tmp.UNITE_RECH_ID

        LEFT JOIN STRUCTURE_SUBSTIT ss_ed on ss_ed.FROM_STRUCTURE_ID = ed.STRUCTURE_ID
        LEFT JOIN ECOLE_DOCT ed_substit on ed_substit.STRUCTURE_ID = ss_ed.TO_STRUCTURE_ID

        LEFT JOIN STRUCTURE_SUBSTIT ss_ur on ss_ur.FROM_STRUCTURE_ID = ur.STRUCTURE_ID
        LEFT JOIN UNITE_RECH ur_substit on ur_substit.STRUCTURE_ID = ss_ur.TO_STRUCTURE_ID
  )
  select * from v where SOURCE_CODE not in ('4783')
  select * from v where SOURCE_CODE not in ('UCN::4783')
  union
  select
    ID,
    THESARD_ID,
    SOURCE_CODE,
    SOURCE_ID,
    ETABLISSEMENT_ID,
    DOCTORANT_ID,
    ECOLE_DOCT_ID,
    UNITE_RECH_ID,
    ECOLE_DOCT_ID_ORIG,
    UNITE_RECH_ID_ORIG,
    TITRE,
    ETAT_THESE,
    1 as RESULTAT,
    LIB_DISC,
    DATE_PREM_INSC,
    COD_UNIT_RECH,
    LIB_UNIT_RECH,
    DATE_PREV_SOUTENANCE,
    DATE_SOUTENANCE,
    DATE_FIN_CONFID,
    lib_etab_cotut,
    lib_pays_cotut,
    1 as RESULTAT,
    /*'mineure' as */CORREC_AUTORISEE,
    SOURCE_ID,
    SOURCE_CODE
  FROM v where SOURCE_CODE in ('4783')
--   union
--   select
--     ID,
--     THESARD_ID,
--     ECOLE_DOCT_ID,
--     UNITE_RECH_ID,
--     TITRE,
--     ETAT_THESE,
--     LIB_DISC,
--     DATE_PREM_INSC,
--     COD_UNIT_RECH,
--     LIB_UNIT_RECH,
--     DATE_PREV_SOUTENANCE,
--     DATE_SOUTENANCE,
--     DATE_FIN_CONFID,
--     lib_etab_cotut,
--     lib_pays_cotut,
--     1 as RESULTAT,
--     'majeure' as CORREC_AUTORISEE,
--     SOURCE_ID,
--     SOURCE_CODE
--   FROM v where SOURCE_CODE in ('12393')
    LIB_ETAB_COTUT,
    LIB_PAYS_COTUT,
    CORREC_AUTORISEE,
    SOUTENANCE_AUTORIS,
    DATE_AUTORIS_SOUTENANCE,
    TEM_AVENANT_COTUT
  FROM v where SOURCE_CODE in ('UCN::4783')
;

--
-- 2/ Vérification que les 2 thèses apparaissent bien dans la vue diff.
-- 2/ Vérification que les thèses apparaissent bien dans la vue diff.
--
select id, SOURCE_CODE, IMPORT_ACTION, CORREC_AUTORISEE, RESULTAT, U_CORREC_AUTORISEE, U_RESULTAT
from v_diff_these
where source_code in ('4783');
where source_code in ('UCN::4783');

--
-- 3/ Lancement procédure.
--
begin sodoct_import.STORE_OBSERV_RESULTS; end; commit;
begin app_import.STORE_OBSERV_RESULTS; end; commit;
/

--
@@ -122,7 +114,7 @@ begin sodoct_import.STORE_OBSERV_RESULTS; end; commit;
select ior.id, io.CODE, ior.DATE_CREATION, ior.SOURCE_CODE, ior.RESULTAT, ior.DATE_NOTIF
from IMPORT_OBSERV_RESULT ior
join IMPORT_OBSERV io on ior.IMPORT_OBSERV_ID = io.ID
where SOURCE_CODE = '4783'
where SOURCE_CODE = 'UCN::4783'
order by DATE_CREATION desc
;

@@ -137,39 +129,49 @@ order by DATE_CREATION desc
-- 6/ Restauration Vue src_these initiale.
--
create or replace view src_these as
  select
    null id,
    thd.id thesard_id,
    ed.id ecole_doct_id,
    ur.id unite_rech_id,
    mv.lib_ths as titre,
    mv.eta_ths as etat_these,
    mv.LIB_INT1_DIS as lib_disc,
    mv.dat_deb_ths as date_prem_insc,
    mv.cod_eqr as cod_unit_rech,
    mv.lib_eqr as lib_unit_rech,
    mv.dat_prev_sou as date_prev_soutenance,
    mv.dat_sou_ths as date_soutenance,
    mv.dat_fin_cfd_ths as date_fin_confid,
    mv.lib_etab_cotut as lib_etab_cotut,
    mv.lib_pays_cotut as lib_pays_cotut,
    to_number(mv.cod_neg_tre) as resultat,
    mv.correction_possible as CORREC_AUTORISEE,
    mv.SOURCE_ID,
    mv.SOURCE_CODE
  from
    MV_THESE mv
    join THESARD thd on thd.SOURCE_CODE = mv.z_thesard_fk
    left join ecole_doct ed on ed.SOURCE_CODE = mv.z_ecole_doct_fk
    left join unite_rech ur on ur.SOURCE_CODE = mv.z_unite_rech_fk
  order by to_number(mv.SOURCE_CODE)
  SELECT
    NULL                            AS id,
    tmp.SOURCE_CODE                 AS SOURCE_CODE,
    src.ID                          AS source_id,
    e.id                            AS etablissement_id,
    d.id                            AS doctorant_id,
    coalesce(ed_substit.id, ed.id)  AS ecole_doct_id,
    coalesce(ur_substit.id, ur.id)  AS unite_rech_id,
    --     ed.id  AS ecole_doct_id,
    --     ur.id  AS unite_rech_id,
    ed.id                           AS ecole_doct_id_orig,
    ur.id                           AS unite_rech_id_orig,
    tmp.lib_ths                     AS titre,
    tmp.eta_ths                     AS etat_these,
    to_number(tmp.cod_neg_tre)      AS resultat,
    tmp.lib_int1_dis                AS lib_disc,
    tmp.dat_deb_ths                 AS date_prem_insc,
    tmp.dat_prev_sou                AS date_prev_soutenance,
    tmp.dat_sou_ths                 AS date_soutenance,
    tmp.dat_fin_cfd_ths             AS date_fin_confid,
    tmp.lib_etab_cotut              AS lib_etab_cotut,
    tmp.lib_pays_cotut              AS lib_pays_cotut,
    tmp.correction_possible         AS CORREC_AUTORISEE,
    tem_sou_aut_ths                 AS soutenance_autoris,
    dat_aut_sou_ths                 AS date_autoris_soutenance,
    tem_avenant_cotut               AS tem_avenant_cotut
  FROM TMP_THESE tmp
    JOIN STRUCTURE s ON s.CODE = tmp.ETABLISSEMENT_ID
    JOIN ETABLISSEMENT e ON e.STRUCTURE_ID = s.ID
    JOIN SOURCE src ON src.CODE = tmp.SOURCE_ID
    JOIN DOCTORANT d ON d.SOURCE_CODE = tmp.DOCTORANT_ID

    LEFT JOIN ECOLE_DOCT ed ON ed.SOURCE_CODE = tmp.ECOLE_DOCT_ID
    LEFT JOIN UNITE_RECH ur ON ur.SOURCE_CODE = tmp.UNITE_RECH_ID

    LEFT JOIN STRUCTURE_SUBSTIT ss_ed on ss_ed.FROM_STRUCTURE_ID = ed.STRUCTURE_ID
    LEFT JOIN ECOLE_DOCT ed_substit on ed_substit.STRUCTURE_ID = ss_ed.TO_STRUCTURE_ID

    LEFT JOIN STRUCTURE_SUBSTIT ss_ur on ss_ur.FROM_STRUCTURE_ID = ur.STRUCTURE_ID
    LEFT JOIN UNITE_RECH ur_substit on ur_substit.STRUCTURE_ID = ss_ur.TO_STRUCTURE_ID
  ;


--
-- 7/ Réactiver le job de synchro automatique.
-- 7/ Réactiver la synchro CRONée.
--
BEGIN
  DBMS_SCHEDULER.enable(name=>'"SODOCT"."synchronisation"');
END;
/
+6 −0
Changes for module/Application/src/Application/Entity/Db/ImportObserv.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ class ImportObserv
    const CODE_CORRECTION_PASSE_A_MINEURE = 'CORRECTION_PASSE_A_MINEURE';
    const CODE_CORRECTION_PASSE_A_MAJEURE = 'CORRECTION_PASSE_A_MAJEURE';

    const CODES = [
        self::CODE_RESULTAT_PASSE_A_ADMIS,
        self::CODE_CORRECTION_PASSE_A_MINEURE,
        self::CODE_CORRECTION_PASSE_A_MAJEURE,
    ];

    const EVENT_NAME = 'import-notification-event';

    /**
+67 −18
Changes for module/Application/src/Application/Entity/Db/Repository/ImportObservResultRepository.php: 67 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -2,24 +2,51 @@

namespace Application\Entity\Db\Repository;

use Application\Entity\Db\Etablissement;
use Application\Entity\Db\ImportObserv;
use Application\Entity\Db\ImportObservResult;
use Application\Filter\EtablissementPrefixFilter;
use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\QueryBuilder;
use UnicaenApp\Exception\RuntimeException;

class ImportObservResultRepository extends DefaultEntityRepository
{
    /**
     * Recherche des résultats d'observation d'import des thèses.
     *
     * @param ImportObserv         $importObserv
     * @param Etablissement|string $etablissement Etablissement concerné
     * @return ImportObservResult[]
     */
    public function fetchImportObservResults(ImportObserv $importObserv, $etablissement)
    {
        switch ($importObserv->getCode()) {
            case ImportObserv::CODE_RESULTAT_PASSE_A_ADMIS:
                return $this->fetchImportObservResultsForResultatAdmis($etablissement);
                break;
            case ImportObserv::CODE_CORRECTION_PASSE_A_MINEURE:
                return $this->fetchImportObservResultsForCorrectionMineure($etablissement);
                break;
            case ImportObserv::CODE_CORRECTION_PASSE_A_MAJEURE:
                return $this->fetchImportObservResultsForCorrectionMajeure($etablissement);
                break;
            default:
                throw new RuntimeException("Cas non prévu!");
                break;
        }
    }

    /**
     * Recherche des résultats d'observation des thèses dont le résultat est passé à "admis".
     *
     * @param Etablissement|string $etablissement
     * @return ImportObservResult[]
     */
    public function fetchImportObservResultsForResultatAdmis()
    private function fetchImportObservResultsForResultatAdmis($etablissement)
    {
        $qb = $this->createQueryBuilder('ior')
            ->join('ior.importObserv', 'io', Join::WITH, 'io.code = :code')
            ->andWhere('io.enabled = 1')
            ->andWhere('ior.dateNotif is null') // aucune notification ne doit avoir été faite
            ->setParameter('code', ImportObserv::CODE_RESULTAT_PASSE_A_ADMIS);
        $qb = $this->createImportObservResultsQueryBuilder(ImportObserv::CODE_RESULTAT_PASSE_A_ADMIS, $etablissement);
        $qb->andWhere('ior.dateNotif is null'); // aucune notification ne doit avoir été faite

        /** @var ImportObservResult[] $records */
        $records = $qb->getQuery()->getResult();
@@ -30,15 +57,13 @@ class ImportObservResultRepository extends DefaultEntityRepository
    /**
     * Recherche des résultats d'observation des thèses dont le flag "correction_autorisee" est passé à "mineure".
     *
     * @param Etablissement|string $etablissement
     * @return ImportObservResult[]
     */
    public function fetchImportObservResultsForCorrectionMineure()
    private function fetchImportObservResultsForCorrectionMineure($etablissement)
    {
        $qb = $this->createQueryBuilder('ior')
            ->join('ior.importObserv', 'io', Join::WITH, 'io.code = :code')
            ->andWhere('io.enabled = 1')
            ->andWhere('ior.dateNotif is null') // aucune notification ne doit avoir été faite
            ->setParameter('code', ImportObserv::CODE_CORRECTION_PASSE_A_MINEURE);
        $qb = $this->createImportObservResultsQueryBuilder(ImportObserv::CODE_CORRECTION_PASSE_A_MINEURE, $etablissement);
        $qb->andWhere('ior.dateNotif is null'); // aucune notification ne doit avoir été faite

        /** @var ImportObservResult[] $records */
        $records = $qb->getQuery()->getResult();
@@ -49,19 +74,43 @@ class ImportObservResultRepository extends DefaultEntityRepository
    /**
     * Recherche des résultats d'observation des thèses dont le flag "correction_autorisee" est passé à "majeure".
     *
     * @param Etablissement|string $etablissement
     * @return ImportObservResult[]
     */
    public function fetchImportObservResultsForCorrectionMajeure()
    private function fetchImportObservResultsForCorrectionMajeure($etablissement)
    {
        $qb = $this->createQueryBuilder('ior')
            ->join('ior.importObserv', 'io', Join::WITH, 'io.code = :code')
            ->andWhere('io.enabled = 1')
            ->andWhere('ior.dateNotif is null OR ior.dateNotif is not null') // une notif peut avoir été faite ou non
            ->setParameter('code', ImportObserv::CODE_CORRECTION_PASSE_A_MAJEURE);
        $qb = $this->createImportObservResultsQueryBuilder(ImportObserv::CODE_CORRECTION_PASSE_A_MAJEURE, $etablissement);
        $qb->andWhere('ior.dateNotif is null OR ior.dateNotif is not null'); // une notif peut avoir été faite ou non

        /** @var ImportObservResult[] $records */
        $records = $qb->getQuery()->getResult();

        return $records;
    }

    /**
     * @param string               $importObservCode ex: ImportObserv::CODE_RESULTAT_PASSE_A_ADMIS
     * @param Etablissement|string $etablissement
     * @return QueryBuilder
     */
    private function createImportObservResultsQueryBuilder($importObservCode, $etablissement)
    {
        $qb = $this->createQueryBuilder('ior')
            ->join('ior.importObserv', 'io', Join::WITH, 'io.code = :code')
            ->andWhere('io.enabled = 1')
            ->setParameter('code', $importObservCode);

        if ($etablissement instanceof Etablissement) {
            $etablissement = $etablissement->getStructure()->getCode();
        }

        $f = new EtablissementPrefixFilter();
        $sourceCodePattern = $f->generateSourceCodeSearchPatternForThisEtablissement($etablissement);

        $qb
            ->andWhere('ior.sourceCode like :pattern')
            ->setParameter('pattern', $sourceCodePattern);

        return $qb;
    }
}
 No newline at end of file
+27 −0
Changes for module/Application/src/Application/Filter/EtablissementPrefixFilter.php: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -105,9 +105,36 @@ class EtablissementPrefixFilter implements FilterInterface
     *
     * @param string $value Ex: "ABC123"
     * @return string Ex: "%::ABC123"
     * @deprecated Utiliser à la place generateSourceCodeSearchPatternForAnyEtablissement()
     */
    public function addSearchPatternPrefix($value)
    {
        return $this->generateSourceCodeSearchPatternForAnyEtablissement($value);
    }

    /**
     * Génère ce motif de recherche en bdd par source code : "cet établissement précis".
     *
     * @param string $value Ex: "ABC123"
     * @return string Ex: "%::ABC123"
     */
    public function generateSourceCodeSearchPatternForAnyEtablissement($value)
    {
        return '%' . self::ETAB_PREFIX_SEP . $value;
    }

    /**
     * Génère ce motif de recherche en bdd par source code : "cet établissement précis".
     *
     * @param Etablissement|string $etablissement
     * @return string Ex: "UCN::%"
     */
    public function generateSourceCodeSearchPatternForThisEtablissement($etablissement)
    {
        if ($etablissement instanceof Etablissement) {
            $etablissement = $etablissement->getStructure()->getCode();
        }

        return $etablissement . self::ETAB_PREFIX_SEP . '%';
    }
}
 No newline at end of file
+10 −0
Changes for module/Application/src/Application/Notification/ResultatTheseAdmisNotification.php: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,12 +17,22 @@ class ResultatTheseAdmisNotification extends Notification
    public function prepare()
    {
        $to = $this->these->getDoctorant()->getEmailPro() ?: $this->these->getDoctorant()->getEmail();

        $emailDoctorantAbsent = false;
        if (! $to) {
            // lorsque le doctorant n'a pas d'email, envoi au BDD (+ petit message d'alerte dans le mail)
            $emailDoctorantAbsent = true;
            $to = $this->emailBdd;
        }

        $this->setTo($to);
        $this->setSubject("Votre dossier est complet");

        $this->setTemplateVariables([
            'these' => $this->these,
            'contact' => $this->emailBdd,
            'doctorant' => $this->these->getDoctorant(),
            'emailDoctorantAbsent' => $emailDoctorantAbsent,
        ]);

        return $this;
Loading