uploadFile 메소드에서 Exception 제어하지 않도록 수정, BaseException 추가

Author: Palbahngmiyine

src/Exceptions/BaseException.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Nurigo\Solapi\Exceptions;
+
+use Exception;
+
+class BaseException extends Exception
+{
+
+    /**
+     * @var string
+     */
+    public $errorCode;
+
+    public function __construct($message = "", $errorCode = "")
+    {
+        parent::__construct($message);
+        $this->errorCode = $errorCode;
+    }
+}

src/Exceptions/MessageNotReceivedException.php

@@ -17,8 +17,8 @@ class MessageNotReceivedException extends Exception
      */
     public function __construct($failedMessageList)
     {
-        $this->failedMessageList = $failedMessageList;
         parent::__construct("메시지 접수에 실패했습니다.");
+        $this->failedMessageList = $failedMessageList;
     }
 
     /**

src/Services/SolapiMessageService.php

@@ -4,6 +4,7 @@
 
 use DateTime;
 use Exception;
+use Nurigo\Solapi\Exceptions\BaseException;
 use Nurigo\Solapi\Exceptions\CurlException;
 use Nurigo\Solapi\Exceptions\MessageNotReceivedException;
 use Nurigo\Solapi\Libraries\Fetcher;
@@ -55,9 +56,10 @@ public function send($messages, DateTime $scheduledDateTime = null): SendRespons
     /**
      * @param string $filePath 파일 경로
      * @param string $type 파일 유형(MMS, RCS, DOCUMENT, KAKAO)
-     * @return string|null
+     * @throws Exception|CurlException
+     * @return string
      */
-    public function uploadFile(string $filePath, string $type = "MMS", $name = null, $link = null)
+    public function uploadFile(string $filePath, string $type = "MMS", $name = null, $link = null): string
     {
         $fileContent = file_get_contents($filePath);
         $encodedFile = base64_encode($fileContent);
@@ -74,15 +76,11 @@ public function uploadFile(string $filePath, string $type = "MMS", $name = null,
             $parameter->setLink($link);
         }
 
-        try {
-            $result = $this->fetcherInstance->request("POST", "/storage/v1/files", $parameter);
-            if (isset($result->errorCode)) {
-                throw new Exception();
-            }
-            $response = new UploadFileResponse($result);
-            return $response->fileId;
-        } catch (Exception $exception) {
-            return null;
+        $result = $this->fetcherInstance->request("POST", "/storage/v1/files", $parameter);
+        if (isset($result->errorCode)) {
+            throw new BaseException($result->errorMessage, $result->errorCode);
         }
+        $response = new UploadFileResponse($result);
+        return $response->fileId;
     }
 }