Orders endpoint: Make sure we get the customer_id in the request (#79)

* Make sure we get the customer_id in the request * wip Signed-off-by: Sam Poyigi <[email protected]> * refactor Signed-off-by: Sam Poyigi <[email protected]> * wip Signed-off-by: Sam Poyigi <[email protected]> * Move logic to repository layer Signed-off-by: Sam Poyigi <[email protected]> * wip Signed-off-by: Sam Poyigi <[email protected]> * wip Signed-off-by: Sam Poyigi <[email protected]> Signed-off-by: Sam Poyigi <[email protected]> Co-authored-by: Sam Poyigi <[email protected]>
tastyigniter · Aug 28, 2022 · 174f927 · 174f927
1 parent 62df17d
commit 174f927
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 42 deletions.
diff --git a/actions/RestController.php b/actions/RestController.php
@@ -7,7 +7,6 @@
 use Igniter\Api\Classes\AbstractRepository;
 use Igniter\Api\Traits\RestExtendable;
 use Igniter\Flame\Exception\ValidationException;
-use Illuminate\Support\Facades\Request;
 use System\Classes\ControllerAction;
 
 /**
@@ -175,7 +174,7 @@ protected function createTransformer()
      */
     protected function validateRequest($requestMethod)
     {
-        $requestData = Request::$requestMethod();
+        $requestData = request()->$requestMethod();
 
         try {
             if ($requestMethod == 'query')
@@ -187,9 +186,9 @@ protected function validateRequest($requestMethod)
                         $request->setController($this->controller);
                 });
 
-                app()->make($requestClass);
+                $request = app()->make($requestClass);
 
-                return $requestData;
+                return $request->$requestMethod();
             }
 
             return $this->controller->restValidate($requestData);

diff --git a/apiresources/Orders.php b/apiresources/Orders.php
@@ -3,7 +3,6 @@
 namespace Igniter\Api\ApiResources;
 
 use Igniter\Api\Classes\ApiController;
-use Illuminate\Support\Facades\Request;
 
 /**
  * Orders API Controller
@@ -37,33 +36,9 @@ public function restExtendQuery($query)
         return $query;
     }
 
-    public function store()
-    {
-        if (($token = $this->getToken()) && $token->isForCustomer())
-            Request::merge(['customer_id' => $token->tokenable_id]);
-
-        return $this->asExtension('RestController')->store();
-    }
-
-    public function update($recordId)
-    {
-        if (($token = $this->getToken()) && $token->isForCustomer())
-            Request::merge(['customer_id' => $token->tokenable_id]);
-
-        return $this->asExtension('RestController')->update($recordId);
-    }
-
     public function restAfterSave($model)
     {
-        $requireSave = false;
-        foreach (['order_date', 'order_time', 'location_id', 'processed', 'order_total'] as $field) {
-            if ($fieldValue = Request::get($field, false)) {
-                $model->$field = $fieldValue;
-                $requireSave = true;
-            }
-        }
-
-        if ($orderMenus = (array)Request::get('order_menus', [])) {
+        if ($orderMenus = (array)request()->input('order_menus', [])) {
             $model->addOrderMenus(json_decode(json_encode($orderMenus)));
 
             $total_items = 0;
@@ -74,10 +49,10 @@ public function restAfterSave($model)
             $model->total_items = $total_items;
         }
 
-        if ($orderTotals = (array)Request::get('order_totals', []))
+        if ($orderTotals = (array)request()->input('order_totals', []))
             $model->addOrderTotals(json_decode(json_encode($orderTotals), true));
 
-        if ($orderStatus = Request::get('status_id', false))
-            $model->updateOrderStatus($orderStatus, ['comment' => Request::get('status_comment', null)]);
+        if ($orderStatus = request()->input('status_id', false))
+            $model->updateOrderStatus($orderStatus, ['comment' => request()->input('status_comment', null)]);
     }
 }
diff --git a/apiresources/Reservations.php b/apiresources/Reservations.php
@@ -3,7 +3,6 @@
 namespace Igniter\Api\ApiResources;
 
 use Igniter\Api\Classes\ApiController;
-use Illuminate\Support\Facades\Request;
 
 /**
  * Reservations API Controller
@@ -36,12 +35,4 @@ public function restExtendQuery($query)
 
         return $query;
     }
-
-    public function store()
-    {
-        if (($token = $this->getToken()) && $token->isForCustomer())
-            Request::merge(['customer_id' => $token->tokenable_id]);
-
-        return $this->asExtension('RestController')->store();
-    }
 }
diff --git a/apiresources/requests/OrderRequest.php b/apiresources/requests/OrderRequest.php
@@ -24,6 +24,7 @@ public function attributes()
             'address.state' => lang('igniter.cart::default.checkout.label_state'),
             'address.postcode' => lang('igniter.cart::default.checkout.label_postcode'),
             'address.country_id' => lang('igniter.cart::default.checkout.label_country'),
+            'customer_id' => lang('igniter.api::default.orders.label_customer_id'),
         ];
     }
 
@@ -37,12 +38,14 @@ public function rules()
             'email' => ['sometimes', 'required', 'email:filter', 'max:96'],
             'comment' => ['max:500'],
             'payment' => ['sometimes', 'required', 'alpha_dash'],
+            'customer_id' => ['integer'],
         ];
 
         if ($method == 'post') {
             $rules['first_name'][] = 'required';
             $rules['last_name'][] = 'required';
             $rules['order_type'][] = 'required';
+            $rules['customer_id'][] = 'required';
         }
 
         if (Request::input('order_type', 'collection') == 'delivery') {

diff --git a/language/en/default.php b/language/en/default.php
@@ -52,4 +52,8 @@
     'alert_auth_restricted' => 'The API token doesn\'t have permissions to perform the request.',
     'alert_token_restricted' => 'The API token doesn\'t have the right abilities to perform this action',
     'alert_validation_failed' => 'Failed to validate request parameters',
+
+    'orders' => [
+        'label_customer_id' => 'Customer ID',
+    ],
 ];