Improve test coverage

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

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/MenuItemOptionTransformer.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/MenuItemOptionValueTransformer.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,
         ]);
     }

src/ApiResources/Transformers/MenuOptionTransformer.php

@@ -20,19 +20,10 @@ public function transform(MenuOption $menuOption)
 
     public function includeOptionValues(MenuOption $menuOption)
     {
-        //When Post/Patch and inside body comes with an json array option_values the deserialized object is a collection of array
-        if (is_array($menuOption->option_values)) {
-            return $this->collection(
-                $menuOption->option_values,
-                new MenuOptionValueArrayTransformer,
-                'option_values'
-            );
-        }
-
         return $this->collection(
             $menuOption->option_values,
             new MenuOptionValueTransformer,
-            'option_values'
+            'option_values',
         );
     }
 }

src/ApiResources/Transformers/MenuOptionValueTransformer.php

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

src/ApiResources/Transformers/MenuTransformer.php

@@ -25,19 +25,15 @@ public function transform(Menu $menuItem)
 
     public function includeMedia(Menu $menuItem)
     {
-        if (!$thumb = $menuItem->getFirstMedia()) {
-            return null;
-        }
-
-        return $this->item($thumb, new MediaTransformer, 'media');
+        return ($thumb = $menuItem->getFirstMedia()) ? $this->item($thumb, new MediaTransformer, 'media') : null;
     }
 
     public function includeCategories(Menu $menuItem)
     {
         return $this->collection(
             $menuItem->categories,
             new CategoryTransformer,
-            'categories'
+            'categories',
         );
     }
 
@@ -46,7 +42,7 @@ public function includeMenuOptions(Menu $menuItem)
         return $this->collection(
             $menuItem->menu_options,
             new MenuItemOptionTransformer,
-            'menu_options'
+            'menu_options',
         );
     }
 
@@ -55,7 +51,7 @@ public function includeIngredients(Menu $menuItem)
         return $this->collection(
             $menuItem->ingredients,
             new IngredientTransformer,
-            'ingredients'
+            'ingredients',
         );
     }
 
@@ -64,7 +60,7 @@ public function includeMealtimes(Menu $menuItem)
         return $this->collection(
             $menuItem->mealtimes,
             new MealtimeTransformer,
-            'mealtimes'
+            'mealtimes',
         );
     }
 
@@ -73,7 +69,7 @@ public function includeStocks(Menu $menuItem)
         return $this->collection(
             $menuItem->stocks,
             new StockTransformer,
-            'stocks'
+            'stocks',
         );
     }
 }

src/ApiResources/Transformers/OrderTransformer.php

@@ -29,11 +29,7 @@ public function transform(Order $order)
 
     public function includeCustomer(Order $order)
     {
-        if (!$order->customer) {
-            return;
-        }
-
-        return $this->item($order->customer, new CustomerTransformer, 'customers');
+        return $order->customer ? $this->item($order->customer, new CustomerTransformer, 'customers') : null;
     }
 
     public function includeLocation(Order $order)
@@ -43,20 +39,12 @@ public function includeLocation(Order $order)
 
     public function includeAddress(Order $order)
     {
-        if (!$order->address) {
-            return;
-        }
-
-        return $this->item($order->address, new AddressTransformer, 'addresses');
+        return $order->address ? $this->item($order->address, new AddressTransformer, 'addresses') : null;
     }
 
     public function includePaymentMethod(Order $order)
     {
-        if (!$order->payment_method) {
-            return;
-        }
-
-        return $this->item($order->payment_method, new PaymentMethodTransformer, 'payment_methods');
+        return $order->payment_method ? $this->item($order->payment_method, new PaymentMethodTransformer, 'payment_methods') : null;
     }
 
     public function includeStatus(Order $order)
@@ -71,19 +59,11 @@ public function includeStatusHistory(Order $order)
 
     public function includeAssignee(Order $order)
     {
-        if (!$order->assignee) {
-            return;
-        }
-
-        return $this->item($order->assignee, new StaffTransformer, 'staff');
+        return $order->assignee ? $this->item($order->assignee, new UserTransformer, 'assignee') : null;
     }
 
     public function includeAssigneeGroup(Order $order)
     {
-        if (!$order->assignee_group) {
-            return;
-        }
-
-        return $this->item($order->assignee_group, new StaffGroupTransformer, 'staff_group');
+        return $order->assignee_group ? $this->item($order->assignee_group, new UserGroupTransformer, 'assignee_group') : null;
     }
 }

src/ApiResources/Transformers/ReservationTransformer.php

@@ -43,11 +43,11 @@ public function includeStatusHistory(Reservation $reservation)
 
     public function includeAssignee(Reservation $reservation)
     {
-        return $this->item($reservation->assignee, new StaffTransformer, 'staff');
+        return $this->item($reservation->assignee, new UserTransformer, 'assignee');
     }
 
     public function includeAssigneeGroup(Reservation $reservation)
     {
-        return $this->item($reservation->assignee_group, new StaffGroupTransformer, 'staff_group');
+        return $this->item($reservation->assignee_group, new UserGroupTransformer, 'assignee_group');
     }
 }

src/ApiResources/Transformers/StaffGroupTransformer.php → src/ApiResources/Transformers/UserGroupTransformer.php

@@ -5,10 +5,10 @@
 use Igniter\User\Models\UserGroup;
 use League\Fractal\TransformerAbstract;
 
-class StaffGroupTransformer extends TransformerAbstract
+class UserGroupTransformer extends TransformerAbstract
 {
-    public function transform(UserGroup $staffGroup)
+    public function transform(UserGroup $userGroup)
     {
-        return $staffGroup->toArray();
+        return $userGroup->toArray();
     }
 }