improve code readability

Author: pxpm

src/app/Library/Uploaders/Support/RegisterUploadEvents.php

@@ -127,8 +127,8 @@ private function setupModelEvents(string $model, UploaderInterface $uploader): v
             app('crud')->entry = $uploader->retrieveUploadedFiles(app('crud')->entry);
         } else {
             // the retrieve model may differ from the deleting and saving models because retrieved event
-            // is not called in pivot models when eager loading the relations.
-            $retrieveModel = $this->getRetrieveModel($model, $uploader);
+            // is not called in pivot models when loading the relations.
+            $retrieveModel = $this->getModelForRetrieveEvent($model, $uploader);
 
             $retrieveModel::retrieved(function ($entry) use ($uploader) {
                 if ($entry->translationEnabled()) {
@@ -189,16 +189,14 @@ private function getSubfieldModel(array $subfield, UploaderInterface $uploader)
             return $subfield['baseModel'] ?? get_class(app('crud')->getModel());
         }
 
-        switch($subfield['relation_type']) {
-            case 'BelongsToMany':
-            case 'MorphToMany':
-                return app('crud')->getModel()->{$subfield['baseEntity']}()->getPivotClass();
+        if(in_array($subfield['relation_type'], ['BelongsToMany', 'MorphToMany'])) {
+            return app('crud')->getModel()->{$subfield['baseEntity']}()->getPivotClass();
         }
 
         return $subfield['baseModel'];
     }
 
-    private function getRetrieveModel(string $model, UploaderInterface $uploader)
+    private function getModelForRetrieveEvent(string $model, UploaderInterface $uploader)
     {
         if (! $uploader->isRelationship()) {
             return $model;

src/app/Library/Uploaders/Support/Traits/HandleRepeatableUploads.php

@@ -150,43 +150,7 @@ private function getUploaderFieldSubfields()
     private function deleteRepeatableFiles(Model $entry): void
     {
         if ($this->isRelationship) {
-            switch($this->getRepeatableRelationType()) {
-                case 'BelongsToMany':
-                case 'MorphToMany':
-                    $pivotAttributes = $entry->getAttributes();
-                    $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) {
-                        $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes));
-
-                        return $itemPivotAttributes === $pivotAttributes;
-                    })->first();
-
-                    if (! $connectedPivot) {
-                        return;
-                    }
-
-                    $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()];
-
-                    if (! $files) {
-                        return;
-                    }
-
-                    if (is_array($files)) {
-                        foreach ($files as $value) {
-                            $value = Str::start($value, $this->getPath());
-                            Storage::disk($this->getDisk())->delete($value);
-                        }
-
-                        return;
-                    }
-
-                    $value = Str::start($files, $this->getPath());
-                    Storage::disk($this->getDisk())->delete($value);
-
-                    return;
-            }
-
-            $this->deleteFiles($entry);
-
+            $this->deleteRelationshipFiles($entry);
             return;
         }
 
@@ -272,4 +236,42 @@ private function getValuesWithPathStripped(array|string|null $item, UploaderInte
 
         return isset($uploadedValues) ? Str::after($uploadedValues, $upload->getPath()) : null;
     }
+
+    private function deleteRelationshipFiles(Model $entry) : void
+    {
+        if (in_array($this->getRepeatableRelationType(), ['BelongsToMany', 'MorphToMany'])) {
+            $pivotAttributes = $entry->getAttributes();
+            $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) {
+                $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes));
+
+                return $itemPivotAttributes === $pivotAttributes;
+            })->first();
+
+            if (! $connectedPivot) {
+                return;
+            }
+
+            $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()];
+
+            if (! $files) {
+                return;
+            }
+
+            if (is_array($files)) {
+                foreach ($files as $value) {
+                    $value = Str::start($value, $this->getPath());
+                    Storage::disk($this->getDisk())->delete($value);
+                }
+
+                return;
+            }
+
+            $value = Str::start($files, $this->getPath());
+            Storage::disk($this->getDisk())->delete($value);
+
+            return;
+        }
+
+        $this->deleteFiles($entry);
+    }
 }