Commit 82a6b039 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Modifications/améliorations pour pouvoir instancier des ImportObservResult manuellement.

parent 71adb10a

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Changelog 
8.1.0

-----

- Synchro : déclenchement d'un événement Laminas permettant de réagir aux changements de valeurs déclarés dans IMPORT_OBSERV.

- Modifications/améliorations pour pouvoir instancier des ImportObservResult manuellement.



8.0.1

-----

config/module.config.php

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ use UnicaenDbImport\Service\Database\ImportLogDatabaseService; 
use UnicaenDbImport\Service\Database\ImportLogDatabaseServiceFactory;

use UnicaenDbImport\Service\Facade\ImportFacadeService;

use UnicaenDbImport\Service\Facade\ImportFacadeServiceFactory;

use UnicaenDbImport\Service\Facade\ImportObservFacade;

use UnicaenDbImport\Service\Facade\ImportObservFacadeFactory;

use UnicaenDbImport\Service\Facade\LogFacadeService;

use UnicaenDbImport\Service\Facade\LogFacadeServiceFactory;

use UnicaenDbImport\Service\Facade\SynchroFacadeService;
@@ -537,6 +539,7 @@ return [ 
            ImportFacadeService::class => ImportFacadeServiceFactory::class,

            SynchroFacadeService::class => SynchroFacadeServiceFactory::class,

            LogFacadeService::class => LogFacadeServiceFactory::class,

            ImportObservFacade::class => ImportObservFacadeFactory::class,



            DatabaseService::class => DatabaseServiceFactory::class,

            ImportLogDatabaseService::class => ImportLogDatabaseServiceFactory::class,

src/UnicaenDbImport/CodeGenerator/CodeGenerator.php

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ use UnicaenDbImport\Domain\DestinationInterface; 
use UnicaenDbImport\Domain\Operation;

use UnicaenDbImport\Domain\ResultInterface;

use UnicaenDbImport\Domain\SourceInterface;

use UnicaenDbImport\Entity\Db\AbstractImportObservResult;



/**

 * Classe mère des générateurs de code SQL, quelque soit la plateforme de base de données.
@@ -542,7 +543,7 @@ EOS; 
        // Colonne 'detail'. Ex: "coalesce(t.RESULTAT::varchar, '') || '>' || coalesce(v.RESULTAT::varchar, '')"

        $detail =

            'coalesce(' . $this->tableHelper->generateSQLForCastToString("t.$columnName") . ", '')" .

            " || '>' || " .

            " || '" . AbstractImportObservResult::RESULTAT_SEPARATOR . "' || " .

            'coalesce(' . $this->tableHelper->generateSQLForCastToString("v.$sColName") . ", '')";



        // Construction de la requête recherchant dans la vue V_DIFF_X les lignes correspondant à :

src/UnicaenDbImport/Entity/Db/AbstractImportObservResult.php

+11 −3
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ use DateTime; 


abstract class AbstractImportObservResult

{

    public const RESULTAT_SEPARATOR = '>';



    /**

     * @var int

     */
@@ -31,6 +33,12 @@ abstract class AbstractImportObservResult 
     */

    protected $dateNotif;





    public static function formatResultat(?string $fromValue, ?string $toValue): string

    {

        return $fromValue . static::RESULTAT_SEPARATOR . $toValue;

    }



    /**

     * @return string

     */
@@ -45,12 +53,12 @@ abstract class AbstractImportObservResult 
    }



    /**

     * @param DateTime $dateCreation

     * @param ?DateTime $dateCreation

     * @return self

     */

    public function setDateCreation(DateTime $dateCreation): self

    public function setDateCreation(DateTime $dateCreation = null): self

    {

        $this->dateCreation = $dateCreation;

        $this->dateCreation = $dateCreation ?: date_create();



        return $this;

    }

src/UnicaenDbImport/Entity/Db/Mapping/UnicaenDbImport.Entity.Db.ImportObserv.dcm.xml

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 


    <entity name="UnicaenDbImport\Entity\Db\ImportObserv" table="IMPORT_OBSERV">



        <id name="id" type="integer" column="ID"/>

        <id name="id" type="integer" column="id">

            <generator strategy="SEQUENCE"/>

        </id>



        <one-to-many target-entity="UnicaenDbImport\Entity\Db\ImportObservResult" mapped-by="importObserv" field="importObservResults"/>