Merge branch 'MAGNIMEX-13-Import-History-fix-label' into 'master'

Magnimex 13 import history fix label

See merge request !155

Author: A-Komar

app/code/Magento/ImportExport/Helper/Report.php

@@ -17,22 +17,23 @@
 class Report extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var \Magento\Framework\Stdlib\DateTime\TimeZone
      */
-    protected $dateTime;
+    protected $timeZone;
 
     /**
      * Construct
      *
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Magento\Framework\Stdlib\DateTime\TimeZone $timeZone
+     * @param \Magento\Framework\Filesystem $filesystem
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Magento\Framework\Stdlib\DateTime\TimeZone $timeZone,
         \Magento\Framework\Filesystem $filesystem
     ) {
-        $this->dateTime = $dateTime;
+        $this->timeZone = $timeZone;
         $this->filesystem = $filesystem;
         $this->varDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
         parent::__construct($context);
@@ -46,8 +47,8 @@ public function __construct(
      */
     public function getExecutionTime($time)
     {
-        $reportTime = new \DateTime($this->dateTime->date($time));
-        $timeDiff = $reportTime->diff(new \DateTime($this->dateTime->date()));
+        $reportTime = $this->timeZone->date($time, $this->timeZone->getConfigTimezone());
+        $timeDiff = $reportTime->diff($this->timeZone->date());
         return $timeDiff->format('%H:%M:%S');
     }
 
@@ -68,32 +69,6 @@ public function getSummaryStats(\Magento\ImportExport\Model\Import $import)
         return $message;
     }
 
-    /**
-     * Check if import process failed is failed by maximum execution time
-     *
-     * @param string $time
-     * @return bool
-     */
-    public function isFailed($time)
-    {
-        $isFailed = false;
-        if ($this->getTimeDiff($time) > History::MAX_IMPORT_EXECUTION_TIME) {
-            $isFailed = true;
-        }
-        return $isFailed;
-    }
-
-    /**
-     * Get time difference
-     *
-     * @param string $time
-     * @return int
-     */
-    protected function getTimeDiff($time)
-    {
-        return $this->dateTime->timestamp($time) - $this->dateTime->timestamp();
-    }
-
     /**
      * Checks imported file exists.
      *

app/code/Magento/ImportExport/Model/History.php

@@ -33,11 +33,6 @@ class History extends \Magento\Framework\Model\AbstractModel
 
     const IMPORT_FAILED = 'Failed';
 
-    /**
-     * Maximum execution time for import process in seconds
-     */
-    const MAX_IMPORT_EXECUTION_TIME = 21600;
-
     /**
      * @var \Magento\ImportExport\Helper\Report
      */