Improve test coverage

Signed-off-by: Sam Poyigi <[email protected]>

Author: sampoyigi

composer.json

@@ -62,5 +62,5 @@
     },
     "sort-packages": true
   },
-  "minimum-stability": "beta"
+  "minimum-stability": "dev"
 }

src/ApiResources/Repositories/LocationRepository.php

@@ -11,11 +11,6 @@ class LocationRepository extends AbstractRepository
 
     protected $hidden = ['location_thumb'];
 
-    public function getOptionsAttribute($value)
-    {
-        return array_except($value, ['hours']);
-    }
-
     protected function extendQuery($query)
     {
         $query->select('*');

src/ApiResources/Requests/MenuItemOptionRequest.php

@@ -9,7 +9,7 @@ class MenuItemOptionRequest extends FormRequest
     public function attributes()
     {
         return [
-            'menu_id' => lang('igniter.cart::default.menus.label_option'),
+            'menu_id' => lang('igniter.cart::default.menus.label_menu_id'),
             'option_id' => lang('igniter.cart::default.menus.label_option_id'),
             'priority' => lang('igniter.cart::default.menus.label_option'),
             'required' => lang('igniter.cart::default.menus.label_option_required'),

src/ApiResources/Requests/OrderRequest.php

@@ -44,11 +44,10 @@ public function rules()
             'is_processed' => ['integer'],
         ];
 
-        if ($this->method() == 'post') {
+        if (strtolower($this->method()) == 'post') {
             $rules['first_name'][] = 'required';
             $rules['last_name'][] = 'required';
             $rules['order_type'][] = 'required';
-            $rules['customer_id'][] = 'required';
         }
 
         if ($this->input('order_type', 'collection') == 'delivery') {

src/ApiResources/Transformers/CategoryTransformer.php

@@ -20,11 +20,7 @@ public function transform(Category $category)
 
     public function includeMedia(Category $category)
     {
-        if (!$thumb = $category->getFirstMedia()) {
-            return null;
-        }
-
-        return $this->item($thumb, new MediaTransformer, 'media');
+        return ($thumb = $category->getFirstMedia()) ? $this->item($thumb, new MediaTransformer, 'media') : null;
     }
 
     public function includeMenus(Category $category)

src/ApiResources/Transformers/LocationTransformer.php

@@ -21,19 +21,15 @@ public function transform(Location $location)
 
     public function includeMedia(Location $location)
     {
-        if (!$thumb = $location->getFirstMedia()) {
-            return null;
-        }
-
-        return $this->item($thumb, new MediaTransformer, 'media');
+        return ($thumb = $location->getFirstMedia()) ? $this->item($thumb, new MediaTransformer, 'media') : null;
     }
 
     public function includeWorkingHours(Location $location)
     {
         return $this->collection(
             $location->working_hours,
             new WorkingHourTransformer,
-            'working_hours'
+            'working_hours',
         );
     }
 
@@ -42,7 +38,7 @@ public function includeDeliveryAreas(Location $location)
         return $this->collection(
             $location->delivery_areas,
             new DeliveryAreaTransformer,
-            'delivery_areas'
+            'delivery_areas',
         );
     }
 
@@ -51,7 +47,7 @@ public function includeReviews(Location $location)
         return $this->collection(
             $location->reviews,
             new ReviewTransformer,
-            'reviews'
+            'reviews',
         );
     }
 }

src/ApiResources/Transformers/MenuItemOptionArrayTransformer.php

@@ -21,19 +21,10 @@ public function transform(MenuItemOption $menuItemOption)
 
     public function includeMenuOptionValues(MenuItemOption $menuItemOption)
     {
-        //When Post/Patch and inside body comes with an json array menu_option_values the deserialized object is a collection of array
-        if (is_array($menuItemOption->menu_option_values)) {
-            return $this->collection(
-                $menuItemOption->menu_option_values,
-                new MenuItemOptionValueArrayTransformer,
-                'menu_option_values'
-            );
-        }
-
         return $this->collection(
             $menuItemOption->menu_option_values,
             new MenuItemOptionValueTransformer,
-            'menu_option_values'
+            'menu_option_values',
         );
     }
 }

src/ApiResources/Transformers/MenuItemOptionTransformer.php

@@ -7,9 +7,13 @@
 
 class MenuItemOptionValueTransformer extends TransformerAbstract
 {
-    public function transform(MenuItemOptionValue $menuItemOptionValue)
+    public function transform(array|MenuItemOptionValue $menuItemOptionValue)
     {
-        return array_merge($menuItemOptionValue->toArray(), [
+        if (!is_array($menuItemOptionValue)) {
+            $menuItemOptionValue = $menuItemOptionValue->toArray();
+        }
+
+        return array_merge($menuItemOptionValue, [
             'currency' => app('currency')->getDefault()->currency_code,
         ]);
     }