Merge branch 'develop' into adminlte4

app/Api/V2/Controllers/Chart/AccountController.php

@@ -31,7 +31,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
+use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Psr\Container\ContainerExceptionInterface;
@@ -42,7 +42,7 @@ use Psr\Container\NotFoundExceptionInterface;
  */
 class AccountController extends Controller
 {
-    use ConvertsExchangeRates;
+    use CleansChartData;
 
     private AccountRepositoryInterface $repository;
 
@@ -81,6 +81,7 @@ class AccountController extends Controller
         $start = $dates['start'];
         /** @var Carbon $end */
         $end = $dates['end'];
+        $end->endOfDay();
         /** @var User $user */
         $user = auth()->user();
 
@@ -120,10 +121,11 @@ class AccountController extends Controller
                 'native_code'             => $default->code,
                 'native_symbol'           => $default->symbol,
                 'native_decimal_places'   => (int)$default->decimal_places,
-                'start_date'              => $start->toAtomString(),
+                'start'                   => $start->toAtomString(),
-                'end_date'                => $end->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'period'                  => '1D',
                 'entries'                 => [],
-                'converted_entries'       => [],
+                'native_entries'          => [],
             ];
             $currentStart   = clone $start;
             $range          = app('steam')->balanceInRange($account, $start, clone $end, $currency);
@@ -141,11 +143,11 @@ class AccountController extends Controller
 
                 $currentStart->addDay();
                 $currentSet['entries'][$label]        = $balance;
-                $currentSet['converted_entries'][$label] = $balanceConverted;
+                $currentSet['native_entries'][$label] = $balanceConverted;
             }
             $chartData[] = $currentSet;
         }
 
-        return response()->json($chartData);
+        return response()->json($this->clean($chartData));
     }
 }

app/Api/V2/Controllers/Chart/BalanceController.php

@@ -28,7 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
+use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
@@ -38,7 +38,7 @@ use Illuminate\Support\Collection;
  */
 class BalanceController extends Controller
 {
-    use ConvertsExchangeRates;
+    use CleansChartData;
 
     private AccountRepositoryInterface $repository;
 
@@ -76,13 +76,13 @@ class BalanceController extends Controller
         $start = $params['start'];
         /** @var Carbon $end */
         $end = $params['end'];
+        $end->endOfDay();
         /** @var Collection $accounts */
         $accounts       = $params['accounts'];
         $preferredRange = $params['period'];
 
         // set some formats, based on input parameters.
         $format = app('navigation')->preferredCarbonFormatByPeriod($preferredRange);
-        $titleFormat = app('navigation')->preferredCarbonLocalizedFormatByPeriod($preferredRange);
 
         // prepare for currency conversion and data collection:
         $ids = $accounts->pluck('id')->toArray();
@@ -147,8 +147,8 @@ class BalanceController extends Controller
                 'period'        => $period,
                 'spent'         => '0',
                 'earned'        => '0',
-                'converted_spent'  => '0',
+                'native_spent'  => '0',
-                'converted_earned' => '0',
+                'native_earned' => '0',
             ];
             // is this journal's amount in- our outgoing?
             $key    = 'spent';
@@ -179,7 +179,7 @@ class BalanceController extends Controller
             $data[$currencyId][$period][$key] = bcadd($data[$currencyId][$period][$key], $amount);
 
             // add converted entry
-            $convertedKey                              = sprintf('converted_%s', $key);
+            $convertedKey                              = sprintf('native_%s', $key);
             $data[$currencyId][$period][$convertedKey] = bcadd($data[$currencyId][$period][$convertedKey], $amountConverted);
         }
 
@@ -197,8 +197,11 @@ class BalanceController extends Controller
                 'native_symbol'           => $currency['native_symbol'],
                 'native_code'             => $currency['native_code'],
                 'native_decimal_places'   => $currency['native_decimal_places'],
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'period'                  => $preferredRange,
                 'entries'                 => [],
