Merge branch 'release/0.1.0'

Author: JC5

app/Http/Controllers/Import/AuthenticateController.php

@@ -56,7 +56,6 @@ public function index(Request $request)
         $flow      = $request->cookie(Constants::FLOW_COOKIE);
 
         if ('spectre' === $flow) {
-            die('TODO '. __METHOD__);
             $subTitle  = 'Spectre';
             $validator = new SpectreValidator;
             $result    = $validator->validate();

app/Http/Controllers/Import/CSV/RoleController.php

@@ -82,7 +82,7 @@ public function index(Request $request)
         }
 
         // get columns from file
-        $content  = StorageService::getContent(session()->get(Constants::UPLOAD_CSV_FILE));
+        $content = StorageService::getContent(session()->get(Constants::UPLOAD_CSV_FILE),$configuration->isConversion());
         $columns  = RoleService::getColumns($content, $configuration);
         $examples = RoleService::getExampleData($content, $configuration);
 

app/Http/Controllers/Import/ConfigurationController.php

@@ -38,6 +38,9 @@
 use App\Services\Nordigen\Services\AccountInformationCollector;
 use App\Services\Nordigen\TokenManager;
 use App\Services\Session\Constants;
+use App\Services\Spectre\Model\Account as SpectreAccount;
+use App\Services\Spectre\Request\GetAccountsRequest as SpectreGetAccountsRequest;
+use App\Services\Spectre\Response\GetAccountsResponse as SpectreGetAccountsResponse;
 use App\Services\Storage\StorageService;
 use App\Support\Token;
 use Cache;
@@ -75,7 +78,7 @@ public function index(Request $request)
     {
         Log::debug(sprintf('Now at %s', __METHOD__));
         $mainTitle = 'Configuration';
-        $subTitle  = 'Configure your TODO file import';
+        $subTitle  = 'Configure your import';
         $accounts  = [];
         $flow      = $request->cookie(Constants::FLOW_COOKIE);
 
@@ -123,20 +126,28 @@ public function index(Request $request)
         }
 
         // also get the nordigen / spectre accounts
-        $nordigenAccounts = [];
+        $importerAccounts = [];
         if ('nordigen' === $flow) {
             // list all accounts in Nordigen:
             $reference        = $configuration->getRequisition(session()->get(Constants::REQUISITION_REFERENCE));
-            $nordigenAccounts = $this->getNordigenAccounts($reference);
-            $nordigenAccounts = $this->mergeAccountLists($nordigenAccounts, $accounts);
+            $importerAccounts = $this->getNordigenAccounts($reference);
+            $importerAccounts = $this->mergeNordigenAccountLists($importerAccounts, $accounts);
         }
+
         if ('spectre' === $flow) {
-            die('grab config for spectre.');
+            // get the accounts over at Spectre.
+            $url                     = config('spectre.url');
+            $appId                   = config('spectre.app_id');
+            $secret                  = config('spectre.secret');
+            $spectreList             = new SpectreGetAccountsRequest($url, $appId, $secret);
+            $spectreList->connection = $configuration->getConnection();
+            $spectreAccounts         = $spectreList->get();
+            $importerAccounts        = $this->mergeSpectreAccountLists($spectreAccounts, $accounts);
         }
 
         return view(
             'import.004-configure.index',
-            compact('mainTitle', 'subTitle', 'accounts', 'configuration', 'flow', 'nordigenAccounts')
+            compact('mainTitle', 'subTitle', 'accounts', 'configuration', 'flow', 'importerAccounts')
         );
     }
 
@@ -171,6 +182,7 @@ public function postIndex(ConfigurationPostRequest $request): RedirectResponse
         $configuration->setFlow($request->cookie(Constants::FLOW_COOKIE));
 
         // TODO are all fields actually in the config?
+
         // loop accounts:
         $accounts = [];
         foreach (array_keys($fromRequest['do_import']) as $identifier) {
@@ -193,9 +205,14 @@ public function postIndex(ConfigurationPostRequest $request): RedirectResponse
 
         session()->put(Constants::CONFIGURATION, $configuration->toSessionArray());
 
+
+        Log::debug(sprintf('Configuration debug: Connection ID is "%s"', $configuration->getConnection()));
         // set config as complete.
         session()->put(Constants::CONFIG_COMPLETE_INDICATOR, true);
-
+        if ('nordigen' === $configuration->getFlow() || 'spectre' === $configuration->getFlow()) {
+            // at this point, nordigen is ready for data conversion.
+            session()->put(Constants::READY_FOR_CONVERSION, true);
+        }
         // always redirect to roles, even if this isn't the step yet
         // for nordigen and spectre, roles will be skipped right away.
         return redirect(route('005-roles.index'));
@@ -245,25 +262,75 @@ private function getNordigenAccounts(string $identifier): array
         return $return;
     }
 
