Commit f69ce94d authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Adaptation script migration des dossiers pour meilleur découpage des adresses...

Adaptation script migration des dossiers pour meilleur découpage des adresses (précision, code postal, ville)
Ajout de trim sur l'hydrator IntervenantDossierHydrator.php
Mapping Pays nationalité d'intervenant vers intervenant dossier
parent ddea5926
Loading
Loading
Loading
Loading
+12 −11
Changes for admin/migration/MigrationDossier.php: 12 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ class MigrationDossier extends AbstractMigration
            //On traite dans un premier ce qu'on a pu mapper entre ancien dossier et nouveau dossier
            foreach ($mappingDossierToIntervenantDossier as $newColumn => $oldColumn) {
                if (!empty($oldColumn)) {
                    $intervenantDossier[$newColumn] = $dossier[$oldColumn];
                    $intervenantDossier[$newColumn] = trim($dossier[$oldColumn]);
                }
            }
            //Traitement des nouvelles colonnes intervenant dossier
@@ -136,26 +136,27 @@ class MigrationDossier extends AbstractMigration
                if (count($splitRib) > 1) {
                    $intervenantDossier['BIC'] = $splitRib [0];
                }
                $intervenantDossier['IBAN'] = $splitRib[1];
                $intervenantDossier['IBAN'] = str_replace(' ', '', $splitRib[1]);
            }
            //On récupére les adresses
            $adresse = $dossier['ADRESSE'];
            $adresse = str_replace(["\r\n", "\n", "\r"], ' ', $dossier['ADRESSE']);

            if (!empty($adresse)) {
                //On sépare l'adresse pour récupérer le code postal et la ville
                if (preg_match("'(.*)([0-9]{5})(.*)'s", $adresse, $out)) {
                    $adressePrecisions = $out[1];
                    $adresseCodePostal = $out[2];
                if (preg_match("'(.*)([0-9]{5}|\d\d\s\d\d\d)(.*)'s", $adresse, $out)) {
                    $adressePrecisions = trim($out[1]);
                    $adresseCodePostal = trim($out[2]);
                    $commune           = explode(',', $out[3]);
                    $adresseCommune    = (!empty($commune[1])) ? $commune[1] : $out[3];
                    $adresseCommune    = (!empty($commune[1])) ? trim($commune[1]) : trim($out[3]);
                } else {
                    $adressePrecisions = $adresse;
                    $adressePrecisions = trim($adresse);
                    $adresseCodePostal = null;
                    $adresseCommune    = null;
                }

                $intervenantDossier['ADRESSE_PRECISIONS']  = $adressePrecisions;
                $intervenantDossier['ADRESSE_COMMUNE']     = $adresseCommune;
                $intervenantDossier['ADRESSE_CODE_POSTAL'] = $adresseCodePostal;
                $intervenantDossier['ADRESSE_PRECISIONS']  = trim($adressePrecisions);
                $intervenantDossier['ADRESSE_COMMUNE']     = trim($adresseCommune);
                $intervenantDossier['ADRESSE_CODE_POSTAL'] = trim($adresseCodePostal);
                $intervenantDossier['ADRESSE_PAYS_ID']     = $idFrance;
            }
            $datasIntervenantDossier[] = $intervenantDossier;
+1
Changes for module/Application/src/Application/Entity/Db/IntervenantDossier.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ class IntervenantDossier implements HistoriqueAwareInterface, ResourceInterface,
            ->setCivilite($intervenant->getCivilite())
            ->setDateNaissance($intervenant->getDateNaissance())
            ->setPaysNaissance($intervenant->getPaysNaissance())
            ->setPaysNationalite($intervenant->getPaysNationalite())
            ->setDepartementNaissance($intervenant->getDepartementNaissance())
            ->setNumeroInsee($intervenant->getNumeroInsee())
            ->setNumeroInseeProvisoire($intervenant->getNumeroInseeProvisoire())
+16 −16
Changes for module/Application/src/Application/Hydrator/IntervenantDossierHydrator.php: 16 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -153,9 +153,9 @@ class IntervenantDossierHydrator implements HydratorInterface
        //Hydratation de l'indentité
        if (isset($data['DossierIdentite'])) {

            $object->setNomUsuel($data['DossierIdentite']['nomUsuel']);
            $object->setNomPatronymique($data['DossierIdentite']['nomPatronymique']);
            $object->setPrenom($data['DossierIdentite']['prenom']);
            $object->setNomUsuel(trim($data['DossierIdentite']['nomUsuel']));
            $object->setNomPatronymique(trim($data['DossierIdentite']['nomPatronymique']));
            $object->setPrenom(trim($data['DossierIdentite']['prenom']));
            //Civilite
            $civilite = (!empty($data['DossierIdentite']['civilite'])) ?
                $this->getServiceCivilite()->get($data['DossierIdentite']['civilite']) : null;
@@ -180,14 +180,14 @@ class IntervenantDossierHydrator implements HydratorInterface
                $this->getServiceDepartement()->get($data['DossierIdentiteComplementaire']['departementNaissance']) : null;
            $object->setDepartementNaissance($departementNaissance);

            $object->setCommuneNaissance($data['DossierIdentiteComplementaire']['villeNaissance']);
            $object->setCommuneNaissance(trim($data['DossierIdentiteComplementaire']['villeNaissance']));
        }
        //Hydratation de l'adresse
        if (isset($data['DossierAdresse'])) {

            $object->setAdressePrecisions($data['DossierAdresse']['precisions']);
            $object->setAdresseLieuDit($data['DossierAdresse']['lieuDit']);
            $object->setAdresseNumero($data['DossierAdresse']['numero']);
            $object->setAdressePrecisions(trim($data['DossierAdresse']['precisions']));
            $object->setAdresseLieuDit(trim($data['DossierAdresse']['lieuDit']));
            $object->setAdresseNumero(trim($data['DossierAdresse']['numero']));
            /* Complement de numéro de voie */
            $numeroComplement = (!empty(trim($data['DossierAdresse']['numeroComplement']))) ?
                $this->getServiceAdresseNumeroCompl()->get($data['DossierAdresse']['numeroComplement']) : null;
@@ -198,9 +198,9 @@ class IntervenantDossierHydrator implements HydratorInterface
                $this->getServiceVoirie()->get($data['DossierAdresse']['voirie']) : null;
            $object->setAdresseVoirie($voirie);

            $object->setAdresseVoie($data['DossierAdresse']['voie']);
            $object->setAdresseCodePostal($data['DossierAdresse']['codePostal']);
            $object->setAdresseCommune($data['DossierAdresse']['ville']);
            $object->setAdresseVoie(trim($data['DossierAdresse']['voie']));
            $object->setAdresseCodePostal(str_replace(' ', '', $data['DossierAdresse']['codePostal']));
            $object->setAdresseCommune(trim($data['DossierAdresse']['ville']));
            /* Pays adresse */
            $paysAdresse = (!empty($data['DossierAdresse']['pays'])) ?
                $this->getServicePays()->get($data['DossierAdresse']['pays']) : null;
@@ -209,16 +209,16 @@ class IntervenantDossierHydrator implements HydratorInterface
        //Hydratation de contact
        if (isset($data['DossierContact'])) {

            $object->setEmailPerso($data['DossierContact']['emailPersonnel']);
            $object->setEmailPerso(trim($data['DossierContact']['emailPersonnel']));
            //$object->setEmailPro($data['DossierContact']['emailEtablissement']);
            $object->setTelPro($data['DossierContact']['telephoneProfessionnel']);
            $object->setTelPerso($data['DossierContact']['telephonePersonnel']);
            $object->setTelPro(trim($data['DossierContact']['telephoneProfessionnel']));
            $object->setTelPerso(trim($data['DossierContact']['telephonePersonnel']));
        }


        //Hydratation de INSEE
        if (isset($data['DossierInsee'])) {
            $object->setNumeroInsee($data['DossierInsee']['numeroInsee']);
            $object->setNumeroInsee(trim($data['DossierInsee']['numeroInsee']));
            $object->setNumeroInseeProvisoire($data['DossierInsee']['numeroInseeEstProvisoire']);
        } else {
            $object->setNumeroInseeProvisoire(false);
@@ -226,8 +226,8 @@ class IntervenantDossierHydrator implements HydratorInterface

        //Hydratation de Iban
        if (isset($data['DossierBancaire'])) {
            $object->setIBAN($data['DossierBancaire']['ribIban']);
            $object->setBIC($data['DossierBancaire']['ribBic']);
            $object->setIBAN(str_replace(' ', '', $data['DossierBancaire']['ribIban']));
            $object->setBIC(trim($data['DossierBancaire']['ribBic']));
            $object->setRibHorsSepa($data['DossierBancaire']['ribHorsSepa']);
        }