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

wip

parent 24410a22
Loading
Loading
Loading
Loading
+0 −1
Changes for module/Application/src/Application/Entity/Db/Etablissement.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ class Etablissement implements StructureConcreteInterface, HistoriqueAwareInterf

    /**
     * @return string
     * @deprecated mais encore nécessaire à cause de StructureConcreteInterface
     * @see StructureConcreteInterface
     */
    public function getCode()
+70 −32
Changes for module/Import/src/Import/Service/DbService.php: 70 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -50,17 +50,22 @@ class DbService
    private $sqlGenerator;

    /**
     * @var JSONExtractor
     * @var DbServiceJSONHelper
     */
    private $jsonExtractor;
    private $jsonHelper;

    /**
     * @var int
     */
    private $insertQueriesChunkSize = self::INSERT_QUERIES_CHUNK_SIZE;

    /**
     * DbService constructor.
     */
    public function __construct()
    {
        $this->sqlGenerator = new SQLGenerator();
        $this->jsonExtractor = new JSONExtractor();
        $this->setSqlGenerator(new DbServiceSQLGenerator());
        $this->setJsonHelper(new DbServiceJSONHelper());
    }

    /**
@@ -71,7 +76,7 @@ class DbService
    {
        $this->etablissement = $etablissement;

        $this->jsonExtractor->setEtablissement($etablissement);
        $this->jsonHelper->setEtablissement($etablissement);

        return $this;
    }
@@ -89,6 +94,64 @@ class DbService
        return $this;
    }

    /**
     * @param DbServiceJSONHelper $jsonHelper
     * @return DbService
     */
    public function setJsonHelper(DbServiceJSONHelper $jsonHelper): DbService
    {
        $this->jsonHelper = $jsonHelper;

        return $this;
    }

    /**
     * @param DbServiceSQLGenerator $sqlGenerator
     * @return DbService
     */
    public function setSqlGenerator(DbServiceSQLGenerator $sqlGenerator): DbService
    {
        $this->sqlGenerator = $sqlGenerator;

        return $this;
    }

    /**
     * @param int $insertQueriesChunkSize
     * @return DbService
     */
    public function setInsertQueriesChunkSize(int $insertQueriesChunkSize) : DbService
    {
        $this->insertQueriesChunkSize = $insertQueriesChunkSize;

        return $this;
    }

    /**
     * Supprime certaines données en base satisfaisant les critères spécifiés,
     * concernant le service et l'établissement courants.
     *
     * NB: AUCUN COMMIT N'EST FAIT.
     *
     * @param array $filters Peut contenir une clé 'id' pour ne supprimer qu'un seul enregistrement.
     */
    public function clear(array $filters = [])
    {
        $this->loadEntityClassMetadata();

        $filters = $this->prepareFiltersForTableUpdate($filters);
        $filters['etablissement_id'] = $this->etablissement->getCode();

        $query = $this->sqlGenerator->generateSQLQueryForClearingExistingData($this->tableName, $filters);

        $connection = $this->entityManager->getConnection();
        try {
            $connection->executeQuery($query);
        } catch (DBALException $e) {
            throw new RuntimeException("Erreur lors de la suppression dans la table $this->tableName", null, $e);
        }
    }

    /**
     * Persiste en base de données les données importées spécifiées, concernant le service et l'établissement courants.
     *
@@ -115,7 +178,7 @@ class DbService

        /** Execution des requetes SQL par groupes de N */
        $_debut = microtime(true);
        $queriesChunks = array_chunk($queries, self::INSERT_QUERIES_CHUNK_SIZE);
        $queriesChunks = array_chunk($queries, $this->insertQueriesChunkSize);
        foreach ($queriesChunks as $queryChunk) {
            $this->logger->debug(sprintf("Execution de %s requête(s).", count($queryChunk)));
            $sql = $this->sqlGenerator->wrapSQLQueriesInBeginEnd($queryChunk);
@@ -130,31 +193,6 @@ class DbService
        $this->logger->debug(sprintf("%d requête(s) effectuée(s) en %s secondes.", count($queries), $_fin - $_debut));
    }

    /**
     * Supprime certaines données en base satisfaisant les critères spécifiés,
     * concernant le service et l'établissement courants.
     *
     * NB: AUCUN COMMIT N'EST FAIT.
     *
     * @param array $filters Peut contenir une clé 'id' pour ne supprimer qu'un seul enregistrement.
     */
    public function clear(array $filters = [])
    {
        $this->loadEntityClassMetadata();

        $filters = $this->prepareFiltersForTableUpdate($filters);
        $filters['etablissement_id'] = $this->etablissement->getStructure()->getCode();

        $query = $this->sqlGenerator->generateSQLQueryForClearingExistingData($this->tableName, $filters);

        $connection = $this->entityManager->getConnection();
        try {
            $connection->executeQuery($query);
        } catch (DBALException $e) {
            throw new RuntimeException("Erreur lors de la suppression dans la table $this->tableName", null, $e);
        }
    }

    /**
     * Fait un commit en bdd.
     */
