From d889e39aadfb9c81b8f4596ee35e3310c3f55e84 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 19 Mar 2020 14:33:41 +0100 Subject: [PATCH] Clean up method. --- .../V1/Requests/RecurrenceStoreRequest.php | 24 +------------ .../V1/Requests/RecurrenceUpdateRequest.php | 34 +------------------ app/Api/V1/Requests/Request.php | 31 +++++++++++++++++ 3 files changed, 33 insertions(+), 56 deletions(-) diff --git a/app/Api/V1/Requests/RecurrenceStoreRequest.php b/app/Api/V1/Requests/RecurrenceStoreRequest.php index 8b946fbb61..ca21326d07 100644 --- a/app/Api/V1/Requests/RecurrenceStoreRequest.php +++ b/app/Api/V1/Requests/RecurrenceStoreRequest.php @@ -192,29 +192,7 @@ class RecurrenceStoreRequest extends Request } /** @var array $transaction */ foreach ($transactions as $transaction) { - $return[] = [ - 'amount' => $transaction['amount'], - 'currency_id' => isset($transaction['currency_id']) ? (int) $transaction['currency_id'] : null, - 'currency_code' => $transaction['currency_code'] ?? null, - 'foreign_amount' => $transaction['foreign_amount'] ?? null, - 'foreign_currency_id' => isset($transaction['foreign_currency_id']) ? (int) $transaction['foreign_currency_id'] : null, - 'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null, - 'source_id' => isset($transaction['source_id']) ? (int) $transaction['source_id'] : null, - 'source_name' => isset($transaction['source_name']) ? (string) $transaction['source_name'] : null, - 'destination_id' => isset($transaction['destination_id']) ? (int) $transaction['destination_id'] : null, - 'destination_name' => isset($transaction['destination_name']) ? (string) $transaction['destination_name'] : null, - 'description' => $transaction['description'], - 'type' => $this->string('type'), - - // new and updated fields: - 'piggy_bank_id' => isset($transaction['piggy_bank_id']) ? (int) $transaction['piggy_bank_id'] : null, - 'piggy_bank_name' => $transaction['piggy_bank_name'] ?? null, - 'tags' => $transaction['tags'] ?? [], - 'budget_id' => isset($transaction['budget_id']) ? (int) $transaction['budget_id'] : null, - 'budget_name' => $transaction['budget_name'] ?? null, - 'category_id' => isset($transaction['category_id']) ? (int) $transaction['category_id'] : null, - 'category_name' => $transaction['category_name'] ?? null, - ]; + $return[] = $this->getSingleRecurrenceData($transaction); } return $return; diff --git a/app/Api/V1/Requests/RecurrenceUpdateRequest.php b/app/Api/V1/Requests/RecurrenceUpdateRequest.php index 72b169f18b..917af5664a 100644 --- a/app/Api/V1/Requests/RecurrenceUpdateRequest.php +++ b/app/Api/V1/Requests/RecurrenceUpdateRequest.php @@ -177,38 +177,6 @@ class RecurrenceUpdateRequest extends Request return $return; } - /** - * @param array $transaction - * - * @return array - */ - private function getSingleData(array $transaction): array - { - return [ - 'amount' => $transaction['amount'], - 'currency_id' => isset($transaction['currency_id']) ? (int) $transaction['currency_id'] : null, - 'currency_code' => $transaction['currency_code'] ?? null, - 'foreign_amount' => $transaction['foreign_amount'] ?? null, - 'foreign_currency_id' => isset($transaction['foreign_currency_id']) ? (int) $transaction['foreign_currency_id'] : null, - 'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null, - 'source_id' => isset($transaction['source_id']) ? (int) $transaction['source_id'] : null, - 'source_name' => isset($transaction['source_name']) ? (string) $transaction['source_name'] : null, - 'destination_id' => isset($transaction['destination_id']) ? (int) $transaction['destination_id'] : null, - 'destination_name' => isset($transaction['destination_name']) ? (string) $transaction['destination_name'] : null, - 'description' => $transaction['description'], - 'type' => $this->string('type'), - - // new and updated fields: - 'piggy_bank_id' => isset($transaction['piggy_bank_id']) ? (int) $transaction['piggy_bank_id'] : null, - 'piggy_bank_name' => $transaction['piggy_bank_name'] ?? null, - 'tags' => $transaction['tags'] ?? [], - 'budget_id' => isset($transaction['budget_id']) ? (int) $transaction['budget_id'] : null, - 'budget_name' => $transaction['budget_name'] ?? null, - 'category_id' => isset($transaction['category_id']) ? (int) $transaction['category_id'] : null, - 'category_name' => $transaction['category_name'] ?? null, - ]; - } - /** * Returns the transaction data as it is found in the submitted data. It's a complex method according to code * standards but it just has a lot of ??-statements because of the fields that may or may not exist. @@ -226,7 +194,7 @@ class RecurrenceUpdateRequest extends Request } /** @var array $transaction */ foreach ($transactions as $transaction) { - $return[] = $this->getSingleData($transaction); + $return[] = $this->getSingleRecurrenceData($transaction); } return $return; diff --git a/app/Api/V1/Requests/Request.php b/app/Api/V1/Requests/Request.php index 5c3989c7b1..a3e0899551 100644 --- a/app/Api/V1/Requests/Request.php +++ b/app/Api/V1/Requests/Request.php @@ -34,5 +34,36 @@ use FireflyIII\Http\Requests\Request as FireflyIIIRequest; */ class Request extends FireflyIIIRequest { + /** + * @param array $transaction + * + * @return array + */ + protected function getSingleRecurrenceData(array $transaction): array + { + return [ + 'amount' => $transaction['amount'], + 'currency_id' => isset($transaction['currency_id']) ? (int) $transaction['currency_id'] : null, + 'currency_code' => $transaction['currency_code'] ?? null, + 'foreign_amount' => $transaction['foreign_amount'] ?? null, + 'foreign_currency_id' => isset($transaction['foreign_currency_id']) ? (int) $transaction['foreign_currency_id'] : null, + 'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null, + 'source_id' => isset($transaction['source_id']) ? (int) $transaction['source_id'] : null, + 'source_name' => isset($transaction['source_name']) ? (string) $transaction['source_name'] : null, + 'destination_id' => isset($transaction['destination_id']) ? (int) $transaction['destination_id'] : null, + 'destination_name' => isset($transaction['destination_name']) ? (string) $transaction['destination_name'] : null, + 'description' => $transaction['description'], + 'type' => $this->string('type'), + + // new and updated fields: + 'piggy_bank_id' => isset($transaction['piggy_bank_id']) ? (int) $transaction['piggy_bank_id'] : null, + 'piggy_bank_name' => $transaction['piggy_bank_name'] ?? null, + 'tags' => $transaction['tags'] ?? [], + 'budget_id' => isset($transaction['budget_id']) ? (int) $transaction['budget_id'] : null, + 'budget_name' => $transaction['budget_name'] ?? null, + 'category_id' => isset($transaction['category_id']) ? (int) $transaction['category_id'] : null, + 'category_name' => $transaction['category_name'] ?? null, + ]; + } }