IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up methods.

Browse Source
This commit is contained in:
James Cole 2024-02-20 20:05:43 +01:00
parent 8f14979717
commit 950e39b753
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V2/Controllers/Transaction/List/TransactionController.php
View File

@ -38,10 +38,6 @@ class TransactionController extends Controller
public function listByCount(ListByCountRequest $request): JsonResponse public function listByCount(ListByCountRequest $request): JsonResponse
{ {
// collect transactions: // collect transactions:
$pageSize = $this->parameters->get('limit');
$page = $request->getPage();
$page = max($page, 1);
/** @var GroupCollectorInterface $collector */ /** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);
$collector->setUserGroup(auth()->user()->userGroup) $collector->setUserGroup(auth()->user()->userGroup)

43
app/Services/FireflyIIIOrg/Update/UpdateRequest.php
View File

@ -136,7 +136,7 @@ class UpdateRequest implements UpdateRequestInterface
{ {
app('log')->debug('Now in parseResult()', $information); app('log')->debug('Now in parseResult()', $information);
$return = []; $return = [];
$current = config('firefly.version'); $current = (string)config('firefly.version');
$latest = $information['version']; $latest = $information['version'];
// strip the 'v' from the version if it's there. // strip the 'v' from the version if it's there.
@ -144,24 +144,7 @@ class UpdateRequest implements UpdateRequestInterface
$latest = substr($latest, 1); $latest = substr($latest, 1);
} }
if (str_starts_with($current, 'develop')) { if (str_starts_with($current, 'develop')) {
Log::debug(sprintf('User is running develop version "%s"', $current)); return $this->parseDevelopResult($current, $latest, $information);
$parts = explode('/', $current);
/** @var Carbon $devDate */
$devDate = Carbon::createFromFormat('Y-m-d', $parts[1]);
if ($devDate->lte($information['date'])) {
Log::debug(sprintf('This development release is older, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
$return['level'] = 'info';
$return['message'] = (string)trans('firefly.update_current_dev_older', ['version' => $current, 'new_version' => $latest]);
return $return;
}
Log::debug(sprintf('This development release is newer, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
$return['level'] = 'info';
$return['message'] = (string)trans('firefly.update_current_dev_newer', ['version' => $current, 'new_version' => $latest]);
return $return;
} }
$compare = version_compare($latest, $current); $compare = version_compare($latest, $current);
@ -239,4 +222,26 @@ class UpdateRequest implements UpdateRequestInterface
return $return; return $return;
} }
private function parseDevelopResult(string $current, string $latest, array $information): array
{
Log::debug(sprintf('User is running develop version "%s"', $current));
$parts = explode('/', $current);
/** @var Carbon $devDate */
$devDate = Carbon::createFromFormat('Y-m-d', $parts[1]);
if ($devDate->lte($information['date'])) {
Log::debug(sprintf('This development release is older, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
$return['level'] = 'info';
$return['message'] = (string)trans('firefly.update_current_dev_older', ['version' => $current, 'new_version' => $latest]);
return $return;
}
Log::debug(sprintf('This development release is newer, release = %s, latest version %s = %s', $devDate->format('Y-m-d'), $latest, $information['date']->format('Y-m-d')));
$return['level'] = 'info';
$return['message'] = (string)trans('firefly.update_current_dev_newer', ['version' => $current, 'new_version' => $latest]);
return $return;
}
} }