Added status to migrations table.

src/Business/Repository/ElasticsearchMigration.php

@@ -1,6 +1,7 @@
 <?php
 namespace Triadev\EsMigration\Business\Repository;
 
+use Illuminate\Database\Eloquent\Collection;
 use Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationContract;
 
 class ElasticsearchMigration implements ElasticsearchMigrationContract
@@ -9,7 +10,8 @@ class ElasticsearchMigration implements ElasticsearchMigrationContract
      * @inheritdoc
      */
     public function createOrUpdate(
-        string $migration
+        string $migration,
+        int $status = self::ELASTICSEARCH_MIGRATION_STATUS_WAIT
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigration {
         $dbMigration = $this->find($migration);
 
@@ -18,6 +20,10 @@ public function createOrUpdate(
             $dbMigration->migration = $migration;
         }
 
+        if ($this->isStatusValid($status)) {
+            $dbMigration->status = $status;
+        }
+
         $dbMigration->saveOrFail();
 
         return $dbMigration;
@@ -42,4 +48,28 @@ public function delete(string $migration)
             $migration->delete();
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function all(array $columns = ['*']): Collection
+    {
+        return \Triadev\EsMigration\Models\Entity\ElasticsearchMigration::all($columns);
+    }
+
+    private function isStatusValid(int $status) : bool
+    {
+        $valid = [
+            self::ELASTICSEARCH_MIGRATION_STATUS_WAIT,
+            self::ELASTICSEARCH_MIGRATION_STATUS_RUNNING,
+            self::ELASTICSEARCH_MIGRATION_STATUS_DONE,
+            self::ELASTICSEARCH_MIGRATION_STATUS_ERROR
+        ];
+
+        if (in_array($status, $valid)) {
+            return true;
+        }
+
+        return false;
+    }
 }

src/Console/Commands/ShowMigration.php

@@ -2,7 +2,7 @@
 namespace Triadev\EsMigration\Console\Commands;
 
 use Illuminate\Console\Command;
-use Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationStatusContract;
+use Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationContract;
 
 class ShowMigration extends Command
 {
@@ -25,13 +25,18 @@ class ShowMigration extends Command
     /**
      * Execute the console command.
      *
-     * @param ElasticsearchMigrationStatusContract $elasticsearchMigrationStatusRepository
+     * @param ElasticsearchMigrationContract $elasticsearchMigrationStatusRepository
      */
-    public function handle(ElasticsearchMigrationStatusContract $elasticsearchMigrationStatusRepository)
+    public function handle(ElasticsearchMigrationContract $elasticsearchMigrationStatusRepository)
     {
         $sortField = $this->argument('sortField');
 
-        $migrations = $elasticsearchMigrationStatusRepository->all(['migration', 'status', 'created_at', 'updated_at']);
+        $migrations = $elasticsearchMigrationStatusRepository->all([
+            'migration',
+            'status',
+            'created_at',
+            'updated_at'
+        ]);
 
         switch ($this->argument('sortOrder')) {
             case 'asc':

src/Contract/Repository/ElasticsearchMigrationContract.php

@@ -1,19 +1,29 @@
 <?php
 namespace Triadev\EsMigration\Contract\Repository;
 
+use Illuminate\Database\Eloquent\Collection;
 use Triadev\EsMigration\Models\Entity\ElasticsearchMigration;
 
 interface ElasticsearchMigrationContract
 {
+    const ELASTICSEARCH_MIGRATION_STATUS_WAIT = 0;
+    const ELASTICSEARCH_MIGRATION_STATUS_RUNNING = 1;
+    const ELASTICSEARCH_MIGRATION_STATUS_DONE = 2;
+    const ELASTICSEARCH_MIGRATION_STATUS_ERROR = 3;
+
     /**
      * Create or update
      *
      * @param string $migration
+     * @param int $status
      * @return ElasticsearchMigration
      *
      * @throws \Throwable
      */
-    public function createOrUpdate(string $migration) : ElasticsearchMigration;
+    public function createOrUpdate(
+        string $migration,
+        int $status = self::ELASTICSEARCH_MIGRATION_STATUS_WAIT
+    ) : ElasticsearchMigration;
 
     /**
      * Find
@@ -32,4 +42,12 @@ public function find(string $migration) : ?ElasticsearchMigration;
      * @throws \Throwable
      */
     public function delete(string $migration);
+
+    /**
+     * All
+     *
+     * @param array $columns
+     * @return Collection
+     */
+    public function all(array $columns = ['*']) : Collection;
 }

src/Database/Migrations/2018_09_18_000000_create_elasticsearch_migration_table.php

@@ -16,6 +16,7 @@ public function up()
         Schema::create('triadev_elasticsearch_migration', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('migration');
+            $table->integer('status');
             $table->timestamps();
         });
     }

src/ElasticsearchMigration.php

@@ -22,6 +22,8 @@
 use Triadev\EsMigration\Models\Migrations\UpdateByQuery as UpdateByQueryModel;
 use Triadev\EsMigration\Models\Migrations\Reindex as ReindexModel;
 
+use Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationContract as EsMigrationRepositoryInterface;
+
 class ElasticsearchMigration implements ElasticsearchMigrationContract
 {
     /** @var Client */
@@ -30,7 +32,7 @@ class ElasticsearchMigration implements ElasticsearchMigrationContract
     /** @var string|null */
     private $filePathMigrations;
 
-    /** @var \Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationStatusContract */
+    /** @var \Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationContract */
     private $migrationRepository;
 
     /**
@@ -42,9 +44,7 @@ public function __construct()
 
         $this->filePathMigrations = config('triadev-elasticsearch-migration.migration.filePath');
 
-        $this->migrationRepository = app(
-            \Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationStatusContract::class
-        );
+        $this->migrationRepository = app(EsMigrationRepositoryInterface::class);
     }
 
     private function buildElasticsearchClient() : Client
@@ -71,7 +71,8 @@ private function buildElasticsearchClient() : Client
     public function migrate(string $version, string $source = 'file')
     {
         $migration = $this->migrationRepository->find($version);
-        if ($migration && $migration->status == 'done') {
+        if ($migration &&
+            $migration->status == EsMigrationRepositoryInterface::ELASTICSEARCH_MIGRATION_STATUS_DONE) {
             throw new MigrationAlreadyDone();
         }
 
@@ -119,10 +120,16 @@ public function migrate(string $version, string $source = 'file')
                     }
                 }
 
-                $this->migrationRepository->createOrUpdate($version, 'done');
+                $this->migrationRepository->createOrUpdate(
+                    $version,
+                    EsMigrationRepositoryInterface::ELASTICSEARCH_MIGRATION_STATUS_DONE
+                );
             }
         } catch (\Exception $e) {
-            $this->migrationRepository->createOrUpdate($version, 'error');
+            $this->migrationRepository->createOrUpdate(
+                $version,
+                EsMigrationRepositoryInterface::ELASTICSEARCH_MIGRATION_STATUS_ERROR
+            );
 
             throw $e;
         }

src/Models/Entity/ElasticsearchMigration.php

@@ -7,6 +7,7 @@
 /**
  * @property integer $id
  * @property string $migration
+ * @property string $status
  */
 class ElasticsearchMigration extends Model
 {

src/Provider/ElasticsearchMigrationServiceProvider.php

@@ -34,15 +34,6 @@ public function boot()
                 ShowMigration::class
             ]);
         }
-
-        $this->app->bind(
-            \Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationStatusContract::class,
-            function () {
-                return app()->make(
-                    \Triadev\EsMigration\Business\Repository\ElasticsearchMigrationStatus::class
-                );
-            }
-        );
 
         $this->app->bind(
             \Triadev\EsMigration\Contract\Repository\ElasticsearchMigrationContract::class,