Expand API test to bill store.

app/Api/V1/Controllers/Models/AvailableBudget/StoreController.php

@@ -57,6 +57,7 @@ class StoreController extends Controller
             }
         );
     }
+
     /**
      * Store a newly created resource in storage.
      *
@@ -70,14 +71,14 @@ class StoreController extends Controller
         $data['start']->startOfDay();
         $data['end']->endOfDay();
 
-        /** @var TransactionCurrencyFactory $factory */
-        $factory  = app(TransactionCurrencyFactory::class);
-        $currency = $factory->find($data['currency_id'], $data['currency_code']);
-
-        if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrency();
+        // currency is not mandatory:
+        if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
+            $factory  = app(TransactionCurrencyFactory::class);
+            $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
+            $data['currency_id'] = $currency->id;
+            unset($data['currency_code']);
         }
-        $data['currency'] = $currency;
+
         $availableBudget  = $this->abRepository->store($data);
         $manager          = $this->getManager();
 

app/Api/V1/Controllers/Models/AvailableBudget/UpdateController.php

@@ -72,20 +72,15 @@ class UpdateController extends Controller
     {
         $data = $request->getAll();
 
-        /** @var TransactionCurrencyFactory $factory */
-        $factory = app(TransactionCurrencyFactory::class);
-        /** @var TransactionCurrency $currency */
-        $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
-
-        if (null === $currency) {
-            // use default currency:
-            $currency = app('amount')->getDefaultCurrency();
+        // find and validate currency ID
+        if(array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
+            $factory = app(TransactionCurrencyFactory::class);
+            $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null) ?? app('amount')->getDefaultCurrency();
+            $currency->enabled = true;
+            $currency->save();
+            unset($data['currency_code']);
+            $data['currency_id'] = $currency->id;
         }
-        $currency->enabled = true;
-        $currency->save();
-        unset($data['currency_code']);
-        $data['currency_id'] = $currency->id;
-
 
         $this->abRepository->updateAvailableBudget($availableBudget, $data);
         $manager = $this->getManager();

app/Api/V1/Controllers/Models/Bill/StoreController.php

@@ -74,7 +74,8 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $bill    = $this->repository->store($request->getAll());
+        $data    = $request->getAll();
+        $bill    = $this->repository->store($data);
         $manager = $this->getManager();
 
         /** @var BillTransformer $transformer */

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -23,9 +23,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\AvailableBudget;
 
+use Carbon\Carbon;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
 
 /**
  * Class Request
@@ -43,13 +45,16 @@ class Request extends FormRequest
      */
     public function getAll(): array
     {
-        return [
-            'currency_id'   => $this->integer('currency_id'),
-            'currency_code' => $this->string('currency_code'),
-            'amount'        => $this->string('amount'),
-            'start'         => $this->date('start'),
-            'end'           => $this->date('end'),
+        // this is the way:
+        $fields = [
+            'currency_id'   => ['currency_id', 'integer'],
+            'currency_code' => ['currency_code', 'string'],
+            'amount'        => ['amount', 'string'],
+            'start'         => ['start', 'date'],
+            'end'           => ['end', 'date'],
         ];
+
+        return $this->getAllData($fields);
     }
 
     /**
@@ -62,11 +67,35 @@ class Request extends FormRequest
         return [
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
-            'amount'        => 'required|numeric|gt:0',
-            'start'         => 'required|date|before:end',
-            'end'           => 'required|date|after:start',
+            'amount'        => 'numeric|gt:0',
+            'start'         => 'date',
+            'end'           => 'date',
         ];
     }
 
+    /**
+     * Configure the validator instance with special rules for after the basic validation rules.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                // validate start before end only if both are there.
+                $data = $validator->getData();
+                if (array_key_exists('start', $data) && array_key_exists('end', $data)) {
+                    $start = new Carbon($data['start']);
+                    $end   = new Carbon($data['end']);
+                    if ($end->isBefore($start)) {
+                        $validator->errors()->add('end', (string)trans('validation.date_after'));
+                    }
+                }
+            }
+        );
+    }
+
 
 }

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -29,6 +29,7 @@ use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
+use Log;
 
 /**
  * Class StoreRequest
@@ -46,24 +47,24 @@ class StoreRequest extends FormRequest
      */
     public function getAll(): array
     {
-        $active = true;
-        if (null !== $this->get('active')) {
-            $active = $this->boolean('active');
-        }
-
-        return [
-            'name'          => $this->string('name'),
-            'amount_min'    => $this->string('amount_min'),
-            'amount_max'    => $this->string('amount_max'),
-            'currency_id'   => $this->integer('currency_id'),
-            'currency_code' => $this->string('currency_code'),
-            'date'          => $this->date('date'),
-            'repeat_freq'   => $this->string('repeat_freq'),
-            'skip'          => $this->integer('skip'),
-            'active'        => $active,
-            'order'         => $this->integer('order'),
-            'notes'         => $this->nlString('notes'),
+        Log::debug('Raw fields in Bill StoreRequest', $this->all());
+        $fields = [
+            'name'               => ['name', 'string'],
+            'amount_min'         => ['amount_min', 'string'],
+            'amount_max'         => ['amount_max', 'string'],
+            'currency_id'        => ['currency_id', 'integer'],
+            'currency_code'      => ['currency_code', 'string'],
+            'date'               => ['date', 'date'],
+            'repeat_freq'        => ['repeat_freq', 'string'],
+            'skip'               => ['skip', 'integer'],
+            'active'             => ['active', 'boolean'],
+            'order'              => ['order', 'integer'],
+            'notes'              => ['notes', 'nlString'],
+            'object_group_id'    => ['object_group_id', 'integer'],
+            'object_group_title' => ['object_group_title', 'string'],
         ];
+
+        return $this->getAllData($fields);
     }
 
     /**
@@ -99,10 +100,10 @@ class StoreRequest extends FormRequest
         $validator->after(
             static function (Validator $validator) {
                 $data = $validator->getData();
-                $min  = (float) ($data['amount_min'] ?? 0);
-                $max  = (float) ($data['amount_max'] ?? 0);
+                $min  = (float)($data['amount_min'] ?? 0);
+                $max  = (float)($data['amount_max'] ?? 0);
                 if ($min > $max) {
-                    $validator->errors()->add('amount_min', (string) trans('validation.amount_min_over_max'));
+                    $validator->errors()->add('amount_min', (string)trans('validation.amount_min_over_max'));
                 }
             }
         );