[fix] result handle on response

Author: yusronarif

src/Base/Concerns/HasApi.php

@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
+use Kfn\Base\Contracts\IResponseResult;
 use Kfn\Base\Enums\ResponseCode;
 use Kfn\Base\Response;
 
@@ -20,7 +21,7 @@ trait HasApi
     protected array $responseMessages;
 
     /**
-     * Use to get response message.
+     * Use to get a response message.
      *
      * @param  string  $context
      *
@@ -37,6 +38,7 @@ public function getResponseMessage(string $context): string
      * @param  ResponseCode  $rc
      * @param  array  $headers
      * @param  array  $extra
+     * @param  IResponseResult|null  $as
      *
      * @return Response
      */
@@ -45,13 +47,14 @@ public function response(
         string|null $message = null,
         ResponseCode $rc = ResponseCode::SUCCESS,
         array $headers = [],
-        array $extra = []
+        array $extra = [],
+        IResponseResult|null $as = null
     ): Response {
         if (is_null($this->accept)) {
             $this->acceptJson();
         }
 
-        return new Response($data, $message, $rc, $headers, $extra);
+        return new Response($data, $message, $rc, $headers, $extra, $as);
     }
 
     public function contentType(string $contentType): static

src/Base/Response.php

@@ -35,13 +35,26 @@ class Response implements IResponse, Responsable
 
     /** @var int */
     public static int $jsonOption = JSON_THROW_ON_ERROR;
+
+    /** @var ResponseHeaderBag */
     public ResponseHeaderBag $headers;
+
+    /** @var string */
     protected string $content;
     protected string $version;
+
+    /** @var int */
     protected int $statusCode;
+
+    /** @var string */
     protected string $statusText;
+
+    /** @var string|null */
     protected string|null $charset = null;
 
+    /** @var array */
+    public array $extra = [];
+
     /**
      * Response constructor.
      *
@@ -50,16 +63,19 @@ class Response implements IResponse, Responsable
      * @param  IResponseCode  $code
      * @param  array  $headers
      * @param  array  $extra
+     * @param  IResponseResult|null  $as
      */
     public function __construct(
         public array|Arrayable|CursorPaginator|JsonResource|LengthAwarePaginator|ResourceCollection|string|null $data = null,
         public string|null $message = null,
         public IResponseCode $code = ResponseCode::SUCCESS,
         array $headers = [],
-        public array $extra = [],
+        array $extra = [],
+        private readonly IResponseResult|null $as = null
     ) {
         //
         $this->headers = new ResponseHeaderBag($headers);
+        $this->extra = array_merge($this->extra, $extra);
     }
 
     /**
@@ -102,7 +118,11 @@ public function getResponseData(): array
             default => $this->data,
         };
 
-        if (static::$resultAs == ResponseResult::CUSTOM) {
+        if ($this->as instanceof IResponseResult && static::$resultAs !== ResponseResult::CUSTOM) {
+            static::$resultAs = $this->as;
+        }
+
+        if (static::$resultAs === ResponseResult::CUSTOM) {
             if (static::$customResult instanceof Closure) {
                 return call_user_func(static::$customResult, $this, $payload);
             }

src/UI/Response.php

@@ -17,14 +17,24 @@
 use Illuminate\Support\Fluent;
 use Kfn\Base\Contracts\IResponseCode;
 use Kfn\Base\Enums\ResponseCode;
+use Kfn\Base\Enums\ResponseResult;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
 class Response extends \Kfn\Base\Response implements Responsable
 {
+    /** @var Response|string|View|null */
     private Response|string|View|null $view = null;
+
+    /** @var Fluent */
     private Fluent $viewOption;
+
+    /** @var string|null */
     private string|null $redirect = null;
+
+    /** @var Fluent */
     private Fluent $redirectOption;
+
+    /** @var array */
     private array $with = [];
 
     /** {@inheritdoc} */
@@ -35,23 +45,25 @@ public function __construct(
         array $headers = [],
         array $extra = []
     ) {
-        parent::__construct($data, $message, $code, $headers, $extra);
+        parent::__construct($data, $message, $code, $headers, $extra, ResponseResult::DEFAULT);
         $this->redirectOption = new Fluent;
         $this->viewOption = new Fluent;
     }
 
     /** {@inheritdoc} */
     public function toResponse($request): HttpResponse|JsonResponse|SymfonyResponse
     {
-        if (! $request->expectsJson()) {
-            if (in_array($this->redirect, ['back', 'to', 'intended', 'action', 'route'])) {
-                $response = null;
-                $this->handleRedirect($request, $response);
+        $response = null;
 
-                if ($response instanceof RedirectResponse) {
-                    return $response->send();
-                }
+        if (in_array($this->redirect, ['back', 'to', 'intended', 'action', 'route'])) {
+            $this->handleRedirect($request, $response);
+        }
+
+        if (! $request->expectsJson()) {
+            if ($response instanceof RedirectResponse) {
+                return $response->send();
             }
+
             if (! is_null($this->view)) {
                 return new HttpResponse($this->handleView());
             }