Merge pull request #121 from apisearch-io/fix/changed-repository-reference-to-simple-model

Changed repository_reference to simple objects

Author: mmoreram

App/AppRepository.php

@@ -107,7 +107,7 @@ public function checkIndex(IndexUUID $indexUUID): bool;
      *
      * @param IndexUUID $indexUUID
      * @param Config    $config
-     * @param bool $forceReindex
+     * @param bool      $forceReindex
      *
      * @throws ResourceNotAvailableException
      */

App/DiskAppRepository.php

@@ -120,7 +120,7 @@ public function checkIndex(IndexUUID $indexUUID): bool
      *
      * @param IndexUUID $indexUUID
      * @param Config    $config
-     * @param bool $forceReindex
+     * @param bool      $forceReindex
      *
      * @throws ResourceNotAvailableException
      */

App/HttpAppRepository.php

@@ -268,7 +268,7 @@ public function checkIndex(IndexUUID $indexUUID): bool
      *
      * @param IndexUUID $indexUUID
      * @param Config    $config
-     * @param bool $forceReindex
+     * @param bool      $forceReindex
      *
      * @throws ResourceNotAvailableException
      */
@@ -287,7 +287,7 @@ public function configureIndex(
                 ),
                 'post',
                 [
-                    'force_reindex' => $forceReindex
+                    'force_reindex' => $forceReindex,
                 ],
                 $config->toArray(),
                 Http::getApisearchHeaders($this)

App/InMemoryAppRepository.php

@@ -141,7 +141,7 @@ public function checkIndex(IndexUUID $indexUUID): bool
      *
      * @param IndexUUID $indexUUID
      * @param Config    $config
-     * @param bool $forceReindex
+     * @param bool      $forceReindex
      *
      * @throws ResourceNotAvailableException
      */

App/MockAppRepository.php

@@ -134,7 +134,7 @@ public function checkIndex(IndexUUID $indexUUID): bool
      *
      * @param IndexUUID $indexUUID
      * @param Config    $config
-     * @param bool $forceReindex
+     * @param bool      $forceReindex
      *
      * @throws ResourceNotAvailableException
      */

Model/Item.php

@@ -101,9 +101,14 @@ class Item implements HttpTransportable, UUIDReference
     private $score;
 
     /**
-     * @var RepositoryReference
+     * @var AppUUID|null
      */
-    private $repositoryReference;
+    private $appUUID;
+
+    /**
+     * @var IndexUUID|null
+     */
+    private $indexUUID;
 
     /**
      * Item constructor.
@@ -496,19 +501,28 @@ public function setScore(float $score)
     }
 
     /**
-     * @return RepositoryReference|null
+     * @param RepositoryReference $repositoryReference
      */
-    public function getRepositoryReference():? RepositoryReference
+    public function setRepositoryReference(RepositoryReference $repositoryReference)
     {
-        return $this->repositoryReference;
+        $this->appUUID = $repositoryReference->getAppUUID();
+        $this->indexUUID = $repositoryReference->getIndexUUID();
     }
 
     /**
-     * @param RepositoryReference $repositoryReference
+     * @return AppUUID|null
      */
-    public function setRepositoryReference(RepositoryReference $repositoryReference)
+    public function getAppUUID(): ?AppUUID
     {
-        $this->repositoryReference = $repositoryReference;
+        return $this->appUUID;
+    }
+
+    /**
+     * @return IndexUUID|null
+     */
+    public function getIndexUUID(): ?IndexUUID
+    {
+        return $this->indexUUID;
     }
 
     /**
@@ -532,8 +546,11 @@ public function toArray(): array
             'highlights' => $this->highlights,
             'is_promoted' => !$this->promoted ? null : true,
             'score' => $this->score,
-            'repository_reference' => $this->repositoryReference instanceof RepositoryReference
-                ? $this->repositoryReference->compose()
+            'app_uuid' => $this->appUUID instanceof AppUUID
+                ? $this->appUUID->toArray()
+                : null,
+            'index_uuid' => $this->indexUUID instanceof IndexUUID
+                ? $this->indexUUID->toArray()
                 : null,
         ], function ($element) {
             return
@@ -602,8 +619,12 @@ public static function createFromArray(array $array): self
             $item->setScore((float) $array['score']);
         }
 
-        if (isset($array['repository_reference']) && !is_null($array['repository_reference'])) {
-            $item->setRepositoryReference(RepositoryReference::createFromComposed($array['repository_reference']));
+        if (isset($array['app_uuid']) && !is_null($array['app_uuid'])) {
+            $item->appUUID = AppUUID::createFromArray($array['app_uuid']);
+        }
+
+        if (isset($array['index_uuid']) && !is_null($array['index_uuid'])) {
+            $item->indexUUID = IndexUUID::createFromArray($array['index_uuid']);
         }
 
         return $item;

Repository/HttpRepository.php

@@ -132,7 +132,7 @@ public function updateItems(
     }
 
     /**
-     * Delete items by query
+     * Delete items by query.
      *
      * @param Query $query
      */

Repository/InMemoryRepository.php

@@ -98,7 +98,7 @@ public function updateItems(
     }
 
     /**
-     * Delete items by query
+     * Delete items by query.
      *
      * @param Query $query
      */

Repository/MockRepository.php

@@ -73,7 +73,7 @@ public function updateItems(
     }
 
     /**
-     * Delete items by query
+     * Delete items by query.
      *
      * @param Query $query
      */

Repository/Repository.php

@@ -201,7 +201,7 @@ abstract public function updateItems(
     );
 
     /**
-     * Delete items by query
+     * Delete items by query.
      *
      * @param Query $query
      */