From 950e39b75311b51dae4d019a22f770ec6cba1f1f Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 20 Feb 2024 20:05:43 +0100 Subject: [PATCH] Clean up methods. --- .../List/TransactionController.php | 4 - .../FireflyIIIOrg/Update/UpdateRequest.php | 73 ++++++++++--------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/app/Api/V2/Controllers/Transaction/List/TransactionController.php b/app/Api/V2/Controllers/Transaction/List/TransactionController.php index 04b0bf6598..edb6e50de0 100644 --- a/app/Api/V2/Controllers/Transaction/List/TransactionController.php +++ b/app/Api/V2/Controllers/Transaction/List/TransactionController.php @@ -38,10 +38,6 @@ class TransactionController extends Controller public function listByCount(ListByCountRequest $request): JsonResponse { // collect transactions: - $pageSize = $this->parameters->get('limit'); - $page = $request->getPage(); - $page = max($page, 1); - /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setUserGroup(auth()->user()->userGroup) diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php index 27629a99c4..b2e8568d41 100644 --- a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php +++ b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php @@ -44,7 +44,7 @@ class UpdateRequest implements UpdateRequestInterface ]; // try to get array from update server: - $updateInfo = $this->contactServer($channel); + $updateInfo = $this->contactServer($channel); if ('error' === $updateInfo['level']) { app('log')->error('Update information contains an error.'); app('log')->error($updateInfo['message']); @@ -61,14 +61,14 @@ class UpdateRequest implements UpdateRequestInterface { app('log')->debug(sprintf('Now in contactServer(%s)', $channel)); // always fall back to current version: - $return = [ + $return = [ 'version' => config('firefly.version'), 'date' => today(config('app.timezone'))->startOfDay(), 'level' => 'error', 'message' => (string)trans('firefly.unknown_error'), ]; - $url = config('firefly.update_endpoint'); + $url = config('firefly.update_endpoint'); app('log')->debug(sprintf('Going to call %s', $url)); try { @@ -96,7 +96,7 @@ class UpdateRequest implements UpdateRequestInterface return $return; } - $body = (string)$res->getBody(); + $body = (string)$res->getBody(); try { $json = json_decode($body, true, 512, JSON_THROW_ON_ERROR); @@ -115,8 +115,8 @@ class UpdateRequest implements UpdateRequestInterface } // parse response a bit. No message yet. - $response = $json['firefly_iii'][$channel]; - $date = Carbon::createFromFormat('Y-m-d', $response['date']); + $response = $json['firefly_iii'][$channel]; + $date = Carbon::createFromFormat('Y-m-d', $response['date']); if (false === $date) { $date = today(config('app.timezone')); } @@ -135,36 +135,19 @@ class UpdateRequest implements UpdateRequestInterface private function parseResult(array $information): array { app('log')->debug('Now in parseResult()', $information); - $return = []; - $current = config('firefly.version'); - $latest = $information['version']; + $return = []; + $current = (string)config('firefly.version'); + $latest = $information['version']; // strip the 'v' from the version if it's there. if (str_starts_with($latest, 'v')) { $latest = substr($latest, 1); } if (str_starts_with($current, 'develop')) { - 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; + return $this->parseDevelopResult($current, $latest, $information); } - $compare = version_compare($latest, $current); + $compare = version_compare($latest, $current); app('log')->debug(sprintf('Current version is "%s", latest is "%s", result is: %d', $current, $latest, $compare)); @@ -187,10 +170,10 @@ class UpdateRequest implements UpdateRequestInterface // a newer version is available! /** @var Carbon $released */ - $released = $information['date']; - $today = today(config('app.timezone'))->startOfDay(); - $diff = $today->diffInDays($released); - $expectedDiff = config('firefly.update_minimum_age') ?? 6; + $released = $information['date']; + $today = today(config('app.timezone'))->startOfDay(); + $diff = $today->diffInDays($released); + $expectedDiff = config('firefly.update_minimum_age') ?? 6; // it's still very fresh, and user wants a stable release: if ($diff <= $expectedDiff) { $return['level'] = 'info'; @@ -221,13 +204,13 @@ class UpdateRequest implements UpdateRequestInterface // add warning in case of alpha or beta: // append warning if beta or alpha. - $isBeta = $information['is_beta'] ?? false; + $isBeta = $information['is_beta'] ?? false; if (true === $isBeta) { $return['message'] = sprintf('%s %s', $return['message'], trans('firefly.update_version_beta')); app('log')->debug('New release is also a beta!'); } - $isAlpha = $information['is_alpha'] ?? false; + $isAlpha = $information['is_alpha'] ?? false; if (true === $isAlpha) { $return['message'] = sprintf('%s %s', $return['message'], trans('firefly.update_version_alpha')); app('log')->debug('New release is also a alpha!'); @@ -239,4 +222,26 @@ class UpdateRequest implements UpdateRequestInterface 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; + } }