Commit 62180bb0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Déplacement de tout ce qui tourne autour de la synchro UnicaenImport (sauf les...

Déplacement de tout ce qui tourne autour de la synchro UnicaenImport (sauf les entités) dans le module Import
parent 68c10ec4
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Application/src/Application/Controller/TheseController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ use UnicaenApp\Traits\MessageAwareInterface;
use UnicaenApp\Util;
use Zend\Form\Element\Hidden;
use Zend\Http\Response;
use Zend\Log\Logger;
use Zend\Log\Writer\Noop;
use Zend\Stdlib\ParametersInterface;
use Zend\View\Model\ViewModel;

@@ -267,6 +269,7 @@ class TheseController extends AbstractController
    {
        $these = $this->requestedThese();

        $this->importService->setLogger((new Logger())->addWriter(new Noop()));
        $this->importService->updateThese($these);

        $redirect = $this->params()->fromQuery('redirect', '/');
+3 −3
Changes for module/Application/tests/ApplicationUnitTest/Service/ImportObservResultService/NotifCorrectionAttendueTest.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Application\Entity\Db\ImportObservResult;
use Application\Entity\Db\Repository\ImportObservResultRepository;
use Application\Entity\Db\These;
use Application\Rule\NotificationDepotVersionCorrigeeAttenduRule;
use Application\Service\ImportObservResult\ImportObservResultService;
use Import\Service\ImportObservResult\ImportObservResultService;
use Application\Service\Notification\NotifierService;
use Application\Service\These\TheseService;
use ApplicationUnitTest\Test\Asset\EntityAsset;
@@ -19,7 +19,7 @@ class NotifCorrectionAttendueTest extends \PHPUnit_Framework_TestCase
    use MockProviderAwareTrait;

    /**
     * @var ImportObservResultService
     * @var \Import\Service\ImportObservResult\ImportObservResultService
     */
    protected $service;

@@ -198,7 +198,7 @@ class NotifCorrectionAttendueTest extends \PHPUnit_Framework_TestCase

    /**
     * @param ImportObservResult $record
     * @return ImportObservResultService
     * @return \Import\Service\ImportObservResult\ImportObservResultService
     */
    protected function _init_test_pour_correction_attendue(ImportObservResult $record)
    {
+7 −5
Changes for module/Import/Module.php: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ class Module

    public function getConfig()
    {
        $paths = array_merge(
            [__DIR__ . '/config/module.config.php']
        );
        return ConfigFactory::fromFiles($paths);
        return ConfigFactory::fromFiles([
            __DIR__ . '/config/synchro.config.php',
            __DIR__ . '/config/import.config.php',
        ]);
    }

    public function getAutoloaderConfig()
@@ -48,8 +48,10 @@ class Module
            // command
            'import-all --etablissement=' => "Importer toutes les données de tous les serviceq d'un établissement.",
            // parameters
            // parameters
            ['--etablissement', "Requis. Identifiant de l'établissement, ex: 'UCN'"],

            // command
            'process-observed-import-results' => "Traitement des résultats d'observation de certains changements durant la synchro.",
        ];
    }
}
+26 −6
Changes for module/Import/config/import.config.php: 26 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use Zend\Mvc\Router\Console\Simple;
use Zend\Mvc\Router\Http\Literal;
use Zend\Mvc\Router\Http\Segment;

