Cleanup

.travis.yml

@@ -7,6 +7,8 @@ php:
   - 7.2
 
 env:
+  global:
+    - "ELASTICSEARCH_PORT=9200"
   matrix:
     - "ES_VERSION=6.0.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.deb"
     - "ES_VERSION=6.1.0 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.1.0.deb"

docker-compose.yml

@@ -6,13 +6,13 @@ services:
     environment:
       - cluster.name=test-cluster
       - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
     ports:
-      - 9200:9200
+      - 9222:9200
 
 networks:
   default:

src/Business/Repository/ElasticsearchMigrations.php

@@ -14,6 +14,7 @@ public function create(
         string $index
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrations {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrations();
+
         $dbMigration->migration_id = $migrationId;
         $dbMigration->type = $type;
         $dbMigration->index = $index;

src/Business/Repository/ElasticsearchMigrationsAlias.php

@@ -15,6 +15,7 @@ public function create(
         array $removeIndices = []
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsAlias {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsAlias();
+
         $dbMigration->migrations_id = $migrationsId;
         $dbMigration->add = json_encode($add);
         $dbMigration->remove = json_encode($remove);

src/Business/Repository/ElasticsearchMigrationsCreateIndex.php

@@ -14,6 +14,7 @@ public function create(
         ?array $settings = null
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsCreateIndex {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsCreateIndex();
+
         $dbMigration->migrations_id = $migrationsId;
         $dbMigration->mappings = json_encode($mappings);
 

src/Business/Repository/ElasticsearchMigrationsDeleteByQuery.php

@@ -15,6 +15,7 @@ public function create(
         array $options = []
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsDeleteByQuery {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsDeleteByQuery();
+
         $dbMigration->migrations_id = $migrationsId;
         $dbMigration->query = json_encode($query);
         $dbMigration->type = $type;

src/Business/Repository/ElasticsearchMigrationsReindex.php

@@ -17,6 +17,7 @@ public function create(
         array $dest = []
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsReindex {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsReindex();
+
         $dbMigration->migrations_id = $migrationsId;
         $dbMigration->dest_index = $destIndex;
         $dbMigration->refresh_source_index = $refreshSourceIndex;

src/Business/Repository/ElasticsearchMigrationsUpdateByQuery.php

@@ -16,6 +16,7 @@ public function create(
         array $options = []
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsUpdateByQuery {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsUpdateByQuery();
+
         $dbMigration->migrations_id = $migrationsId;
         $dbMigration->query = json_encode($query);
         $dbMigration->type = $type;

src/Business/Repository/ElasticsearchMigrationsUpdateIndex.php

@@ -15,6 +15,7 @@ public function create(
         bool $closeIndex = false
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsUpdateIndex {
         $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationsUpdateIndex();
+
         $dbMigration->migrations_id = $migrationsId;
         $dbMigration->close_index = $closeIndex;
 

src/Contract/ElasticsearchMigrationDatabaseContract.php

@@ -3,6 +3,14 @@
 
 interface ElasticsearchMigrationDatabaseContract
 {
+    const MIGRATION_TYPE_CREATE_INDEX = 'createIndex';
+    const MIGRATION_TYPE_UPDATE_INDEX = 'updateIndex';
+    const MIGRATION_TYPE_DELETE_INDEX = 'deleteIndex';
+    const MIGRATION_TYPE_ALIAS = 'alias';
+    const MIGRATION_TYPE_DELETE_BY_QUERY = 'deleteByQuery';
+    const MIGRATION_TYPE_UPDATE_BY_QUERY = 'updateByQuery';
+    const MIGRATION_TYPE_REINDEX = 'reindex';
+
     /**
      * Create migration
      *

src/ElasticsearchMigration.php

@@ -71,7 +71,7 @@ private function buildElasticsearchClient() : Client
     public function migrate(string $version, string $source = 'file')
     {
         $migration = $this->migrationRepository->find($version);
-        if ($migration && $migration->getAttribute('status') == 'done') {
+        if ($migration && $migration->status == 'done') {
             throw new MigrationAlreadyDone();
         }
 

src/ElasticsearchMigrationDatabase.php

@@ -27,6 +27,11 @@ class ElasticsearchMigrationDatabase implements ElasticsearchMigrationDatabaseCo
     /** @var ElasticsearchMigrationsContract */
     private $elasticsearchMigrationsRepository;
 
+    /**
+     * ElasticsearchMigrationDatabase constructor.
+     * @param ElasticsearchMigrationContract $elasticsearchMigrationRepository
+     * @param ElasticsearchMigrationsContract $elasticsearchMigrationsRepository
+     */
     public function __construct(
         ElasticsearchMigrationContract $elasticsearchMigrationRepository,
         ElasticsearchMigrationsContract $elasticsearchMigrationsRepository
@@ -61,32 +66,32 @@ public function addMigration(string $migration, string $type, string $index, arr
 
         try {
             $migrations = $this->elasticsearchMigrationsRepository->create(
-                $dbMigration->getAttribute('id'),
+                $dbMigration->id,
                 $type,
                 $index
             );
 
-            $migrationsId = $migrations->getAttribute('id');
+            $migrationsId = $migrations->id;
 
             switch ($type) {
-                case 'createIndex':
+                case self::MIGRATION_TYPE_CREATE_INDEX:
                     $this->createIndexMigration($migrationsId, $params);
                     break;
-                case 'updateIndex':
+                case self::MIGRATION_TYPE_UPDATE_INDEX:
                     $this->updateIndexMigration($migrationsId, $params);
                     break;
-                case 'deleteIndex':
+                case self::MIGRATION_TYPE_DELETE_INDEX:
                     break;
-                case 'alias':
+                case self::MIGRATION_TYPE_ALIAS:
                     $this->aliasMigration($migrationsId, $params);
                     break;
-                case 'deleteByQuery':
+                case self::MIGRATION_TYPE_DELETE_BY_QUERY:
                     $this->deleteByQueryMigration($migrationsId, $params);
                     break;
-                case 'updateByQuery':
+                case self::MIGRATION_TYPE_UPDATE_BY_QUERY:
                     $this->updateByQueryMigration($migrationsId, $params);
                     break;
-                case 'reindex':
+                case self::MIGRATION_TYPE_REINDEX:
                     $this->reindexMigration($migrationsId, $params);
                     break;
                 default:
@@ -116,24 +121,24 @@ public function getMigration(string $migration) : array
                 if ($migrationByType) {
                     $migrationByType = is_object($migrationByType) ? $migrationByType->first() : $migrationByType;
 
-                    $index = $dbMigration->getAttribute('index');
+                    $index = $dbMigration->index;
 
-                    switch ($dbMigration->getAttribute('type')) {
-                        case 'createIndex':
+                    switch ($dbMigration->type) {
+                        case self::MIGRATION_TYPE_CREATE_INDEX:
                             if ($migrationByType instanceof ElasticsearchMigrationsCreateIndex) {
-                                $settings = $migrationByType->getAttribute('settings');
+                                $settings = $migrationByType->settings;
 
                                 $migrations[] = MigrationBuilder::createIndex(
                                     $index,
-                                    json_decode($migrationByType->getAttribute('mappings'), true),
+                                    json_decode($migrationByType->mappings, true),
                                     $settings != null ? json_decode($settings, true) : null
                                 );
                             }
                             break;
-                        case 'updateIndex':
+                        case self::MIGRATION_TYPE_UPDATE_INDEX:
                             if ($migrationByType instanceof ElasticsearchMigrationsUpdateIndex) {
-                                $mappings = $migrationByType->getAttribute('mappings');
-                                $settings = $migrationByType->getAttribute('settings');
+                                $mappings = $migrationByType->mappings;
+                                $settings = $migrationByType->settings;
 
                                 $migrations[] = MigrationBuilder::updateIndex(
                                     $index,
@@ -143,14 +148,14 @@ public function getMigration(string $migration) : array
                                 );
                             }
                             break;
-                        case 'deleteIndex':
+                        case self::MIGRATION_TYPE_DELETE_INDEX:
                             $migrations[] = MigrationBuilder::deleteIndex($index);
                             break;
-                        case 'alias':
+                        case self::MIGRATION_TYPE_ALIAS:
                             if ($migrationByType instanceof ElasticsearchMigrationsAlias) {
-                                $add = $migrationByType->getAttribute('add');
-                                $remove = $migrationByType->getAttribute('remove');
-                                $removeIndices = $migrationByType->getAttribute('remove_indices');
+                                $add = $migrationByType->add;
+                                $remove = $migrationByType->remove;
+                                $removeIndices = $migrationByType->remove_indices;
 
                                 $migrations[] = MigrationBuilder::alias(
                                     $index,
@@ -160,38 +165,38 @@ public function getMigration(string $migration) : array
                                 );
                             }
                             break;
-                        case 'deleteByQuery':
+                        case self::MIGRATION_TYPE_DELETE_BY_QUERY:
                             if ($migrationByType instanceof ElasticsearchMigrationsDeleteByQuery) {
                                 $migrations[] = MigrationBuilder::deleteByQuery(
                                     $index,
-                                    json_decode($migrationByType->getAttribute('query'), true),
-                                    $migrationByType->getAttribute('type'),
-                                    json_decode($migrationByType->getAttribute('options'), true)
+                                    json_decode($migrationByType->query, true),
+                                    $migrationByType->type,
+                                    json_decode($migrationByType->options, true)
                                 );
                             }
                             break;
-                        case 'updateByQuery':
+                        case self::MIGRATION_TYPE_UPDATE_BY_QUERY:
                             if ($migrationByType instanceof ElasticsearchMigrationsUpdateByQuery) {
-                                $script = $migrationByType->getAttribute('script');
+                                $script = $migrationByType->script;
 
                                 $migrations[] = MigrationBuilder::updateByQuery(
                                     $index,
-                                    json_decode($migrationByType->getAttribute('query'), true),
-                                    $migrationByType->getAttribute('type'),
+                                    json_decode($migrationByType->query, true),
+                                    $migrationByType->type,
                                     $script != null ? json_decode($script, true) : null,
-                                    json_decode($migrationByType->getAttribute('options'), true)
+                                    json_decode($migrationByType->options, true)
                                 );
                             }
                             break;
-                        case 'reindex':
+                        case self::MIGRATION_TYPE_REINDEX:
                             if ($migrationByType instanceof ElasticsearchMigrationsReindex) {
                                 $migrations[] = MigrationBuilder::reindex(
                                     $index,
-                                    $migrationByType->getAttribute('dest_index'),
-                                    (bool)$migrationByType->getAttribute('refresh_source_index'),
-                                    json_decode($migrationByType->getAttribute('global'), true),
-                                    json_decode($migrationByType->getAttribute('source'), true),
-                                    json_decode($migrationByType->getAttribute('dest'), true)
+                                    $migrationByType->dest_index,
+                                    (bool)$migrationByType->refresh_source_index,
+                                    json_decode($migrationByType->global, true),
+                                    json_decode($migrationByType->source, true),
+                                    json_decode($migrationByType->dest, true)
                                 );
                             }
                             break;
@@ -205,6 +210,11 @@ public function getMigration(string $migration) : array
         return $migrations;
     }
 
+    /**
+     * @param int $migrationsId
+     * @param array $params
+     * @throws \Throwable
+     */
     private function createIndexMigration(int $migrationsId, array $params)
     {
         /** @var ElasticsearchMigrationsCreateIndexContract $repository */
@@ -217,6 +227,11 @@ private function createIndexMigration(int $migrationsId, array $params)
         );
     }
 
+    /**
+     * @param int $migrationsId
+     * @param array $params
+     * @throws \Throwable
+     */
     private function updateIndexMigration(int $migrationsId, array $params)
     {
         /** @var ElasticsearchMigrationsUpdateIndexContract $repository */
@@ -235,6 +250,11 @@ private function updateIndexMigration(int $migrationsId, array $params)
         );
     }
 
+    /**
+     * @param int $migrationsId
+     * @param array $params
+     * @throws \Throwable
+     */
     private function aliasMigration(int $migrationsId, array $params)
     {
         /** @var ElasticsearchMigrationsAliasContract $repository */
@@ -248,6 +268,11 @@ private function aliasMigration(int $migrationsId, array $params)
         );
     }
 
+    /**
+     * @param int $migrationsId
+     * @param array $params
+     * @throws \Throwable
+     */
     private function deleteByQueryMigration(int $migrationsId, array $params)
     {
         /** @var ElasticsearchMigrationsDeleteByQueryContract $repository */
@@ -261,6 +286,11 @@ private function deleteByQueryMigration(int $migrationsId, array $params)
         );
     }
 
+    /**
+     * @param int $migrationsId
+     * @param array $params
+     * @throws \Throwable
+     */
     private function updateByQueryMigration(int $migrationsId, array $params)
     {
         /** @var ElasticsearchMigrationsUpdateByQueryContract $repository */
@@ -275,6 +305,11 @@ private function updateByQueryMigration(int $migrationsId, array $params)
         );
     }
 
+    /**
+     * @param int $migrationsId
+     * @param array $params
+     * @throws \Throwable
+     */
     private function reindexMigration(int $migrationsId, array $params)
     {
         /** @var ElasticsearchMigrationsReindexContract $repository */

src/Models/Entity/ElasticsearchMigration.php

@@ -4,6 +4,10 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
+/**
+ * @property integer $id
+ * @property string $migration
+ */
 class ElasticsearchMigration extends Model
 {
     /**
@@ -13,15 +17,6 @@ class ElasticsearchMigration extends Model
      */
     protected $table = 'triadev_elasticsearch_migration';
 
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'migration'
-    ];
-
     /**
      * Get migrations
      *

src/Models/Entity/ElasticsearchMigrationStatus.php

@@ -3,6 +3,10 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @property string $migrations_id
+ * @property string $status
+ */
 class ElasticsearchMigrationStatus extends Model
 {
     /**
@@ -11,14 +15,4 @@ class ElasticsearchMigrationStatus extends Model
      * @var string
      */
     protected $table = 'triadev_elasticsearch_migration_status';
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'migration',
-        'status'
-    ];
 }