DEVSUPP-160: Fixed issue raised in code review

Author: tuj

src/Command/AbstractImportCommand.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Command;
+
+use App\Entity\ImportRun;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Console\Command\Command;
+
+abstract class AbstractImportCommand extends Command
+{
+    protected $entityManager;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        parent::__construct();
+
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * Record import run.
+     *
+     * @param string $type
+     *   The type of the import
+     * @param bool $success
+     *   Success of run
+     * @param string|null $output
+     *   Output message or null
+     * @throws \Exception
+     */
+    protected function recordImportRun(string $type, bool $success, string $output = null) {
+        $importRun = new ImportRun();
+        $importRun->setDatetime(new \DateTime());
+        $importRun->setOutput($output);
+        $importRun->setResult($success);
+        $importRun->setType($type);
+
+        $this->entityManager->persist($importRun);
+        $this->entityManager->flush();
+    }
+}

src/Command/ReportImportCommand.php

@@ -2,23 +2,20 @@
 
 namespace App\Command;
 
-use App\Entity\ImportRun;
 use App\Entity\Report;
 use App\Service\ReportImporter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
-class ReportImportCommand extends Command
+class ReportImportCommand extends AbstractImportCommand
 {
     private $reportImporter;
-    private $entityManager;
 
     public function __construct(ReportImporter $reportImporter, EntityManagerInterface $entityManager)
     {
-        parent::__construct();
+        parent::__construct($entityManager);
 
         $this->reportImporter = $reportImporter;
         $this->entityManager = $entityManager;
@@ -45,13 +42,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln($errorMessage);
         }
 
-        $importRun = new ImportRun();
-        $importRun->setDatetime(new \DateTime());
-        $importRun->setOutput($success ? 'OK' : $errorMessage);
-        $importRun->setResult($success);
-        $importRun->setType(Report::class);
-
-        $this->entityManager->persist($importRun);
-        $this->entityManager->flush();
+        $this->recordImportRun(Report::class, $success, $errorMessage);
     }
 }

src/Command/SystemImportCommand.php

@@ -2,26 +2,22 @@
 
 namespace App\Command;
 
-use App\Entity\ImportRun;
 use App\Entity\System;
 use App\Service\SystemImporter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
-class SystemImportCommand extends Command
+class SystemImportCommand extends AbstractImportCommand
 {
     private $systemImporter;
-    private $entityManager;
 
     public function __construct(SystemImporter $systemImporter, EntityManagerInterface $entityManager)
     {
-        parent::__construct();
+        parent::__construct($entityManager);
 
         $this->systemImporter = $systemImporter;
-        $this->entityManager = $entityManager;
     }
 
     protected function configure()
@@ -45,13 +41,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln($errorMessage);
         }
 
-        $importRun = new ImportRun();
-        $importRun->setDatetime(new \DateTime());
-        $importRun->setOutput($success ? 'OK' : $errorMessage);
-        $importRun->setResult($success);
-        $importRun->setType(System::class);
-
-        $this->entityManager->persist($importRun);
-        $this->entityManager->flush();
+        $this->recordImportRun(System::class, $success, $errorMessage);
     }
 }