DDST-382: Handle errors while deleting orphaned embargo

discoverygarden · Jul 29, 2024 · 14fb7a2 · 14fb7a2
1 parent b13c6c9
commit 14fb7a2
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/Entity/Embargo.php b/src/Entity/Embargo.php
@@ -397,29 +397,33 @@ public function getCacheMaxAge() {
    * {@inheritdoc}
    */
   public function getCacheTags() {
-    $tags = Cache::mergeTags(parent::getCacheTags(), $this->getEmbargoedNode()->getCacheTags());
+    if ($this->getEmbargoedNode() !== NULL) {
+      $tags = Cache::mergeTags(parent::getCacheTags(), $this->getEmbargoedNode()->getCacheTags());
 
-    if ($this->getExemptIps()) {
-      $tags = Cache::mergeTags($tags, $this->getExemptIps()->getCacheTags());
+      if ($this->getExemptIps()) {
+        $tags = Cache::mergeTags($tags, $this->getExemptIps()->getCacheTags());
+      }
+      return $tags;
     }
-    return $tags;
   }
 
   /**
    * {@inheritDoc}
    */
   public function getCacheContexts() {
-    $contexts = Cache::mergeContexts(
-      parent::getCacheContexts(),
-      $this->getEmbargoedNode()->getCacheContexts(),
-      ['user.embargo__has_exemption'],
-    );
-
-    if ($this->getExemptIps()) {
-      $contexts = Cache::mergeContexts($contexts, $this->getExemptIps()->getCacheContexts());
+    if ($this->getEmbargoedNode() !== NULL) {
+      $contexts = Cache::mergeContexts(
+        parent::getCacheContexts(),
+        $this->getEmbargoedNode()->getCacheContexts(),
+        ['user.embargo__has_exemption'],
+      );
+
+      if ($this->getExemptIps()) {
+        $contexts = Cache::mergeContexts($contexts, $this->getExemptIps()->getCacheContexts());
+      }
+
+      return $contexts;
     }
-
-    return $contexts;
   }
 
   /**