fix: syntax for virtual page integration

wilr · Aug 30, 2024 · 600debe · 600debe
1 parent 07a8ff9
commit 600debe
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -7,6 +7,10 @@ SilverStripe\CMS\Model\SiteTree:
 SilverStripe\Subsites\Pages\SubsitesVirtualPage:
   extensions:
     - Wilr\SilverStripe\Algolia\Extensions\SubsitesVirtualPageExtension
-ilverStripe\CMS\Model\VirtualPage:
+SilverStripe\CMS\Model\VirtualPage:
   extensions:
     - Wilr\SilverStripe\Algolia\Extensions\VirtualPageExtension
+  non_virtual_fields:
+    - AlgoliaUUID
+    - AlgoliaIndexed
+    - AlgoliaError
diff --git a/src/Extensions/AlgoliaObjectExtension.php b/src/Extensions/AlgoliaObjectExtension.php
@@ -176,11 +176,15 @@ private function updateAlgoliaFields($fields)
 
         if ($table && count($fields)) {
             $sets = [];
+
             foreach ($fields as $field => $value) {
                 $sets[] = "$field = $value";
             }
+
             $set = implode(', ', $sets);
-            DB::query(sprintf('UPDATE %s SET %s WHERE ID = %s', $table, $set, $this->owner->ID));
+            $query = sprintf('UPDATE %s SET %s WHERE ID = %s', $table, $set, $this->owner->ID);
+
+            DB::query($query);
 
             if ($this->owner->hasExtension(Versioned::class) && $this->owner->hasStages()) {
                 DB::query(
@@ -311,10 +315,12 @@ public function onBeforeWrite()
     public function assignAlgoliaUUID($writeImmediately = true)
     {
         $uuid = Uuid::uuid4();
-        $this->owner->AlgoliaUUID = $uuid->toString();
+        $value = $uuid->toString();
+
+        $this->owner->AlgoliaUUID = $value;
 
         if ($writeImmediately) {
-            $this->updateAlgoliaFields(['AlgoliaUUID' => "'" . $this->owner->AlgoliaUUID . "'"]);
+            $this->updateAlgoliaFields(['AlgoliaUUID' => "'$value'"]);
         }
     }
 

diff --git a/src/Extensions/SubsitesVirtualPageExtension.php b/src/Extensions/SubsitesVirtualPageExtension.php
@@ -35,6 +35,7 @@ public function exportObjectToAlgolia($toIndex)
             }
 
             $attributes->push('objectClassName', $originalObject->ClassName);
+
             $specs = $originalObject->config()->get('algolia_index_fields');
             $attributes = $indexer->addSpecsToAttributes($originalObject, $attributes, $specs);
 

diff --git a/src/Tasks/AlgoliaReindexItem.php b/src/Tasks/AlgoliaReindexItem.php
@@ -2,6 +2,7 @@
 
 namespace Wilr\SilverStripe\Algolia\Tasks;
 
+use SilverStripe\CMS\Model\VirtualPage;
 use SilverStripe\Core\Environment;
 use SilverStripe\Dev\BuildTask;
 use SilverStripe\ORM\DataObject;
@@ -24,14 +25,14 @@ public function run($request)
         if ($request->getVar('class')) {
             $targetClass = $request->getVar('class');
         } else {
-            echo 'Missing class';
+            echo 'Missing class argument';
             exit;
         }
 
         if ($request->getVar('id')) {
             $id = $request->getVar('id');
         } else {
-            echo 'Missing class';
+            echo 'Missing id argument';
             exit;
         }
 
@@ -44,15 +45,19 @@ public function run($request)
 
         // Set AlgoliaUUID, in case it wasn't previously set
         if (!$obj->AlgoliaUUID) {
+            echo 'No AlgoliaUUID set on object, generating one...' . PHP_EOL;
             $obj->assignAlgoliaUUID(true);
         }
 
+
         $result = $obj->doImmediateIndexInAlgolia();
 
         echo sprintf(
-            'Indexed: %s, UUID: %s',
+            'Indexed: %s%sUUID: %s%s%s',
             $result ? 'true' : 'false',
-            $obj->AlgoliaUUID,
+            PHP_EOL,
+            $obj->AlgoliaUUID ? $obj->AlgoliaUUID : 'No ID set',
+            PHP_EOL,
             $obj->AlgoliaError ? 'Error from Algolia: ' . $obj->AlgoliaError : ''
         );
     }