[FIX] Logs : ils étaient recherchés dans la connection orm_default alors... (12c3de3d) · Commits · lib / unicaen / db-import

CHANGELOG.md

+1 −0

Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ Changelog
		- Possibilité de spécifier un data extractor précis pour une source (+ gestion des extractors par un plugin manager).
		- Migration des lignes de commandes d'import/synchro au format Symfony (lancer `vendor/bin/laminas` pour avoir la liste des commandes).
		- Configuration : navigation déplacée dans config/unicaen-db-import.global.php.dist pour ne pas imposer le menu du module.
		- [FIX] Logs : ils étaient recherchés dans la connection orm_default alors qu'ils se trouvent dans la connection destination de l'import/synchro.
		- [FIX] Ajouts de strtolower/strtoupper() faisant défaut.

		7.3.2

config/module.config.php

+8 −20

Changes for config/module.config.php: 8 added lines, 20 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ use UnicaenDbImport\Domain\PluginManager\SynchroPluginManager;
		use UnicaenDbImport\Domain\PluginManager\SynchroPluginManagerFactory;
		use UnicaenDbImport\Entity\Db\ImportObserv;
		use UnicaenDbImport\Entity\Db\ImportObservResult;
		use UnicaenDbImport\Entity\Db\Service\ImportLog\ImportLogService;
		use UnicaenDbImport\Entity\Db\Service\ImportLog\ImportLogServiceFactory;
		use UnicaenDbImport\Entity\Db\Service\ImportObserv\ImportObservService;
		use UnicaenDbImport\Entity\Db\Service\ImportObserv\ImportObservServiceFactory;
		use UnicaenDbImport\Entity\Db\Service\ImportObservResult\ImportObservResultService;
		@@ -109,12 +107,10 @@ return [
		'drivers' => [
		'UnicaenDbImport\Entity\Db\AbstractImportObserv' => 'db_import_orm_default_xml_driver',
		'UnicaenDbImport\Entity\Db\AbstractImportObservResult' => 'db_import_orm_default_xml_driver',
		'UnicaenDbImport\Entity\Db\AbstractImportLog' => 'db_import_orm_default_xml_driver',
		'UnicaenDbImport\Entity\Db\AbstractSource' => 'db_import_orm_default_xml_driver',

		'UnicaenDbImport\Entity\Db\ImportObserv' => 'db_import_orm_default_xml_driver',
		'UnicaenDbImport\Entity\Db\ImportObservResult' => 'db_import_orm_default_xml_driver',
		'UnicaenDbImport\Entity\Db\ImportLog' => 'db_import_orm_default_xml_driver',
		'UnicaenDbImport\Entity\Db\Source' => 'db_import_orm_default_xml_driver',
		],
		],
		@@ -366,25 +362,25 @@ return [
		],
		],
		'log' => [
		'type' => Segment::class,
		'type' => Literal::class,
		'options' => [
		'route' => '/log',
		'defaults' => [
		'controller' => LogController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'may_terminate' => false,
		'child_routes' => [
		'voir' => [
		'lister' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/voir/:id',
		'route' => '/lister/:type/:name',
		'constraints' => [
		'id' => '\d+',
		'type' => '[a-zA-Z][a-zA-Z0-9_-]*',
		'name' => '[a-zA-Z][a-zA-Z0-9_-]*',
		],
		'defaults' => [
		'action' => 'voir',
		'action' => 'lister',
		],
		],
		],
		@@ -510,17 +506,10 @@ return [
		[
		'controller' => LogController::class,
		'action' => [
		'index',
		'lister',
		],
		'privileges' => LogPrivilege::LISTER,
		],
		[
		'controller' => LogController::class,
		'action' => [
		'voir',
		],
		'privileges' => LogPrivilege::CONSULTER,
		],
		],
		],
		],
		@@ -558,7 +547,6 @@ return [
		CodeGeneratorPluginManager::class => CodeGeneratorPluginManagerFactory::class,

		SourceService::class => SourceServiceFactory::class,
		ImportLogService::class => ImportLogServiceFactory::class,
		ImportObservService::class => ImportObservServiceFactory::class,
		ImportObservResultService::class => ImportObservResultServiceFactory::class,

config/unicaen-db-import.global.php.dist

+2 −8

Changes for config/unicaen-db-import.global.php.dist: 2 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -29,24 +29,18 @@ return [
		'label' => "Sources",
		'route' => 'unicaen-db-import/source',
		'resource' => ImportPrivilege::getResourceId(ImportPrivilege::LISTER),
		'order' => 5,
		'order' => 10,
		],
		'import' => [
		'label' => "Imports",
		'route' => 'unicaen-db-import/import',
		'resource' => ImportPrivilege::getResourceId(ImportPrivilege::LISTER),
		'order' => 10,
		'order' => 20,
		],
		'synchro' => [
		'label' => "Synchros",
		'route' => 'unicaen-db-import/synchro',
		'resource' => SynchroPrivilege::getResourceId(SynchroPrivilege::LISTER),
		'order' => 20,
		],
		'log' => [
		'label' => "Logs",
		'route' => 'unicaen-db-import/log',
		'resource' => LogPrivilege::getResourceId(LogPrivilege::LISTER),
		'order' => 30,
		],
		'observ' => [

src/UnicaenDbImport/CodeGenerator/CodeGenerator.php

+14 −0

Changes for src/UnicaenDbImport/CodeGenerator/CodeGenerator.php: 14 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -486,6 +486,20 @@ abstract class CodeGenerator implements CodeGeneratorInterface

		}

		public function generateSQLForFetchingInImportLogTable(int $id, string $importLogTable): string
		{
		return $this->logTableHelper->generateSQLForFetchingInLogTable($id, $importLogTable);
		}

		public function generateSQLForSelectingInImportLogTable(
		string $type,
		string $name,
		string $importLogTable,
		int $limit = 0): string
		{
		return $this->logTableHelper->generateSQLForSelectingInLogTable($type, $name, $importLogTable, $limit);
		}

		/**
		* @param string $table
		* @return string

src/UnicaenDbImport/CodeGenerator/Helper/LogTableHelper.php

+24 −0

Changes for src/UnicaenDbImport/CodeGenerator/Helper/LogTableHelper.php: 24 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -107,5 +107,29 @@ EOT;
		return $sql;
		}

		public function generateSQLForFetchingInLogTable(int $id, string $importLogTable): string
		{
		return <<<EOT
		select * from $importLogTable
		where id = $id
		EOT;
		}

		public function generateSQLForSelectingInLogTable(
		string $type,
		string $name,
		string $importLogTable,
		int $limit = 0): string
		{
		$limit = $limit > 0 ? "limit $limit" : '';

		return <<<EOT
		select * from $importLogTable
		where type = '$type' and name = '$name'
		order by started_on desc -----> NB : tri du plus récent au plus ancien
		$limit
		EOT;
		}

		abstract public function generateSQLForDateTimeColumnValueInsert(DateTime $datetime): string;
		}
		No newline at end of file