@@ -307,7 +345,7 @@ class DbService
        $valuesArray = [];

        foreach ($this->entityClassMetadata->columnNames as $property => $columnName) {
            $value = $this->jsonExtractor ->extractPropertyValue($property, $jsonEntity);
            $value = $this->jsonHelper ->extractPropertyValue($property, $jsonEntity);
            $type = $this->entityClassMetadata->fieldMappings[$property]["type"];

            $valuesArray[] = $this->sqlGenerator->formatValueForPropertyType($value, $type);
+76 −0
Changes for module/Import/src/Import/Service/DbServiceJSONHelper.php: 76 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Import\Service;

use Application\Entity\Db\Etablissement;
use Application\Filter\EtablissementPrefixFilter;
use stdClass;

class DbServiceJSONHelper
{
    /**
     * @var Etablissement
     */
    private $etablissement;

    /**
     * @param Etablissement $etablissement
     * @return self
     */
    public function setEtablissement(Etablissement $etablissement)
    {
        $this->etablissement = $etablissement;

        return $this;
    }

    /**
     * @param string   $propertyName
     * @param stdClass $jsonObject
     * @return string|null
     */
    public function extractPropertyValue($propertyName, stdClass $jsonObject)
    {
        $codeEtablissement = $this->etablissement->getCode();

        $prefix = null;
        $value = null;

        switch ($propertyName) {
            case 'etablissementId': // UCN, URN, ULHN ou INSA, sans préfixage
                $value = $codeEtablissement;
                break;
            case 'sourceCode':
                $prefix = $codeEtablissement;
                $value = $jsonObject->id;
                break;
            case 'sourceId':
            case 'individuId':
            case 'roleId':
            case 'theseId':
            case 'doctorantId':
            case 'structureId':
            case 'ecoleDoctId':
            case 'uniteRechId':
            case 'acteurEtablissementId':
                $prefix = $codeEtablissement;
                $value = isset($jsonObject->{$propertyName}) ? $jsonObject->{$propertyName} : null;
                break;
            case 'origineFinancementId':
                $prefix = Etablissement::CODE_STRUCTURE_COMUE; // particularité!
                $value = isset($jsonObject->{$propertyName}) ? $jsonObject->{$propertyName} : null;
                break;
            default:
                $value = isset($jsonObject->{$propertyName}) ? $jsonObject->{$propertyName} : null;
                break;
        }

        // préfixage éventuel
        $f = new EtablissementPrefixFilter();
        if ($value !== null && $prefix !== null) {
            $value = $f->addPrefixTo($value, $prefix);
        }

        return $value;
    }
}
 No newline at end of file
+116 −0
Changes for module/Import/src/Import/Service/DbServiceSQLGenerator.php: 116 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Import\Service;

use Doctrine\DBAL\Platforms\AbstractPlatform;

class DbServiceSQLGenerator
{
    /**
     * @var AbstractPlatform
     */
    private $databasePlatform;

    /**
     * @param AbstractPlatform $databasePlatform
     * @return self
     */
    public function setDatabasePlatform($databasePlatform)
    {
        $this->databasePlatform = $databasePlatform;

        return $this;
    }

    /**
     * Génère la requête SQL de suppression de tout ou partie des données déjà importées.
     *
     * @param string $tableName
     * @param array $filters
     * @return string
     */
    public function generateSQLQueryForClearingExistingData($tableName, array $filters = [])
    {
        $query = "DELETE FROM " . $tableName;

        if (count($filters) > 0) {
            $wheres = $filters;
            // NB: préfixage par le code établissement doit être fait en amont
            array_walk($wheres, function (&$v, $k) {
                $v = strtoupper($k) . " = '$v'";
            });
            $wheres = implode(' AND ', $wheres);
            $query .= ' WHERE ' . $wheres;
        }

        return $query;
    }

    /**
     * Génère les requêtes SQL de persistence d'une donnée importée.
     *
     * @param string $tableName
     * @param array $tableColumns
     * @param array $columnsValues
     * @return string
     */
    public function generateSQLQueryForSavingData($tableName, array $tableColumns, array $columnsValues)
    {
        return sprintf("INSERT INTO %s (%s) VALUES (%s)",
            $tableName,
            implode(", ", $tableColumns),
            implode(", ", $columnsValues)
        );
    }

    /**
     * @param array $queries
     * @return string
     */
    public function wrapSQLQueriesInBeginEnd(array $queries)
    {
        $indent = '  ';

        $sql = $indent . implode(';' . PHP_EOL . $indent, $queries) . ';';

        return implode(PHP_EOL, ['BEGIN', $sql, 'END;']);
    }

    /**
     * Fonction de mise en forme d'une valeur selon les metatadata de la propriété spécifiée.
     *
     * @param mixed $value La valeur à formater
     * @param string $type
     * @return string La donnée formatée
     *
     * RMQ si un format n'est pas prévu par le traitement la valeur est retournée sans traitement et un message est
     * affiché
     */
    public function formatValueForPropertyType($value, $type)
    {
        switch ($type) {
            case 'string':
                return $this->prepareString($value);
            case 'date':
                return $this->prepareDate($value);
            default:
                return $value;
        }
    }

    private function prepareString($value)
    {
        return $this->databasePlatform->quoteStringLiteral($value);
    }

    private function prepareDate($value)
    {
        if ($value === null) {
            return "NULL";
        }

        $yyymmdd = explode(' ', $value->date)[0];

        return "TO_DATE('$yyymmdd', 'YYYY-MM-DD')";
    }
}
+2 −2
Changes for module/Import/src/Import/Service/FetcherService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -158,11 +158,11 @@ class FetcherService
        $this->logger->info(sprintf("Interrogations du WS '%s'...", $serviceName));

        $this->callService->setConfig($this->getConfigForEtablissement());
        $filtersForWebService = $this->prepareFiltersForWebServiceRequest($filters);
        $apiFilters = $this->prepareFiltersForWebServiceRequest($filters);
        $jsonEntities = [];
        $page = 1;
        do {
            $params = array_merge($filtersForWebService, ['page' => $page]);
            $params = array_merge($apiFilters, ['page' => $page]);
            $uri = $serviceName;
            if (count($params) > 0) {
                $uri .= '?' . http_build_query($params);
Loading