Simplify FolderDeleteMembership and EntityService

Author: JanOppolzer

app/Jobs/FolderDeleteMembership.php

@@ -31,23 +31,13 @@ public function __construct(
         private Federation $federation
     ) {}
 
-    public function getFederation(): Federation
-    {
-        return $this->federation;
-    }
-
-    public function getEntity(): Entity
-    {
-        return $this->entity;
-    }
-
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        $federation = $this->getFederation();
-        $entity = $this->getEntity();
+        $federation = $this->federation;
+        $entity = $this->entity;
         $diskName = config('metaman.metadata');
 
         try {

app/Services/EntityService.php

@@ -46,19 +46,15 @@ public function saveEntityMetadataToFolder($entity_id, $folderName): void
         Storage::disk($diskName)->put($filePath, $content);
     }
 
-    public function deleteEntityMetadataFromFolder($fileName, $folderName): void
+    public function deleteEntityMetadataFromFolder($file, $folder): void
     {
-        $diskName = config('metaman.metadata');
-        $pathToFile = $folderName.'/'.$fileName;
+        $disk = config('metaman.metadata');
+        $path = $folder.'/'.$file;
 
-        if (Storage::disk($diskName)->exists($pathToFile)) {
-            try {
-                Storage::disk($diskName)->delete($pathToFile);
-            } catch (\Exception $e) {
-                throw new \InvalidArgumentException("Unable to delete file $pathToFile");
-            }
-        } else {
-            throw new \InvalidArgumentException("Unable to find file $pathToFile");
+        try {
+            Storage::disk($disk)->delete($path);
+        } catch (\Exception $e) {
+            throw new \InvalidArgumentException("Unable to delete non-existent file: $path");
         }
     }
 }