Refactoring class inclusion

DatabayAG · Dec 7, 2023 · b9d407b · b9d407b
1 parent 8be39a9
commit b9d407b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 21 deletions.
diff --git a/Services/Badge/classes/Modal.php b/Services/Badge/classes/Modal.php
@@ -41,7 +41,7 @@ public function __construct(
     ) {
         $this->sign_file = Closure::fromCallable($sign_file);
         global $DIC;
-        $this->badge_image = new ilBadgeImage($DIC->resourceStorage());
+        $this->badge_image = new ilBadgeImage($DIC->resourceStorage(), $DIC->upload());
     }
 
     /**

diff --git a/Services/Badge/classes/Tile.php b/Services/Badge/classes/Tile.php
@@ -64,7 +64,7 @@ class_exists(ilDateTime::class); // Ensure ilDateTime is loaded as IL_CAL_UNIX i
         }
         $this->format_date = $format_date;
         global $DIC;
-        $this->badge_image = new ilBadgeImage($DIC->resourceStorage());
+        $this->badge_image = new ilBadgeImage($DIC->resourceStorage(), $DIC->upload());
     }
 
     /**

diff --git a/Services/Badge/classes/class.ilBadgeImage.php b/Services/Badge/classes/class.ilBadgeImage.php
@@ -4,14 +4,19 @@
 
 use ilBadge;
 use ILIAS\ResourceStorage\Services;
+use ilBadgeFileStakeholder;
+use ILIAS\FileUpload\FileUpload;
+use ILIAS\FileUpload\Exception\IllegalStateException;
 
 class ilBadgeImage
 {
     private ?Services $resource_storage = null;
+    private ?FileUpload $upload_service = null;
 
-    public function __construct(Services $resourceStorage)
+    public function __construct(Services $resourceStorage, FileUpload $uploadService)
     {
         $this->resource_storage = $resourceStorage;
+        $this->upload_service = $uploadService;
     }
 
     public function getImageFromBadge(ilBadge $badge) : string
@@ -31,4 +36,20 @@ public function getImageFromResourceId(int $badge_id, ?string $image_rid) : stri
         }
         return $image_src;
     }
+
+    /**
+     * @param ilBadge $badge
+     * @return void
+     * @throws IllegalStateException
+     */
+    public function processImageUpload(ilBadge $badge) : void
+    {
+        $this->upload_service->process();
+        $array_result = $this->upload_service->getResults();
+        $array_result = array_pop($array_result);
+        $stakeholder = new ilBadgeFileStakeholder();
+        $identification = $this->resource_storage->manage()->upload($array_result, $stakeholder);
+        $badge->setImageRid($identification);
+        $badge->update();
+    }
 }
diff --git a/Services/Badge/classes/class.ilBadgeManagementGUI.php b/Services/Badge/classes/class.ilBadgeManagementGUI.php
@@ -19,6 +19,7 @@
 use ILIAS\Badge\ilBadgeImage;
 use ILIAS\ResourceStorage\Services;
 use ILIAS\FileUpload\FileUpload;
+use ILIAS\FileUpload\Exception\IllegalStateException;
 
 /**
  * Class ilBadgeManagementGUI
@@ -80,7 +81,7 @@ public function __construct(
         );
 
         $this->session_repo = new ilBadgeManagementSessionRepository();
-        $this->badge_image = new ilBadgeImage($DIC->resourceStorage());
+        $this->badge_image = new ilBadgeImage($DIC->resourceStorage(), $DIC->upload());
     }
 
     public function executeCommand(): void
@@ -356,6 +357,10 @@ protected function initBadgeForm(
         return $form;
     }
 
+    /**
+     * @throws ilCtrlException
+     * @throws IllegalStateException
+     */
     protected function saveBadge(): void
     {
         $ilCtrl = $this->ctrl;
@@ -396,14 +401,7 @@ protected function saveBadge(): void
             $badge->create();
 
             if ($form->getInput('img_mode') === 'up') {
-              # $badge->uploadImage($_FILES['img']);
-                $this->upload_service->process();
-                $array_result = $this->upload_service->getResults();
-                $array_result = array_pop($array_result);
-                $stakeholder = new ilBadgeFileStakeholder();
-                $identification = $this->resource_storage->manage()->upload($array_result, $stakeholder);
-                $badge->setImageRid($identification);
-                $badge->update();
+                 $this->badge_image->processImageUpload($badge);
             } else {
                 $tmpl = new ilBadgeImageTemplate($form->getInput('tmpl'));
                 $badge->importImage($tmpl->getImage(), $tmpl->getImagePath());
@@ -470,6 +468,10 @@ protected function setBadgeFormValues(
         }
     }
 
+    /**
+     * @throws ilCtrlException
+     * @throws IllegalStateException
+     */
     protected function updateBadge(): void
     {
         $ilCtrl = $this->ctrl;
@@ -504,14 +506,7 @@ protected function updateBadge(): void
             }
 
             $badge->update();
-
-            $this->upload_service->process();
-            $array_result = $this->upload_service->getResults();
-            $array_result = array_pop($array_result);
-            $stakeholder = new ilBadgeFileStakeholder();
-            $identification = $this->resource_storage->manage()->upload($array_result, $stakeholder);
-            $badge->setImageRid($identification);
-            $badge->update();
+            $this->badge_image->processImageUpload($badge);
 
             $this->tpl->setOnScreenMessage('success', $lng->txt('settings_saved'), true);
             $ilCtrl->redirect($this, 'listBadges');

diff --git a/Services/Badge/classes/class.ilBadgeTableGUI.php b/Services/Badge/classes/class.ilBadgeTableGUI.php
@@ -46,7 +46,7 @@ public function __construct(
         $this->tile = new Tile($DIC);
         $ilCtrl = $DIC->ctrl();
         $lng = $DIC->language();
-        $this->badge_image = new ilBadgeImage($DIC->resourceStorage());
+        $this->badge_image = new ilBadgeImage($DIC->resourceStorage(), $DIC->upload());
 
         $this->setId("bdgbdg");
         $this->parent_type = ilObject::_lookupType($a_parent_obj_id);