return array(
return [
    'bjyauthorize'    => [
        'guards' => [
            \UnicaenAuth\Guard\PrivilegeController::class => [
@@ -176,6 +176,26 @@ return array(
            ],
        ],
    ],
    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'ws' => [
                        'label' => "Import",
                        'order' => 0,
                        'route'    => 'home-import',
                        'pages' => [
                            'problems'               => [
                                'label' => "Lancement",
                                'route' => 'home-import',
                                'resource'    => \UnicaenAuth\Guard\PrivilegeController::getResourceId('Import\Controller\Import', 'index'),
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],
    'service_manager' => [
        'invokables' => [
            CallService::class => CallService::class,
@@ -199,9 +219,9 @@ return array(
            Import\Controller\ImportController::class => Import\Controller\Factory\ImportControllerFactory::class,
        ],
    ],
    'view_manager' => array(
        'template_path_stack' => array(
    'view_manager' => [
        'template_path_stack' => [
            __DIR__ . '/../view',
        ),
    ),
);
        ],
    ],
];
+58 −57
Changes for module/Import/config/synchro.config.php: 58 added lines, 57 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Controller\Factory\ImportControllerFactory;
use Application\Controller\Factory\ImportObserverControllerFactory;
use Application\Service\Import\SchemaService;
use Application\Service\ImportObserv\ImportObservService;
use Application\Service\ImportObservResult\ImportObservResultServiceFactory;
use Import\Controller\Factory\ImportObserverControllerFactory;
use Import\Controller\Factory\SynchroControllerFactory;
use Import\Controller\SynchroController;
use Import\Service\ImportObserv\ImportObservService;
use Import\Service\ImportObservResult\ImportObservResultServiceFactory;
use Import\Service\SchemaService;
use UnicaenAuth\Guard\PrivilegeController;

return [
    'bjyauthorize'    => [
        'guards' => [
            PrivilegeController::class => [
            \UnicaenAuth\Guard\PrivilegeController::class => [
                [
                    'controller' => 'Application\Controller\Import',
                    'controller' => SynchroController::class,
                    'action'     => [
                        'receive-notification',
                    ],
                    'roles' => 'guest',
                ],
                [
                    'controller' => 'Application\Controller\Import',
                    'controller' => SynchroController::class,
                    'action'     => [
                        'show-diff',
                        'index',
                    ],
                    'privileges' => UnicaenImport\Provider\Privilege\Privileges::IMPORT_ECARTS,
                ],
                [
                    'controller' => 'Application\Controller\Import',
                    'controller' => SynchroController::class,
                    'action'     => [
                        'update-tables',
                        'update-views-and-packages',
                    ],
                    'privileges' => UnicaenImport\Provider\Privilege\Privileges::IMPORT_MAJ,
                ],
@@ -42,31 +43,37 @@ return [
            ],
        ],
    ],
    'console' => [
        'router' => [
            'routes' => [
            'import-show-diff' => [
                'type'    => 'Segment',
                'process-observed-import-results' => [
                    'options' => [
                    'route'    => '/import/show-diff[/:table]',
                        'route'    => 'process-observed-import-results [--force]',
                        'defaults' => [
                        '__NAMESPACE__' => 'Application\Controller',
                        'controller'    => 'Import',
                        'action'        => 'show-diff',
                        'table'         => null,
                            'controller' => 'Application\Controller\ImportNotification',
                            'action'     => 'process-observed-import-results',
                        ],
                    ],
                ],
            ],
        ],
            'import-update-tables' => [
        'view_manager' => [
            'display_not_found_reason' => true,
            'display_exceptions'       => true,
        ]
    ],
    'router' => [
        'routes' => [
            'import-index-new' => [
                'type'    => 'Segment',
                'options' => [
                    'route'    => '/import/update-tables[/:table]',
                    'route'    => '/import',
                    'defaults' => [
                        '__NAMESPACE__' => 'Application\Controller',
                        'controller'    => 'Import',
                        'action'        => 'update-tables',
                        'table'         => null,
                        'controller'    => SynchroController::class,
                        'action'        => 'index',
                    ],
                ],
                'may_terminate' => true,
            ],
            'receive-notification' => [
                'type'    => 'Segment',
@@ -84,40 +91,16 @@ return [
            ],
        ],
    ],
    'console' => [
        'router' => [
            'routes' => [
                'process-observed-import-results' => [
                    'options' => [
                        'route'    => 'process-observed-import-results [--force]',
                        'defaults' => [
                            'controller' => 'Application\Controller\ImportNotification',
                            'action'     => 'process-observed-import-results',
                        ],
                    ],
                ],
            ],
        ],
    ],
    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'import' => [
                    'import' /* NE PAS MODIFIER CETTE CLÉ */ => [
                        'label'    => 'Synchro',
                        'pages'    => [
                            'showDiff'               => [
                                'route'       => 'import-show-diff',
                                'resource'    => PrivilegeController::getResourceId('Application\Controller\Import', 'show-diff'),
                                'params'      => [
                                    'action' => 'show-diff',
                                ],
                            ],
                            'updateTables'               => [
                                'route'       => 'import-update-tables',
                                'resource'    => PrivilegeController::getResourceId('Application\Controller\Import', 'update-tables'),
                                'params'      => [
                                    'action' => 'update-tables',
                                ],
                            'differentiel'               => [
                                'route'       => 'import-index-new',
                                'resource'    => PrivilegeController::getResourceId('Import\Controller\Import', 'index'),
                            ],
                        ],
                    ],
@@ -126,19 +109,37 @@ return [
        ],
    ],
    'service_manager' => [
        'invokables' => array(
        'invokables' => [
            'UnicaenImport\Service\Schema' => SchemaService::class,
            'ImportObservService'          => ImportObservService::class,
        ),
        ],
        'abstract_factories' => [
            'Zend\Cache\Service\StorageCacheAbstractServiceFactory',
            'Zend\Log\LoggerAbstractServiceFactory',
        ],
        'factories' => [
            'ImportObservResultService'    => ImportObservResultServiceFactory::class,
        ],

    ],
    'controllers' => [
        'invokables' => [],
        'factories' => [
            'Application\Controller\ImportNotification' => ImportObserverControllerFactory::class,
            'Application\Controller\Import' => ImportControllerFactory::class,
            SynchroController::class => SynchroControllerFactory::class,
        ],
        'aliases' => [
            'Import\Controller\Import' => SynchroController::class, // remplacement de celui d'UnicaenImport
        ]
    ],
    'view_manager' => [
        'template_map'             => [
//            'import/synchro/tableau-bord' =>
//                __DIR__ . '/../../../vendor/unicaen/import/view/unicaen-import/import/tableau-bord.phtml',
//            'import/synchro/update-views-and-packages' =>
//                __DIR__ . '/../../../vendor/unicaen/import/view/unicaen-import/import/update-views-and-packages.phtml',
        ],
        'template_path_stack' => [
            __DIR__ . '/../view',
        ],
    ],
];
Loading