feat: implement messageLog class

r0mdau · Mar 12, 2020 · f6c467e · f6c467e
1 parent 66bb285
commit f6c467e
Show file tree

Hide file tree

Showing 9 changed files with 181 additions and 123 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "php": ">=7.2",
     "slim/slim": "3.12.*",
     "doctrine/orm": "2.7.*",
-    "monolog/monolog": "1.22.*",
+    "monolog/monolog": "2.0.*",
     "zircote/swagger-php": "^2.0",
     "ext-json": "*"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Application/ApplicationCompany.php b/src/Application/ApplicationCompany.php
@@ -2,10 +2,10 @@
 
 namespace Fradoos\Application;
 
+use Fradoos\Domain\Company;
 use Fradoos\Domain\Helper\HelperParameter;
 use Fradoos\Domain\Presentation\Presentations;
 use Fradoos\Domain\Repository\Repositories;
-use Fradoos\Domain\Company;
 
 class ApplicationCompany extends HttpResources
 {

diff --git a/src/Application/Presentation/JsonPresentationCompany.php b/src/Application/Presentation/JsonPresentationCompany.php
@@ -2,8 +2,8 @@
 
 namespace Fradoos\Application\Presentation;
 
-use Fradoos\Domain\Presentation\IPresentation;
 use Fradoos\Domain\Company;
+use Fradoos\Domain\Presentation\IPresentation;
 
 class JsonPresentationCompany extends SimpleJsonPresentation implements IPresentation
 {

diff --git a/src/Domain/User.php b/src/Domain/User.php
@@ -2,7 +2,6 @@
 
 namespace Fradoos\Domain;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Fradoos\Domain\Helper\HelperParameter;
 
 /**

diff --git a/src/Infrastructure/Repository/Doctrine/DoctrineRepositoryCompany.php b/src/Infrastructure/Repository/Doctrine/DoctrineRepositoryCompany.php
@@ -2,9 +2,9 @@
 
 namespace Fradoos\Infrastructure\Repository\Doctrine;
 
+use Fradoos\Domain\Company;
 use Fradoos\Domain\Helper\HelperParameter;
 use Fradoos\Domain\Repository\IRepositoryCompany;
-use Fradoos\Domain\Company;
 
 class DoctrineRepositoryCompany extends SimpleDoctrineRepository implements IRepositoryCompany
 {

diff --git a/src/Infrastructure/Repository/Doctrine/Mapping/Fradoos.Domain.User.php b/src/Infrastructure/Repository/Doctrine/Mapping/Fradoos.Domain.User.php
@@ -1,7 +1,6 @@
 <?php
 
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 $builder = new ClassMetadataBuilder($metadata);
 $builder->setTable("user");

diff --git a/src/dependencies.php b/src/dependencies.php
@@ -7,12 +7,13 @@
 use Fradoos\Infrastructure\Repository\Doctrine\DoctrineRepositories;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
 
 $container = $app->getContainer();
 
-$container['logger'] = function ($c) use ($configuration) {
-    $logger = new Monolog\Logger("webservice");
-    $streamHandler = new StreamHandler($configuration['general']['log.file'], $configuration['general']['log.level']);
+$container["logger"] = function ($c) use ($configuration) {
+    $logger = new Logger("webservice");
+    $streamHandler = new StreamHandler($configuration["general"]["log.file"], $configuration["general"]["log.level"]);
     $streamHandler->setFormatter(new LineFormatter("[%datetime%] %level_name% %message%\n", 'Y-m-d H:i:s.u'));
     $logger->pushHandler($streamHandler);
     return $logger;

diff --git a/src/middleware.php b/src/middleware.php
@@ -7,16 +7,18 @@
 use Fradoos\Domain\Error\ErrorParameter;
 use Fradoos\Domain\Repository\Repositories;
 
-//use Fradoos\Infrastructure\MessageLog;
-
 $app->add(
     function ($request, $response, $next) use ($app) {
         try {
             Repositories::instance()->beginTransaction();
 
             $response = $next($request, $response);
 
-            //$app->getContainer()->get("logger")->info(MessageLog::succes($app->getContainer()));
+            //var_dump($app->getContainer()->getDispatcher());exit;
+            $app->getContainer()->get("logger")->info(
+                "{$response->getStatusCode()} {$request->getMethod()} {$request->getUri()}"
+            );
+
             if (in_array($request->getMethod(), ["POST", "PUT", "DELETE", "PATCH"])) {
                 Repositories::instance()->commit();
             }
@@ -28,14 +30,16 @@ function ($request, $response, $next) use ($app) {
                 ErrorEntityAlreadyExist::class => HttpResources::STATUS_BAD_REQUEST,
             ];
 
-            $libelle = new \ReflectionClass($e);
-            $statut = array_key_exists($libelle->getName(), $map) ? $map[$libelle->getName()] : 500;
+            $label = new \ReflectionClass($e);
+            $status = array_key_exists($label->getName(), $map) ? $map[$label->getName()] : 500;
 
-            //$app->getContainer()->get("logger")->error(MessageLog::erreur($app->getContainer(), $statut, $e->getMessage()));
+            $app->getContainer()->get("logger")->error(
+                "{$status} {$request->getMethod()} {$request->getUri()}, message: {$e->getMessage()}"
+            );
             Repositories::instance()->rollback();
 
             $response = $response
-                ->withStatus($statut)
+                ->withStatus($status)
                 ->withHeader("Content-Type", "application/json")
                 ->write(json_encode(["error" => $e->getMessage()]));
         }