FEAT #39 Refactoring reports

composer.json

@@ -8,6 +8,7 @@
             "History\\"       : "src/app/history/",
             "Parameter\\"     : "src/app/parameter/",
             "Priority\\"      : "src/app/priority/",
+            "Report\\"        : "src/app/report/",
             "Resource\\"      : "src/app/resource/",
             "Status\\"        : "src/app/status/",
 

rest/index.php

@@ -118,8 +118,8 @@ $app->get('/administration/notifications/{id}', \Notifications\Controllers\Notif
 
 //Baskets
 $app->get('/baskets', \Basket\controllers\BasketController::class . ':get');
-$app->get('/baskets/{id}', \Basket\controllers\BasketController::class . ':getById');
 $app->post('/baskets', \Basket\controllers\BasketController::class . ':create');
+$app->get('/baskets/{id}', \Basket\controllers\BasketController::class . ':getById');
 $app->put('/baskets/{id}', \Basket\controllers\BasketController::class . ':update');
 $app->delete('/baskets/{id}', \Basket\controllers\BasketController::class . ':delete');
 $app->get('/baskets/{id}/groups', \Basket\controllers\BasketController::class . ':getGroups');
@@ -132,11 +132,11 @@ $app->put('/sortedBaskets/{id}', \Basket\controllers\BasketController::class . '
 
 //statuses
 $app->get('/statuses', \Status\controllers\StatusController::class . ':get');
-$app->get('/administration/statuses/new', \Status\controllers\StatusController::class . ':getNewInformations');
-$app->get('/statuses/{identifier}', \Status\controllers\StatusController::class . ':getByIdentifier');
 $app->post('/statuses', \Status\controllers\StatusController::class . ':create');
+$app->get('/statuses/{identifier}', \Status\controllers\StatusController::class . ':getByIdentifier');
 $app->put('/statuses/{identifier}', \Status\controllers\StatusController::class . ':update');
 $app->delete('/statuses/{identifier}', \Status\controllers\StatusController::class . ':delete');
+$app->get('/administration/statuses/new', \Status\controllers\StatusController::class . ':getNewInformations');
 
 //groups
 $app->get('/groups', \Core\Controllers\GroupController::class . ':get');
@@ -220,11 +220,11 @@ $app->put('/priorities/{id}', \Priority\controllers\PriorityController::class .
 $app->delete('/priorities/{id}', \Priority\controllers\PriorityController::class . ':delete');
 
 //History
-$app->get('/administration/history/eventDate/{date}', \History\controllers\HistoryController::class . ':getForAdministration');
+$app->get('/administration/history/eventDate/{date}', \History\controllers\HistoryController::class . ':getForAdministration'); //TODO No date
 $app->get('/histories/users/{userSerialId}', \History\controllers\HistoryController::class . ':getByUserId');
 
 //HistoryBatch
-$app->get('/administration/historyBatch/eventDate/{date}', \History\controllers\HistoryController::class . ':getBatchForAdministration');
+$app->get('/administration/historyBatch/eventDate/{date}', \History\controllers\HistoryController::class . ':getBatchForAdministration');//TODO No date
 
 //actions
 $app->get('/actions', \Action\controllers\ActionController::class . ':get');
@@ -242,8 +242,8 @@ $app->put('/notifications/{id}', \Notifications\Controllers\NotificationControll
 $app->delete('/notifications/{id}', \Notifications\Controllers\NotificationController::class . ':delete');
 
 //Reports
-$app->get('/reports/groups/{groupId}', \Core\Controllers\ReportController::class . ':getByGroupId');
-$app->put('/reports/groups/{groupId}', \Core\Controllers\ReportController::class . ':updateForGroupId');
+$app->get('/reports/groups/{groupId}', \Report\controllers\ReportController::class . ':getByGroupId');
+$app->put('/reports/groups/{groupId}', \Report\controllers\ReportController::class . ':updateForGroupId');
 
 //Listinstance
 $app->get('/listinstance/{id}', \Core\Controllers\ListinstanceController::class . ':getById');
@@ -258,6 +258,6 @@ $app->post('/templates/{id}/duplicate', \Templates\Controllers\TemplateControlle
 $app->get('/links/resId/{resId}', \Core\Controllers\LinkController::class . ':getByResId');
 
 //liste documents
-$app->get('/res/listDocs/{clause}/{select}', \Core\Controllers\ResController::class . ':getListDocs');
+$app->get('/res/listDocs/{clause}/{select}', \Resource\controllers\ResController::class . ':getListDocs');//TODO No clause
 
 $app->run();

core/Controllers/ReportController.php → src/app/report/controllers/ReportController.php

@@ -10,23 +10,22 @@
 /**
 * @brief Report Controller
 * @author dev@maarch.org
-* @ingroup core
 */
 
-namespace Core\Controllers;
+namespace Report\controllers;
 
 use Core\Models\GroupModel;
 use Core\Models\ServiceModel;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Core\Models\ReportModel;
+use Report\models\ReportModel;
+use Slim\Http\Request;
+use Slim\Http\Response;
 
 
 class ReportController
 {
-    public function getByGroupId(RequestInterface $request, ResponseInterface $response, $aArgs)
+    public function getByGroupId(Request $request, Response $response, array $aArgs)
     {
-        if (!ServiceModel::hasService(['id' => 'admin_reports', 'userId' => $_SESSION['user']['UserId'], 'location' => 'apps', 'type' => 'admin'])) {
+        if (!ServiceModel::hasService(['id' => 'admin_reports', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin'])) {
             return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
         }
 
@@ -40,9 +39,9 @@ class ReportController
         return $response->withJson(['reports' => $reports]);
     }
 
-     public function updateForGroupId(RequestInterface $request, ResponseInterface $response, $aArgs)
+    public function updateForGroupId(Request $request, Response $response, array $aArgs)
     {
-        if (!ServiceModel::hasService(['id' => 'admin_reports', 'userId' => $_SESSION['user']['UserId'], 'location' => 'apps', 'type' => 'admin'])) {
+        if (!ServiceModel::hasService(['id' => 'admin_reports', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin'])) {
             return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
         }
 
@@ -75,7 +74,7 @@ class ReportController
             ReportModel::deleteForGroupId(['groupId' => $aArgs['groupId'], 'reportIds' => $reportIdsToDelete]);
         }
 
-        return $response->withJson(['success' => _SAVED_CHANGE]);
+        return $response->withJson(['success' => 'success']);
     }
 }
 

core/Models/ReportModel.php → src/app/report/models/ReportModel.php

@@ -8,14 +8,12 @@
 */
 
 /**
-* @brief Attachment Model
+* @brief Report Model
 * @author dev@maarch.org
-* @ingroup core
 */
 
-namespace Core\Models;
+namespace Report\models;
 
 class ReportModel extends ReportModelAbstract
 {
-    // Do your stuff in this class
 }

core/Models/ReportModelAbstract.php → src/app/report/models/ReportModelAbstract.php

@@ -8,12 +8,15 @@
 */
 
 /**
-* @brief Reports Model
+* @brief Report Model Abstract
 * @author dev@maarch.org
-* @ingroup core
 */
 
-namespace Core\Models;
+namespace Report\models;
+
+use Core\Models\CoreConfigModel;
+use Core\Models\DatabaseModel;
+use Core\Models\ValidatorModel;
 
 class ReportModelAbstract
 {
@@ -30,21 +33,21 @@ class ReportModelAbstract
         }
 
         $reports = [];
-        $xmlfile = simplexml_load_file($path);
 
+        $xmlfile = simplexml_load_file($path);
         if ($xmlfile) {
             foreach ($xmlfile->REPORT as $value) {
                 if ((string)$value->ENABLED == "true") {
                     $reports[] = [
-                        'id' => (string)$value->ID,
-                        'label' => constant((string)$value->LABEL),
-                        'desc' => constant((string)$value->DESCRIPTION),
-                        'url' => (string)$value->URL,
-                        'in_menu_reports' =>(string)$value->IN_MENU_REPORTS,
-                        'origin' => (string)$value->ORIGIN,
-                        'module' => (string)$value->MODULE,
-                        'module_label' => (string)$value->MODULE_LABEL,
-                        'checked' => false
+                        'id'                => (string)$value->ID,
+                        'label'             => constant((string)$value->LABEL),
+                        'desc'              => constant((string)$value->DESCRIPTION),
+                        'url'               => (string)$value->URL,
+                        'in_menu_reports'   => (string)$value->IN_MENU_REPORTS,
+                        'origin'            => (string)$value->ORIGIN,
+                        'module'            => (string)$value->MODULE,
+                        'module_label'      => (string)$value->MODULE_LABEL,
+                        'checked'           => false
                     ];
                 }
             }