Merge pull request #62 from spira/hotfix/remove-is-indexed

Reverting PR#55 (#55)
spira · Jun 6, 2016 · fcfb994 · fcfb994
2 parents b69609e + 05cf60f
commit fcfb994
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 462 deletions.
diff --git a/Controllers/AbstractRelatedEntityController.php b/Controllers/AbstractRelatedEntityController.php
@@ -38,11 +38,6 @@ abstract class AbstractRelatedEntityController extends ApiController
      */
     protected $parentModel;
 
-    /**
-     * @var bool
-     */
-    protected $isIndexed = true;
-
     public function __construct(BaseModel $parentModel, TransformerInterface $transformer)
     {
         $this->parentModel = $parentModel;

diff --git a/Controllers/ChildEntityController.php b/Controllers/ChildEntityController.php
@@ -87,10 +87,8 @@ public function postOne(Request $request, ElasticSearchIndexer $searchIndexer, $
 
         $this->getRelation($parent)->save($childModel);
 
-        if ($this->isIndexed) {
-            // Children is auto updated, so need only to update parent
-            $searchIndexer->reindexOne($parent, []);
-        }
+        // Children is auto updated, so need only to update parent
+        $searchIndexer->reindexOne($parent, []);
 
         return $this->getResponse()
             ->transformer($this->getTransformer())
@@ -121,10 +119,8 @@ public function postMany(Request $request, ElasticSearchIndexer $searchIndexer,
 
         $this->getRelation($parent)->saveMany($childModels);
 
-        if ($this->isIndexed) {
-            // Children is auto updated, so need only to update parent
-            $searchIndexer->reindexOne($parent, []);
-        }
+        // Children is auto updated, so need only to update parent
+        $searchIndexer->reindexOne($parent, []);
 
         return $this->getResponse()
             ->transformer($this->getTransformer())
@@ -163,13 +159,11 @@ public function putOne(Request $request, ElasticSearchIndexer $searchIndexer, $i
 
         $this->getRelation($parent)->save($childModel);
 
-        if ($this->isIndexed) {
-            // Parent should be reindexed itself
-            $searchIndexer->reindexOne($parent, []);
+        // Parent should be reindexed itself
+        $searchIndexer->reindexOne($parent, []);
 
-            // Need to reindex childModel and all relations
-            $searchIndexer->reindexOne($childModel);
-        }
+        // Need to reindex childModel and all relations
+        $searchIndexer->reindexOne($childModel);
 
         return $this->getResponse()
             ->transformer($this->getTransformer())
@@ -198,6 +192,12 @@ public function putMany(Request $request, ElasticSearchIndexer $searchIndexer, $
 
         $this->checkPermission(static::class.'@putMany', ['model' => $parent, 'children' => $childModels]);
 
+        // Collect all affected items
+        $reindexItems = $searchIndexer->mergeUniqueCollection(
+            $searchIndexer->getAllItemsFromRelations($parent, [$this->relationName]),
+            $childModels
+        );
+
         $relation = $this->getRelation($parent);
 
         if ($relation instanceof BelongsToMany) {
@@ -207,19 +207,11 @@ public function putMany(Request $request, ElasticSearchIndexer $searchIndexer, $
             $relation->saveMany($childModels);
         }
 
-        if ($this->isIndexed) {
-            // Collect all affected items
-            $reindexItems = $searchIndexer->mergeUniqueCollection(
-                $searchIndexer->getAllItemsFromRelations($parent, [$this->relationName]),
-                $childModels
-            );
-
-            // We need to reindex all affected items with relations
-            $searchIndexer->reindexMany($reindexItems);
+        // We need to reindex all affected items with relations
+        $searchIndexer->reindexMany($reindexItems);
 
-            // Reindex parent without relations
-            $searchIndexer->reindexOne($parent, []);
-        }
+        // Reindex parent without relations
+        $searchIndexer->reindexOne($parent, []);
 
         $this->postSync($parent, $childModels);
 
@@ -259,13 +251,11 @@ public function patchOne(Request $request, ElasticSearchIndexer $searchIndexer,
 
         $this->getRelation($parent)->save($childModel);
 
-        if ($this->isIndexed) {
-            // Parent should be reindexed itself
-            $searchIndexer->reindexOne($parent, []);
+        // Parent should be reindexed itself
+        $searchIndexer->reindexOne($parent, []);
 
-            // Need to reindex childModel and all relations
-            $searchIndexer->reindexOne($childModel);
-        }
+        // Need to reindex childModel and all relations
+        $searchIndexer->reindexOne($childModel);
 
         return $this->getResponse()->noContent();
     }
@@ -292,13 +282,11 @@ public function patchMany(Request $request, ElasticSearchIndexer $searchIndexer,
 
         $this->getRelation($parent)->saveMany($childModels);
 
-        if ($this->isIndexed) {
-            // Parent should be reindexed itself
-            $searchIndexer->reindexOne($parent, []);
+        // Parent should be reindexed itself
+        $searchIndexer->reindexOne($parent, []);
 
-            // We need to reindex all items with relations
-            $searchIndexer->reindexMany($childModels);
-        }
+        // We need to reindex all items with relations
+        $searchIndexer->reindexMany($childModels);
 
         return $this->getResponse()->noContent();
     }
@@ -324,11 +312,7 @@ public function deleteOne($id, ElasticSearchIndexer $searchIndexer, $childId = f
 
         $this->checkPermission(static::class.'@deleteOne', ['model' => $parent, 'children' => $childModel]);
 
-        if ($this->isIndexed) {
-            $searchIndexer->deleteOneAndReindexRelated($childModel);
-        } else {
-            $childModel->delete();
-        }
+        $searchIndexer->deleteOneAndReindexRelated($childModel);
 
         $parent->fireRevisionableEvent('deleteChild', [$childModel, $this->relationName]);
 
@@ -351,13 +335,7 @@ public function deleteMany(Request $request, ElasticSearchIndexer $searchIndexer
 
         $this->checkPermission(static::class.'@deleteMany', ['model' => $model, 'children' => $childModels]);
 
-        if ($this->isIndexed) {
-            $searchIndexer->deleteManyAndReindexRelated($childModels);
-        } else {
-            $childModels->each(function ($childModel) {
-                $childModel->delete();
-            });
-        }
+        $searchIndexer->deleteManyAndReindexRelated($childModels);
 
         return $this->getResponse()->noContent();
     }

diff --git a/Controllers/LinkedEntityController.php b/Controllers/LinkedEntityController.php
@@ -48,10 +48,8 @@ public function attachOne(Request $request, ElasticSearchIndexer $searchIndexer,
 
         $this->getRelation($parent)->attach($childModel, $this->getPivotValues($childModel));
 
-        if ($this->isIndexed) {
-            $searchIndexer->reindexOne($parent, []);
-            $searchIndexer->reindexOne($childModel, []);
-        }
+        $searchIndexer->reindexOne($parent, []);
+        $searchIndexer->reindexOne($childModel, []);
 
         return $this->getResponse()->created();
     }
@@ -74,10 +72,8 @@ public function detachOne(ElasticSearchIndexer $searchIndexer, $id, $childId)
         $this->checkPermission(static::class.'@detachOne', ['model' => $parent, 'children' => $childModel]);
         $this->getRelation($parent)->detach($childModel);
 
-        if ($this->isIndexed) {
-            $searchIndexer->reindexOne($parent, []);
-            $searchIndexer->reindexOne($childModel, []);
-        }
+        $searchIndexer->reindexOne($parent, []);
+        $searchIndexer->reindexOne($childModel, []);
 
         return $this->getResponse()->noContent();
     }
@@ -87,16 +83,16 @@ public function detachAll(ElasticSearchIndexer $searchIndexer, $id)
         $parent = $this->findParentEntity($id);
 
         $this->checkPermission(static::class.'@detachAll', ['model' => $parent]);
+
+        $reindexItems = $searchIndexer->getAllItemsFromRelations($parent, [$this->relationName]);
+
         $this->getRelation($parent)->detach();
 
-        if ($this->isIndexed) {
-            $reindexItems = $searchIndexer->getAllItemsFromRelations($parent, [$this->relationName]);
-            // Reindex parent entity
-            $searchIndexer->reindexOne($parent, []);
+        // Reindex parent entity
+        $searchIndexer->reindexOne($parent, []);
 
-            // Reindex all detached entities
-            $searchIndexer->reindexMany($reindexItems, []);
-        }
+        // Reindex all detached entities
+        $searchIndexer->reindexMany($reindexItems, []);
 
         return $this->getResponse()->noContent();
     }
@@ -116,23 +112,21 @@ protected function processMany(Request $request, $id, $method)
 
         $this->saveNewItemsInCollection($childModels);
 
+        /** @var ElasticSearchIndexer $searchIndexer */
+        $searchIndexer = app(ElasticSearchIndexer::class);
+        $reindexItems = $searchIndexer->mergeUniqueCollection(
+            $searchIndexer->getAllItemsFromRelations($parent, [$this->relationName]),
+            $childModels
+        );
+
         $this->getRelation($parent)->{$method}($this->makeSyncList($childModels, $requestCollection));
         $this->postSync($parent, $childModels);
 
-        if ($this->isIndexed) {
-            /** @var ElasticSearchIndexer $searchIndexer */
-            $searchIndexer = app(ElasticSearchIndexer::class);
-            $reindexItems = $searchIndexer->mergeUniqueCollection(
-                $searchIndexer->getAllItemsFromRelations($parent, [$this->relationName]),
-                $childModels
-            );
+        // Reindex parent entity without relations
+        $searchIndexer->reindexOne($parent, []);
 
-            // Reindex parent entity without relations
-            $searchIndexer->reindexOne($parent, []);
-
-            // Reindex all affected items without relations
-            $searchIndexer->reindexMany($reindexItems, []);
-        }
+        // Reindex all affected items without relations
+        $searchIndexer->reindexMany($reindexItems, []);
 
         $transformed = $this->getTransformer()->transformCollection($this->findAllChildren($parent), ['_self']);
 

diff --git a/Responder/TransformerService.php b/Responder/TransformerService.php
@@ -80,7 +80,6 @@ public function item($data, $transformer = null, $resourceKey = null)
     protected function getTransformer($transformer = null)
     {
         return $transformer ?: function ($data) {
-
             if ($data instanceof Arrayable) {
                 return $data->toArray();
             }

diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -14,7 +14,6 @@
 use Spira\Core\Model\Test\SecondTestEntity;
 
 $factory->define(TestEntity::class, function (\Faker\Generator $faker) {
-
     return [
         'entity_id' => $faker->uuid,
         'varchar' => $faker->word,

diff --git a/database/migrations/2015_06_01_014141_create_test_entities_table.php b/database/migrations/2015_06_01_014141_create_test_entities_table.php
@@ -25,25 +25,25 @@ public function up()
             return true;
         }
         Schema::create(TestEntity::getTableName(), function (Blueprint $table) {
-                $table->uuid('entity_id');
-                $table->string('varchar', 255);
-                $table->char('hash', 60);
-                $table->integer('integer');
-                $table->decimal('decimal', 11, 2);
-                $table->boolean('boolean');
-                $table->boolean('nullable')->nullable();
-                $table->text('text');
-                $table->date('date');
-                $table->dateTime('time');
-                $table->boolean('multi_word_column_title');
-                $table->boolean('hidden');
-                $table->json('json');
+            $table->uuid('entity_id');
+            $table->string('varchar', 255);
+            $table->char('hash', 60);
+            $table->integer('integer');
+            $table->decimal('decimal', 11, 2);
+            $table->boolean('boolean');
+            $table->boolean('nullable')->nullable();
+            $table->text('text');
+            $table->date('date');
+            $table->dateTime('time');
+            $table->boolean('multi_word_column_title');
+            $table->boolean('hidden');
+            $table->json('json');
 
-                $table->dateTime('created_at');
-                $table->dateTime('updated_at')->nullable();
+            $table->dateTime('created_at');
+            $table->dateTime('updated_at')->nullable();
 
-                $table->primary('entity_id');
-            }
+            $table->primary('entity_id');
+        }
         );
     }
 

diff --git a/database/migrations/2015_09_11_004817_create_localizations_table.php b/database/migrations/2015_09_11_004817_create_localizations_table.php
@@ -23,7 +23,6 @@ class CreateLocalizationsTable extends Migration
     public function up()
     {
         Schema::create(static::TABLE_NAME, function (Blueprint $table) {
-
             $table->uuid('localizable_id');
             $table->string('localizable_type');
 

diff --git a/database/migrations/2016_04_16_012124_create_ordered_test_entities_table.php b/database/migrations/2016_04_16_012124_create_ordered_test_entities_table.php
@@ -25,12 +25,12 @@ public function up()
             return true;
         }
         Schema::create(OrderedTestEntity::getTableName(), function (Blueprint $table) {
-                $table->uuid('entity_id');
-                $table->string('varchar', 255);
-                $table->integer('integer');
+            $table->uuid('entity_id');
+            $table->string('varchar', 255);
+            $table->integer('integer');
 
-                $table->primary('entity_id');
-            }
+            $table->primary('entity_id');
+        }
         );
     }