fixed migration. store status on success

Author: kilip

composer.json

@@ -139,6 +139,7 @@
             "Cv\\": "module/Cv/src",
             "Install\\": "module/Install/src",
             "Jobs\\": "module/Jobs/src",
+            "Orders\\": "module/Orders/src",
             "Organizations\\": "module/Organizations/src",
             "Pdf\\": "module/Pdf/src",
             "Settings\\": "module/Settings/src",

config/modules.php

@@ -19,6 +19,6 @@
     'Geo',
     'Organizations',
     'ReleaseTools',
-    'Orders',
+    //'Orders',
     'Yawik\\Migration'
 ];

features/organization/insert.feature

@@ -1,3 +1,4 @@
+@organization
 Feature: Add new organization
     In order to post a job
     As an admin

module/Migration/src/Controller/ConsoleController.php

@@ -8,6 +8,7 @@
 use Laminas\Mvc\Console\Controller\AbstractConsoleController;
 use Psr\Container\ContainerInterface;
 use Yawik\Migration\Contracts\MigratorInterface;
+use Yawik\Migration\Handler\MigrationHandler;
 use Yawik\Migration\Migrator\Version36;
 
 class ConsoleController extends AbstractConsoleController
@@ -16,31 +17,46 @@ class ConsoleController extends AbstractConsoleController
      * @var iterable|MigratorInterface[]
      */
     private iterable $migrators;
+    /**
+     * @var MigrationHandler
+     */
+    private MigrationHandler $handler;
 
     /**
      * MigrationController constructor.
      *
+     * @param MigrationHandler $handler
      * @param iterable $migrators
      */
     public function __construct(
+        MigrationHandler $handler,
         iterable $migrators
     )
     {
         $this->migrators = $migrators;
+        $this->handler = $handler;
     }
 
     public static function factory(ContainerInterface $container)
     {
+        $handler = $container->get(MigrationHandler::class);
         $migrators = [];
         $migrators[] = $container->get(Version36::class);
 
-        return new self($migrators);
+        return new self($handler, $migrators);
     }
 
     public function migrateAction()
     {
+        $handler = $this->handler;
         foreach($this->migrators as $migrator){
-            $migrator->migrate();
+            $status = $handler->findOrCreate($migrator, true);
+            if(!$status->isMigrated()){
+                $success = $migrator->migrate();
+                if($success){
+                    $handler->migrated($migrator);
+                }
+            }
         }
     }
 

module/Migration/src/Handler/MigrationHandler.php

@@ -69,8 +69,11 @@ public function migrated(MigratorInterface $migrator): Migration
     {
         $migration = $this->findOrCreate($migrator);
         if(!is_null($migration)){
+            $dm = $this->dm;
             $migration->setMigrated(true);
             $migration->setMigratedAt(new \DateTime());
+            $dm->persist($migration);
+            $dm->flush();
             return $migration;
         }
         throw new InvalidArgumentException(sprintf(

module/Migration/src/Migrator/Version36/FileProcessor.php

@@ -83,7 +83,7 @@ public function process(): bool
         $progressBar->finish();
         $this->output->writeln("");
         $this->output->writeln("");
-        return false;
+        return true;
     }
 
     private function processFile(ObjectId $fileId)

module/Migration/src/Migrator/Version36/OrganizationProcessor.php

@@ -10,6 +10,7 @@
 use MongoDB\Collection;
 use Organizations\Entity\Organization;
 use Organizations\Entity\OrganizationImage;
+use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
 use Yawik\Migration\Contracts\ProcessorInterface;
 use Yawik\Migration\Util\MongoUtilTrait;
@@ -36,8 +37,14 @@ public function process(): bool
     {
         $col = $this->collection;
 
+        $count = $col->countDocuments();
+        $progressBar = new ProgressBar($this->output, $count);
+        $progressBar->setFormat('<info>processing document </info><comment>organizations</comment> [%current%/%max%]');
+        $progressBar->start();
+
         $status = true;
         foreach($col->find() as $current){
+            $progressBar->advance();
             $val = $this->getNamespacedValue('images.images', $current);
             if(!is_null($val)){
                 $col->updateOne(
@@ -51,6 +58,7 @@ public function process(): bool
             }
         }
 
+        $progressBar->finish();
         return $status;
     }