-                'converted_entries'       => [],
+                'native_entries'          => [],
             ];
             $expense = [
                 'label'                   => sprintf('spent-%s', $currency['currency_code']),
@@ -210,22 +213,25 @@ class BalanceController extends Controller
                 'native_symbol'           => $currency['native_symbol'],
                 'native_code'             => $currency['native_code'],
                 'native_decimal_places'   => $currency['native_decimal_places'],
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'period'                  => $preferredRange,
                 'entries'                 => [],
-                'converted_entries'       => [],
+                'native_entries'          => [],
 
             ];
             // loop all possible periods between $start and $end, and add them to the correct dataset.
             $currentStart = clone $start;
             while ($currentStart <= $end) {
                 $key   = $currentStart->format($format);
-                $title = $currentStart->isoFormat($titleFormat);
+                $label = $currentStart->toAtomString();
                 // normal entries
-                $income['entries'][$title]  = app('steam')->bcround(($currency[$key]['earned'] ?? '0'), $currency['currency_decimal_places']);
+                $income['entries'][$label]  = app('steam')->bcround(($currency[$key]['earned'] ?? '0'), $currency['currency_decimal_places']);
-                $expense['entries'][$title] = app('steam')->bcround(($currency[$key]['spent'] ?? '0'), $currency['currency_decimal_places']);
+                $expense['entries'][$label] = app('steam')->bcround(($currency[$key]['spent'] ?? '0'), $currency['currency_decimal_places']);
 
                 // converted entries
-                $income['converted_entries'][$title]  = app('steam')->bcround(($currency[$key]['converted_earned'] ?? '0'), $currency['native_decimal_places']);
+                $income['converted_entries'][$label]  = app('steam')->bcround(($currency[$key]['converted_earned'] ?? '0'), $currency['native_decimal_places']);
-                $expense['converted_entries'][$title] = app('steam')->bcround(($currency[$key]['converted_spent'] ?? '0'), $currency['native_decimal_places']);
+                $expense['converted_entries'][$label] = app('steam')->bcround(($currency[$key]['converted_spent'] ?? '0'), $currency['native_decimal_places']);
 
                 // next loop
                 $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
@@ -234,9 +240,7 @@ class BalanceController extends Controller
             $chartData[] = $income;
             $chartData[] = $expense;
         }
-        //$data = $this->generator->multiSet($chartData);
+        return response()->json($this->clean($chartData));
-
-        return response()->json($chartData);
     }
 
 }

app/Support/Http/Api/CleansChartData.php

@@ -0,0 +1,69 @@
+<?php
+/*
+ * CleansChartData.php
+ * Copyright (c) 2023 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Support\Http\Api;
+
+use FireflyIII\Exceptions\FireflyException;
+
+/**
+ * Trait CleansChartData
+ */
+trait CleansChartData
+{
+    /**
+     * Clean up given chart data array. Each entry is supposed to be a
+     * "main" entry used in the V2 API chart endpoints. This loop makes sure
+     * IDs are strings and other values are present (or missing).
+     *
+     * @param array $data
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function clean(array $data): array
+    {
+        $return = [];
+        /**
+         * @var mixed $index
+         * @var array $array
+         */
+        foreach ($data as $index => $array) {
+            if (array_key_exists('currency_id', $array)) {
+                $array['currency_id'] = (string)$array['currency_id'];
+            }
+            if (array_key_exists('native_id', $array)) {
+                $array['native_id'] = (string)$array['native_id'];
+            }
+            if (!array_key_exists('end', $array)) {
+                throw new FireflyException(sprintf('Data-set "%s" is missing the "end"-variable.', $index));
+            }
+            if (!array_key_exists('start', $array)) {
+                throw new FireflyException(sprintf('Data-set "%s" is missing the "start"-variable.', $index));
+            }
+            if (!array_key_exists('period', $array)) {
+                throw new FireflyException(sprintf('Data-set "%s" is missing the "period"-variable.', $index));
+            }
+            $return[] = $array;
+        }
+        return $return;
+    }
+
+}

app/Support/Http/Api/ConvertsExchangeRates.php

@@ -230,9 +230,11 @@ trait ConvertsExchangeRates
      * @param array $entries
      *
      * @return array
+     * @deprecated
      */
     public function cerSum(array $entries): array
     {
+        die('do not use me, needs refactor');
         if (null === $this->enabled) {
             $this->getPreference();
         }

app/Support/Navigation.php

@@ -559,25 +559,6 @@ class Navigation
         return $format;
     }
 
-    /**
-     * Same as preferredCarbonLocalizedFormat but based on the period.
-     *
-     * @param string $period
-     *
-     * @return string
-     */
-    public function preferredCarbonLocalizedFormatByPeriod(string $period): string
-    {
-        $locale = app('steam')->getLocale();
-        return match ($period) {
-            default    => (string)trans('config.month_and_day_js', [], $locale),
-            '1W'       => (string)trans('config.week_in_year_js', [], $locale),
-            '1M'       => (string)trans('config.month_js', [], $locale),
-            '3M', '6M' => (string)trans('config.half_year_js', [], $locale),
-            '1Y'       => (string)trans('config.year_js', [], $locale),
-        };
-    }
-
     /**
      * If the date difference between start and end is less than a month, method returns "endOfDay". If the difference
      * is less than a year, method returns "endOfMonth". If the date difference is larger, method returns "endOfYear".

app/Support/Request/ConvertsDataTypes.php

@@ -376,7 +376,7 @@ trait ConvertsDataTypes
     {
         $result = null;
         try {
-            $result = $this->get($field) ? new Carbon($this->get($field)) : null;
+            $result = $this->get($field) ? new Carbon($this->get($field), config('app.timezone')) : null;
         } catch (InvalidFormatException $e) {
             // @ignoreException
         }

config/firefly.php

@@ -108,8 +108,8 @@ return [
         'handle_debts' => true,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.0.19',
+    'version'                      => '6.0.20',
-    'api_version'                  => '2.0.4',
+    'api_version'                  => '2.0.5',
     'db_version'                   => 19,
 
     // generic settings