mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-19 02:45:58 +00:00
Clean up method.
This commit is contained in:
James Cole
@@ -192,29 +192,7 @@ class RecurrenceStoreRequest extends Request
|
|||||||
}
|
}
|
||||||
/** @var array $transaction */
|
/** @var array $transaction */
|
||||||
foreach ($transactions as $transaction) {
|
foreach ($transactions as $transaction) {
|
||||||
$return[] = [
|
$return[] = $this->getSingleRecurrenceData($transaction);
|
||||||
'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 $return;
|
return $return;
|
||||||
|
|||||||
@@ -177,38 +177,6 @@ class RecurrenceUpdateRequest extends Request
|
|||||||
return $return;
|
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
|
* 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.
|
* 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 */
|
/** @var array $transaction */
|
||||||
foreach ($transactions as $transaction) {
|
foreach ($transactions as $transaction) {
|
||||||
$return[] = $this->getSingleData($transaction);
|
$return[] = $this->getSingleRecurrenceData($transaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $return;
|
return $return;
|
||||||
|
|||||||
@@ -34,5 +34,36 @@ use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
|
|||||||
*/
|
*/
|
||||||
class Request extends 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,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user