Simplify EntityHfdController

Author: JanOppolzer

app/Http/Controllers/EntityHfdController.php

@@ -25,11 +25,8 @@ public function update(Entity $entity): RedirectResponse
 
         $entity = DB::transaction(function () use ($entity) {
             $entity->hfd = ! $entity->hfd;
-            $xml_document = HfdTag::update($entity);
-            if ($xml_document) {
-                $entity->xml_file = $xml_document;
-                $entity->update();
-            }
+            $entity->xml_file = HfdTag::update($entity);
+            $entity->update();
 
             return $entity;
         });

app/Services/HfdTagService.php

@@ -42,36 +42,33 @@ public function createFromXml(string $xml_document): false|string
         return $dom->saveXML();
     }
 
-    public function delete(Entity $entity): false|string
+    public function delete(Entity $entity): string
     {
         $dom = $this->createDOM($entity->xml_file);
         $xPath = $this->createXPath($dom);
-        $this->deleteByXpath($xPath);
+        $xpathQuery = $this->buildXPathQuery($this->value);
+        $this->DeleteAllTags($xpathQuery, $xPath);
         $dom->normalize();
 
         return $dom->saveXML();
     }
 
-    public function deleteByXpath(DOMXPath $xPath): void
-    {
-        $xpathQuery = $this->buildXPathQuery($this->value);
-        $this->DeleteAllTags($xpathQuery, $xPath);
-    }
-
-    public function update(Entity $entity): false|string
+    public function update(Entity $entity): string
     {
         try {
             if ($entity->hfd) {
                 if (! $this->hasTagInDocument($entity->xml_file, $this->value)) {
                     return $this->create($entity);
                 }
+
+                return $entity->xml_file;
             } else {
                 if ($this->hasTagInDocument($entity->xml_file, $this->value)) {
                     return $this->delete($entity);
                 }
-            }
 
-            return false;
+                return $entity->xml_file;
+            }
         } catch (Exception $e) {
             Log::critical("Exception occurred in {$entity->id}}: {$e->getMessage()}");
             throw $e;