Fixed an issue which occurred when an Entry has an `entries.primaryOw…

…nerId` which does not exist anymore. #35
internetztube · Jun 18, 2024 · bb9ec4e · bb9ec4e
1 parent e90a100
commit bb9ec4e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.0.3 - 2024-06-18
+### Fixed
+- Fixed an issue which occurred when an Entry has an `entries.primaryOwnerId` which does not exist anymore. [#35](https://github.com/internetztube/craft-element-relations/issues/35)
+
 ## 3.0.2 - 2024-06-18
 ### Fixed
 - Move Resaving completely into queue + 2k batching.

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "internetztube/craft-element-relations",
     "description": "Shows all relations of an element.",
     "type": "craft-plugin",
-    "version": "3.0.2.3",
+    "version": "3.0.3",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/services/RelationsService.php b/src/services/RelationsService.php
@@ -34,6 +34,7 @@ public static function getRelations(ElementInterface $element): array
                 ['=', 'elementrelations_cache.targetSiteId', $element->siteId],
             ])
             ->collect()
+            ->filter(fn (array $row) => $row['type'])
             ->groupBy('type')
             ->map(function (Collection $items, string $elementType) {
                 $whereStatements = $items->map(fn($value) => [
@@ -53,6 +54,26 @@ public static function getRelations(ElementInterface $element): array
                 ];
             })
             ->flatten()
+
+            // Check if Element has a valid `primaryOwner` or ´owner`
+            // https://github.com/internetztube/craft-element-relations/issues/35
+            ->filter(function (ElementInterface $element) {
+                if (method_exists($element, 'getPrimaryOwner')) {
+                    try {
+                        $element->getPrimaryOwner();
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+                }
+                if (method_exists($element, 'getOwner')) {
+                    try {
+                        $element->getOwner();
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+                }
+                return true;
+            })
             ->all();
     }
 }