DEVSUPP-160: Moved common code to abstract class

Author: tuj

src/Command/AbstractImportCommand.php

@@ -3,18 +3,46 @@
 namespace App\Command;
 
 use App\Entity\ImportRun;
+use App\Service\BaseImporter;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class AbstractImportCommand extends Command
 {
     protected $entityManager;
+    protected $importer;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(BaseImporter $importer, EntityManagerInterface $entityManager)
     {
         parent::__construct();
 
         $this->entityManager = $entityManager;
+        $this->importer = $importer;
+    }
+
+    /**
+     * Run the importer.
+     *
+     * @param string $type
+     * @param string $src
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
+     * @throws \Exception
+     */
+    protected function import(string $type, string $src, OutputInterface $output)
+    {
+        $success = true;
+        $errorMessage = null;
+
+        try {
+            $this->importer->import($src);
+        } catch (\Exception $e) {
+            $success = false;
+            $errorMessage = $e->getMessage();
+            $output->writeln($errorMessage);
+        }
+
+        $this->recordImportRun($type, $success, $errorMessage);
     }
 
     /**

src/Command/ReportImportCommand.php

@@ -11,14 +11,9 @@
 
 class ReportImportCommand extends AbstractImportCommand
 {
-    private $reportImporter;
-
     public function __construct(ReportImporter $reportImporter, EntityManagerInterface $entityManager)
     {
-        parent::__construct($entityManager);
-
-        $this->reportImporter = $reportImporter;
-        $this->entityManager = $entityManager;
+        parent::__construct($reportImporter, $entityManager);
     }
 
     protected function configure()
@@ -31,17 +26,6 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $success = true;
-        $errorMessage = null;
-
-        try {
-            $this->reportImporter->import($input->getArgument('src'));
-        } catch (\Exception $e) {
-            $success = false;
-            $errorMessage = $e->getMessage();
-            $output->writeln($errorMessage);
-        }
-
-        $this->recordImportRun(Report::class, $success, $errorMessage);
+        $this->import(Report::class, $input->getArgument('src'), $output);
     }
 }

src/Command/SystemImportCommand.php

@@ -11,13 +11,9 @@
 
 class SystemImportCommand extends AbstractImportCommand
 {
-    private $systemImporter;
-
     public function __construct(SystemImporter $systemImporter, EntityManagerInterface $entityManager)
     {
-        parent::__construct($entityManager);
-
-        $this->systemImporter = $systemImporter;
+        parent::__construct($systemImporter, $entityManager);
     }
 
     protected function configure()
@@ -30,17 +26,6 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $success = true;
-        $errorMessage = null;
-
-        try {
-            $this->systemImporter->import($input->getArgument('src'));
-        } catch (\Exception $e) {
-            $success = false;
-            $errorMessage = $e->getMessage();
-            $output->writeln($errorMessage);
-        }
-
-        $this->recordImportRun(System::class, $success, $errorMessage);
+        $this->import(System::class, $input->getArgument('src'), $output);
     }
 }