Merge pull request #4 from devimteam/1.1.7

1.1.7

Author: devim-stanislav-krotov

composer.json

@@ -6,6 +6,7 @@
     "license": "",
     "authors": [],
     "minimum-stability": "stable",
+    "version": "1.1.7",
     "require": {
         "php": ">=7",
         "silex/silex": "^2.0",

src/DataImporter.php

@@ -7,11 +7,11 @@
 use Devim\Component\DataImporter\Exception\BadPersistsData;
 use Devim\Component\DataImporter\Exception\EntityManagerIsClosed;
 use Devim\Component\DataImporter\Exception\UnexpectedTypeException;
+use Devim\Component\DataImporter\ExceptionHandler\ImportExceptionHandlerInterface;
+use Devim\Component\DataImporter\ExceptionHandler\LogHandler;
 use Devim\Component\DataImporter\Filter\FilterInterface;
 use Devim\Component\DataImporter\Reader\ReaderInterface;
 use Devim\Component\DataImporter\Writer\WriterInterface;
-use Devim\Component\DataImporter\ExceptionHandler\ImportExceptionHandlerInterface;
-use Devim\Component\DataImporter\ExceptionHandler\LogHandler;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -139,15 +139,17 @@ public function process(ImportParameters $importParameters)
 
         $this->doPrepare();
 
+        $time = microtime(true);
         $this->reader->beforeRead();
-
+        $importResult->addSelectTime(microtime(true) - $time);
         foreach ($this->reader->read() as $data) {
             try {
                 if (!$this->filterData($data, $this->beforeConvertFilterQueue)) {
                     continue;
                 }
+                $time          = microtime(true);
                 $convertedData = $this->convertData($data);
-
+                $importResult->addConvertTime(microtime(true) - $time);
                 if (!$convertedData) {
                     continue;
                 }
@@ -156,21 +158,20 @@ public function process(ImportParameters $importParameters)
                     continue;
                 }
 
+                $time = microtime(true);
                 $this->doWriteData($convertedData);
-
+                $importResult->addInsertTime(microtime(true) - $time);
                 $importResult->incrementSuccessCount();
-            }
-            //Если EntityManager закрыт сделать ничего нельзя, выходим из программы
-            catch (EntityManagerIsClosed $exception){
+            } //Если EntityManager закрыт сделать ничего нельзя, выходим из программы
+            catch (EntityManagerIsClosed $exception) {
                 $this->exceptionHandler->handle($exception, $exception->getData());
 
                 throw $exception;
-            }catch (BadPersistsData $persistsDataException){
+            } catch (BadPersistsData $persistsDataException) {
                 $importResult->addErrors($persistsDataException->getData());
 
                 $this->exceptionHandler->handle($persistsDataException, $persistsDataException->getData());
-            }
-            //Сталкивался с type error, когда в арчи кривые данные лежали при convertData
+            } //Сталкивался с type error, когда в арчи кривые данные лежали при convertData
             catch (\Throwable $e) {
                 $importResult->addErrors([$data]);
 
@@ -182,11 +183,11 @@ public function process(ImportParameters $importParameters)
 
         try {
             $this->doFinish();
-        }catch (EntityManagerIsClosed $exception){
+        } catch (EntityManagerIsClosed $exception) {
             $this->exceptionHandler->handle($exception, $exception->getData());
 
             throw $exception;
-        }catch (BadPersistsData $exception){
+        } catch (BadPersistsData $exception) {
             $this->exceptionHandler->handle($exception, $exception->getData());
             $importResult->addErrors($exception->getData());
         }

src/ImportResult.php

@@ -16,6 +16,12 @@ class ImportResult
      */
     private $errorData = [];
 
+    private $selectTime = [];
+
+    private $convertTime = [];
+
+    private $insertTime = [];
+
     /**
      *
      * @return $this
@@ -56,4 +62,50 @@ public function getErrorData(): array
     {
         return $this->errorData;
     }
+
+    public function addSelectTime(float $time): self
+    {
+        $this->selectTime[] = $this;
+        return $this;
+    }
+
+    public function addConvertTime(float $time): self
+    {
+        $this->convertTime[] = $this;
+        return $this;
+    }
+
+    public function addInsertTime(float $time): self
+    {
+        $this->insertTime[] = $time;
+
+        return $this;
+    }
+
+    public function getSelectTime(): float
+    {
+        if (!count($this->selectTime)) {
+            return 0.0;
+        }
+
+        return array_sum($this->selectTime) / count($this->selectTime);
+    }
+
+    public function getConvertTime(): float
+    {
+        if (!count($this->convertTime)) {
+            return 0.0;
+        }
+
+        return array_sum($this->convertTime) / count($this->convertTime);
+    }
+
+    public function getInsertTime(): float
+    {
+        if (!count($this->insertTime)) {
+            return 0.0;
+        }
+
+        return array_sum($this->insertTime) / count($this->insertTime);
+    }
 }