kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 05:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Add test case for bill dates

Browse Source
This commit is contained in:
James Cole
2023-11-26 07:19:57 +01:00
parent 5e49e149b1
commit a6c355c7b8
8 changed files with 310 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Transformers/BillTransformer.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Models\Bill;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\Models\BillDateCalculator;
use Illuminate\Support\Collection;
/**
@@ -37,6 +38,7 @@ use Illuminate\Support\Collection;
class BillTransformer extends AbstractTransformer
{
private BillRepositoryInterface $repository;
private BillDateCalculator $calculator;
/**
* BillTransformer constructor.
@@ -46,6 +48,7 @@ class BillTransformer extends AbstractTransformer
public function __construct()
{
$this->repository = app(BillRepositoryInterface::class);
$this->calculator = app(BillDateCalculator::class);
}
/**
@@ -59,7 +62,8 @@ class BillTransformer extends AbstractTransformer
{
$paidData = $this->paidData($bill);
$lastPaidDate = $this->getLastPaidDate($paidData);
$payDates = $this->payDates($bill, $lastPaidDate);
//$payDates = $this->payDates($bill, $lastPaidDate);
$payDates = $this->calculator->getPayDates($this->parameters->get('start'), $this->parameters->get('end'), $bill->date, $bill->repeat_freq, $bill->skip, $lastPaidDate);
$currency = $bill->transactionCurrency;
$notes = $this->repository->getNoteText($bill);
$notes = '' === $notes ? null : $notes;
@@ -78,7 +82,7 @@ class BillTransformer extends AbstractTransformer
$paidDataFormatted = [];
$payDatesFormatted = [];
foreach ($paidData['paid_dates'] as $object) {
foreach ($paidData as $object) {
$object['date'] = Carbon::createFromFormat('!Y-m-d', $object['date'], config('app.timezone'))->toAtomString();
$paidDataFormatted[] = $object;
}
@@ -167,10 +171,7 @@ class BillTransformer extends AbstractTransformer
if (null === $this->parameters->get('start') || null === $this->parameters->get('end')) {
app('log')->debug('parameters are NULL, return empty array');
return [
'paid_dates' => [],
'next_expected_match' => null,
];
return [];
}
// 2023-07-1 sub one day from the start date to fix a possible bug (see #7704)
// 2023-07-18 this particular date is used to search for the last paid date.
@@ -205,12 +206,11 @@ class BillTransformer extends AbstractTransformer
'transaction_group_id' => (string)$entry->transaction_group_id,
'transaction_journal_id' => (string)$entry->id,
'date' => $entry->date->format('Y-m-d'),
'date_object' => $entry->date,
];
}
return [
'paid_dates' => $result,
];
return $result;
}
/**
@@ -246,16 +246,18 @@ class BillTransformer extends AbstractTransformer
{
app('log')->debug('getLastPaidDate()');
$return = null;
foreach ($paidData['paid_dates'] as $entry) {
foreach ($paidData as $entry) {
if (null !== $return) {
$current = Carbon::createFromFormat('!Y-m-d', $entry['date'], config('app.timezone'));
/** @var Carbon $current */
$current = $entry['date_object'];
if ($current->gt($return)) {
$return = clone $current;
}
app('log')->debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
}
if (null === $return) {
$return = Carbon::createFromFormat('!Y-m-d', $entry['date'], config('app.timezone'));
/** @var Carbon $return */
$return = $entry['date_object'];
app('log')->debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
}
}