+
+    /**
+     * @param SpectreGetAccountsResponse $spectre
+     * @param array                      $firefly
+     *
+     * TODO should be a helper
+     */
+    private function mergeSpectreAccountLists(SpectreGetAccountsResponse $spectre, array $firefly): array
+    {
+        $return = [];
+        Log::debug('Now creating Spectre account lists.');
+
+        /** @var SpectreAccount $spectreAccount */
+        foreach ($spectre as $spectreAccount) {
+            Log::debug(sprintf('Now working on Spectre account "%s": "%s"', $spectreAccount->name, $spectreAccount->id));
+            $iban     = $spectreAccount->iban;
+            $currency = $spectreAccount->currencyCode;
+            $entry    = [
+                'import_service' => $spectreAccount,
+                'firefly'        => [],
+            ];
+
+            // only iban?
+            $filteredByIban = $this->filterByIban($firefly, $iban);
+
+            if (1 === count($filteredByIban)) {
+                Log::debug(sprintf('This account (%s) has a single Firefly III counter part (#%d, "%s", same IBAN), so will use that one.', $iban, $filteredByIban[0]->id, $filteredByIban[0]->name));
+                $entry['firefly'] = $filteredByIban;
+                $return[]         = $entry;
+                continue;
+            }
+            Log::debug(sprintf('Found %d accounts with the same IBAN ("%s")', count($filteredByIban), $iban));
+
+            // only currency?
+            $filteredByCurrency = $this->filterByCurrency($firefly, $currency);
+
+            if (count($filteredByCurrency) > 0) {
+                Log::debug(sprintf('This account (%s) has some Firefly III counter parts with the same currency so will only use those.', $currency));
+                $entry['firefly'] = $filteredByCurrency;
+                $return[]         = $entry;
+                continue;
+            }
+            Log::debug('No special filtering on the Firefly III account list.');
+            $entry['firefly'] = $firefly;
+            $return[]         = $entry;
+        }
+        return $return;
+    }
+
+
     /**
      * @param array $nordigen
      * @param array $firefly
      * @return array
      *
      * TODO move to some helper.
      */
-    private function mergeAccountLists(array $nordigen, array $firefly): array
+    private function mergeNordigenAccountLists(array $nordigen, array $firefly): array
     {
-        Log::debug('Now creating account lists.');
+        Log::debug('Now creating Nordigen account lists.');
         $return = [];
         /** @var NordigenAccount $nordigenAccount */
         foreach ($nordigen as $nordigenAccount) {
             Log::debug(sprintf('Now working on account "%s": "%s"', $nordigenAccount->getName(), $nordigenAccount->getIdentifier()));
             $iban     = $nordigenAccount->getIban();
             $currency = $nordigenAccount->getCurrency();
             $entry    = [
-                'nordigen' => $nordigenAccount,
-                'firefly'  => [],
+                'import_service' => $nordigenAccount,
+                'firefly'        => [],
             ];
 
             // only iban?

app/Http/Controllers/Import/ConversionController.php

@@ -31,6 +31,7 @@
 use App\Services\CSV\Configuration\Configuration;
 use App\Services\CSV\Conversion\RoutineManager as CSVRoutineManager;
 use App\Services\Nordigen\Conversion\RoutineManager as NordigenRoutineManager;
+use App\Services\Spectre\Conversion\RoutineManager as SpectreRoutineManager;
 use App\Services\Session\Constants;
 use App\Services\Shared\Conversion\ConversionStatus;
 use App\Services\Shared\Conversion\RoutineManagerInterface;
@@ -79,6 +80,7 @@ public function index()
             $configuration->setMapping($diskConfig->getMapping());
         }
 
+
         Log::debug('Will now verify configuration content.');
         $jobBackUrl = route('back.mapping');
         if (empty($configuration->getDoMapping())) {
@@ -112,7 +114,7 @@ public function index()
             $routine = new NordigenRoutineManager($identifier);
         }
         if ('spectre' === $flow) {
-            throw new ImporterErrorException('Cannot handle. :(');
+            $routine = new SpectreRoutineManager($identifier);
         }
         if ($configuration->isMapAllData() && in_array($flow, ['spectre', 'nordigen'], true)) {
             $nextUrl = route('006-mapping.index');
@@ -168,7 +170,7 @@ public function start(Request $request): JsonResponse
             $routine = new NordigenRoutineManager($identifier);
         }
         if ('spectre' === $flow) {
-            throw new ImporterErrorException('Cannot handle. :(');
+            $routine = new SpectreRoutineManager($identifier);
         }
 
         $importJobStatus = RoutineStatusManager::startOrFindConversion($identifier);