diff --git a/app/Api/V1/Requests/PiggyBankUpdateRequest.php b/app/Api/V1/Requests/PiggyBankUpdateRequest.php index cefe076fc3..cf22063559 100644 --- a/app/Api/V1/Requests/PiggyBankUpdateRequest.php +++ b/app/Api/V1/Requests/PiggyBankUpdateRequest.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; -use FireflyIII\Models\PiggyBank; use FireflyIII\Rules\IsAssetAccountId; use FireflyIII\Rules\LessThanPiggyTarget; use FireflyIII\Support\Request\ChecksLogin; @@ -46,16 +45,31 @@ class PiggyBankUpdateRequest extends FormRequest */ public function getAll(): array { - return [ - 'name' => $this->string('name'), - 'account_id' => $this->integer('account_id'), - 'targetamount' => $this->string('target_amount'), - 'current_amount' => $this->string('current_amount'), - 'startdate' => $this->date('start_date'), - 'targetdate' => $this->date('target_date'), - 'notes' => $this->nlString('notes'), - 'order' => $this->integer('order'), + // if the value isn't present, dont return it at all. + // TODO this should be the way to collect fields for all API things. + // TODO make sure piggy bank uses 'start_date' etc. until right up to DB update. + // TODO can we configure this and return it from config? + $return = []; + $fields = [ + 'name' => ['name', 'string'], + 'account_id' => ['account_id', 'integer'], + 'targetamount' => ['target_amount', 'string'], + 'current_amount' => ['current_amount', 'string'], + 'startdate' => ['start_date', 'date'], + 'targetdate' => ['target_date', 'string'], + 'notes' => ['notes', 'nlString'], + 'order' => ['order', 'integer'], + 'object_group' => ['object_group', 'string'], + 'object_group_id' => ['object_group_id', 'integer'], ]; + foreach ($fields as $field => $info) { + if ($this->has($info[0])) { + $method = $info[1]; + $return[$field] = $this->$method($info[0]); + } + } + + return $return; } /** @@ -65,15 +79,16 @@ class PiggyBankUpdateRequest extends FormRequest */ public function rules(): array { - $piggyBank = $this->route()->parameter('piggyBank'); + $piggyBank = $this->route()->parameter('piggyBank'); + return [ 'name' => 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id, 'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget], - 'target_amount' => 'numeric|gt:0', + 'target_amount' => 'numeric|gt:0', 'start_date' => 'date|nullable', 'target_date' => 'date|nullable|after:start_date', 'notes' => 'max:65000', - 'account_id' => ['belongsToUser:accounts', new IsAssetAccountId], + 'account_id' => ['belongsToUser:accounts', new IsAssetAccountId], ]; } diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 122eccabf5..6e78f706ba 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -45,6 +45,7 @@ use Log; trait ModifiesPiggyBanks { use CreatesObjectGroups; + /** * @param PiggyBank $piggyBank * @param string $amount @@ -102,9 +103,9 @@ trait ModifiesPiggyBanks public function canAddAmount(PiggyBank $piggyBank, string $amount): bool { $leftOnAccount = $this->leftOnAccount($piggyBank, today(config('app.timezone'))); - $savedSoFar = (string) $this->getRepetition($piggyBank)->currentamount; + $savedSoFar = (string)$this->getRepetition($piggyBank)->currentamount; $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); - $maxAmount = (string) min(round($leftOnAccount, 12), round($leftToSave, 12)); + $maxAmount = (string)min(round($leftOnAccount, 12), round($leftToSave, 12)); $compare = bccomp($amount, $maxAmount); $result = $compare <= 0; @@ -142,7 +143,7 @@ trait ModifiesPiggyBanks $set = $this->user->piggyBanks()->orderBy('order', 'ASC')->get(); $current = 1; foreach ($set as $piggyBank) { - if ((int) $piggyBank->order !== $current) { + if ((int)$piggyBank->order !== $current) { $piggyBank->order = $current; $piggyBank->save(); } @@ -161,6 +162,7 @@ trait ModifiesPiggyBanks if (0 === bccomp('0', $amount)) { return new PiggyBankEvent; } + return PiggyBankEvent::create(['date' => Carbon::now(), 'amount' => $amount, 'piggy_bank_id' => $piggyBank->id]); } @@ -185,8 +187,8 @@ trait ModifiesPiggyBanks /** * @param PiggyBank $piggyBank * - * @throws \Exception * @return bool + * @throws \Exception */ public function destroy(PiggyBank $piggyBank): bool { @@ -278,8 +280,8 @@ trait ModifiesPiggyBanks /** * @param array $data * - * @throws FireflyException * @return PiggyBank + * @throws FireflyException */ public function store(array $data): PiggyBank { @@ -310,7 +312,7 @@ trait ModifiesPiggyBanks } } // try also with ID: - $objectGroupId = (int) ($data['object_group_id'] ?? 0); + $objectGroupId = (int)($data['object_group_id'] ?? 0); if (0 !== $objectGroupId) { $objectGroup = $this->findObjectGroupById($objectGroupId); if (null !== $objectGroup) { @@ -328,12 +330,13 @@ trait ModifiesPiggyBanks * * @return PiggyBank */ - private function updateProperties(PiggyBank $piggyBank, array $data): PiggyBank { + private function updateProperties(PiggyBank $piggyBank, array $data): PiggyBank + { if (array_key_exists('name', $data) && '' !== $data['name']) { $piggyBank->name = $data['name']; } if (array_key_exists('account_id', $data) && 0 !== $data['account_id']) { - $piggyBank->account_id = (int) $data['account_id']; + $piggyBank->account_id = (int)$data['account_id']; } if (array_key_exists('targetamount', $data) && '' !== $data['targetamount']) { $piggyBank->targetamount = $data['targetamount']; @@ -343,6 +346,7 @@ trait ModifiesPiggyBanks } $piggyBank->startdate = $data['startdate'] ?? $piggyBank->startdate; $piggyBank->save(); + return $piggyBank; } @@ -358,8 +362,8 @@ trait ModifiesPiggyBanks $this->updateNote($piggyBank, $data['notes'] ?? ''); // update the order of the piggy bank: - $oldOrder = (int) $piggyBank->order; - $newOrder = (int) ($data['order'] ?? $oldOrder); + $oldOrder = (int)$piggyBank->order; + $newOrder = (int)($data['order'] ?? $oldOrder); if ($oldOrder !== $newOrder) { $this->updateOrder($piggyBank, $oldOrder, $newOrder); } @@ -376,30 +380,36 @@ trait ModifiesPiggyBanks } // update using name: - $objectGroupTitle = $data['object_group'] ?? ''; - if ('' !== $objectGroupTitle) { - $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle); - if (null !== $objectGroup) { - $piggyBank->objectGroups()->sync([$objectGroup->id]); + if (array_key_exists('object_group', $data)) { + $objectGroupTitle = (string)$data['object_group']; + if ('' !== $objectGroupTitle) { + $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle); + if (null !== $objectGroup) { + $piggyBank->objectGroups()->sync([$objectGroup->id]); + $piggyBank->save(); + } + + return $piggyBank; + } + // remove if name is empty. Should be overruled by ID. + if ('' === $objectGroupTitle) { + $piggyBank->objectGroups()->sync([]); $piggyBank->save(); } - return $piggyBank; - } - // remove if name is empty. Should be overruled by ID. - if ('' === $objectGroupTitle) { - $piggyBank->objectGroups()->sync([]); - $piggyBank->save(); } // try also with ID: - $objectGroupId = (int) ($data['object_group_id'] ?? 0); - if (0 !== $objectGroupId) { - $objectGroup = $this->findObjectGroupById($objectGroupId); - if (null !== $objectGroup) { - $piggyBank->objectGroups()->sync([$objectGroup->id]); - $piggyBank->save(); + if (array_key_exists('object_group_id', $data)) { + $objectGroupId = (int)($data['object_group_id'] ?? 0); + if (0 !== $objectGroupId) { + $objectGroup = $this->findObjectGroupById($objectGroupId); + if (null !== $objectGroup) { + $piggyBank->objectGroups()->sync([$objectGroup->id]); + $piggyBank->save(); + } + + return $piggyBank; } - return $piggyBank; } return $piggyBank;