Works up until actual import.

2025-10-14 16:13:54 +00:00 · 2016-07-02 23:08:47 +02:00
parent 162c762973
commit ae768a8525
12 changed files with 444 additions and 71 deletions
--- a/app/Import/Importer/CsvImporter.php
+++ b/app/Import/Importer/CsvImporter.php
@@ -158,13 +158,16 @@ class CsvImporter implements ImporterInterface
     */
    public function requireUserSettings(): bool
    {
-        // does the job have both a 'map' array and a 'columns' array.
-        $config = $this->job->configuration;
-        if (isset($config['map']) && isset($config['columns'])) {
-            return false;
-        }
+        Log::debug('doColumnMapping is ' . ($this->doColumnMapping() ? 'true' : 'false'));
+        Log::debug('doColumnRoles is ' . ($this->doColumnRoles() ? 'true' : 'false'));
+        if ($this->doColumnMapping() || $this->doColumnRoles()) {
+            Log::debug('Return true');

-        return true;
+            return true;
+        }
+        Log::debug('Return false');
+
+        return false;
    }

    /**
@@ -216,25 +219,52 @@ class CsvImporter implements ImporterInterface
     */
    public function storeSettings(Request $request)
    {
-        $config  = $this->job->configuration;
-        $count   = $config['column-count'];
-        $all     = $request->all();
-        $roleSet = 0;
-        for ($i = 0; $i < $count; $i++) {
-            $selectedRole = $all['role'][$i] ?? '_ignore';
-            $doMapping    = isset($all['map'][$i]) && $all['map'][$i] == '1' ? true : false;
-            if ($selectedRole == '_ignore' && $doMapping === true) {
-                $doMapping = false; // cannot map ignored columns.
+        $config = $this->job->configuration;
+        $all    = $request->all();
+        if ($request->get('settings') == 'roles') {
+            $count = $config['column-count'];
+
+            $roleSet = 0; // how many roles have been defined
+            $mapSet  = 0;  // how many columns must be mapped
+            for ($i = 0; $i < $count; $i++) {
+                $selectedRole = $all['role'][$i] ?? '_ignore';
+                $doMapping    = isset($all['map'][$i]) && $all['map'][$i] == '1' ? true : false;
+                if ($selectedRole == '_ignore' && $doMapping === true) {
+                    $doMapping = false; // cannot map ignored columns.
+                }
+                if ($selectedRole != '_ignore') {
+                    $roleSet++;
+                }
+                if ($doMapping === true) {
+                    $mapSet++;
+                }
+                $config['column-roles'][$i]      = $selectedRole;
+                $config['column-do-mapping'][$i] = $doMapping;
            }
-            if ($selectedRole != '_ignore') {
-                $roleSet++;
+            if ($roleSet > 0) {
+                $config['column-roles-complete'] = true;
+                $this->job->configuration        = $config;
+                $this->job->save();
+            }
+            if ($mapSet === 0) {
+                // skip setting of map:
+                $config['column-mapping-complete'] = true;
            }
-            $config['column-roles'][$i]      = $selectedRole;
-            $config['column-do-mapping'][$i] = $doMapping;
        }
-        if ($roleSet > 0) {
-            $config['column-roles-complete'] = true;
-            $this->job->configuration        = $config;
+        if ($request->get('settings') == 'map') {
+            foreach ($all['mapping'] as $index => $data) {
+                $config['column-mapping-config'][$index] = [];
+                foreach ($data as $value => $mapId) {
+                    $mapId = intval($mapId);
+                    if ($mapId !== 0) {
+                        $config['column-mapping-config'][$index][$value] = intval($mapId);
+                    }
+                }
+            }
+
+            // set thing to be completed.
+            $config['column-mapping-complete'] = true;
+            $this->job->configuration          = $config;
            $this->job->save();
        }
    }
@@ -260,8 +290,9 @@ class CsvImporter implements ImporterInterface
     */
    private function getDataForColumnMapping(): array
    {
-        $config = $this->job->configuration;
-        $data   = [];
+        $config  = $this->job->configuration;
+        $data    = [];
+        $indexes = [];

        foreach ($config['column-do-mapping'] as $index => $mustBeMapped) {
            if ($mustBeMapped) {
@@ -271,9 +302,11 @@ class CsvImporter implements ImporterInterface
                    $mapperName = '\FireflyIII\Import\Mapper\\' . config('csv.import_roles.' . $column . '.mapper');
                    /** @var MapperInterface $mapper */
                    $mapper       = new $mapperName;
+                    $indexes[]    = $index;
                    $data[$index] = [
                        'name'    => $column,
                        'mapper'  => $mapperName,
+                        'index'   => $index,
                        'options' => $mapper->getMap(),
                        'values'  => [],
                    ];
@@ -281,15 +314,25 @@ class CsvImporter implements ImporterInterface
            }
        }

+        // in order to actually map we also need all possible values from the CSV file.
+        $content = $this->job->uploadFileContents();
+        $reader  = Reader::createFromString($content);
+        $results = $reader->fetch();

-        echo '<pre>';
-        var_dump($data);
-        var_dump($config);
-
-
-        exit;
-
+        foreach ($results as $row) {
+            //do something here
+            foreach ($indexes as $index) {
+                $value = $row[$index];
+                if (strlen($value) > 0) {
+                    $data[$index]['values'][] = $row[$index];
+                }
+            }
+        }
+        foreach ($data as $index => $entry) {
+            $data[$index]['values'] = array_unique($data[$index]['values']);
+        }

+        return $data;
    }

    /**
--- a/app/Import/Mapper/Bills.php
+++ b/app/Import/Mapper/Bills.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Bills.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Import\Mapper;
+
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+
+/**
+ * Class Bills
+ *
+ * @package FireflyIII\Import\Mapper
+ */
+class Bills implements MapperInterface
+{
+
+    /**
+     * @return array
+     */
+    public function getMap(): array
+    {
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $result     = $repository->getBills();
+        $list       = [];
+
+        /** @var Bill $bill */
+        foreach ($result as $bill) {
+            $list[$bill->id] = $bill->name . ' [' . $bill->match . ']';
+        }
+        asort($list);
+
+        $list = [0 => trans('csv.do_not_map')] + $list;
+
+        return $list;
+
+    }
+}
--- a/app/Import/Mapper/Budgets.php
+++ b/app/Import/Mapper/Budgets.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Budgets.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Import\Mapper;
+
+
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+
+/**
+ * Class Budgets
+ *
+ * @package FireflyIII\Import\Mapper
+ */
+class Budgets implements MapperInterface
+{
+
+    /**
+     * @return array
+     */
+    public function getMap(): array
+    {
+        /** @var BudgetRepositoryInterface $repository */
+        $repository = app(BudgetRepositoryInterface::class);
+        $result     = $repository->getBudgets();
+        $list       = [];
+
+        /** @var Budget $budget */
+        foreach ($result as $budget) {
+            $list[$budget->id] = $budget->name;
+        }
+        asort($list);
+
+        $list = [0 => trans('csv.do_not_map')] + $list;
+
+        return $list;
+
+    }
+}
--- a/app/Import/Mapper/Categories.php
+++ b/app/Import/Mapper/Categories.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Categories.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Import\Mapper;
+
+
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+
+/**
+ * Class Categories
+ *
+ * @package FireflyIII\Import\Mapper
+ */
+class Categories implements MapperInterface
+{
+
+    /**
+     * @return array
+     */
+    public function getMap(): array
+    {
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
+        $result     = $repository->getCategories();
+        $list       = [];
+
+        /** @var Category $category */
+        foreach ($result as $category) {
+            $list[$category->id] = $category->name;
+        }
+        asort($list);
+
+        $list = [0 => trans('csv.do_not_map')] + $list;
+
+        return $list;
+
+    }
+}
--- a/app/Import/Mapper/Tags.php
+++ b/app/Import/Mapper/Tags.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Tags.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Import\Mapper;
+
+use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+
+/**
+ * Class Tags
+ *
+ * @package FireflyIII\Import\Mapper
+ */
+class Tags implements MapperInterface
+{
+
+    /**
+     * @return array
+     */
+    public function getMap(): array
+    {
+        /** @var TagRepositoryInterface $repository */
+        $repository = app(TagRepositoryInterface::class);
+        $result     = $repository->get();
+        $list       = [];
+
+        /** @var Tag $tag */
+        foreach ($result as $tag) {
+            $list[$tag->id] = $tag->tag;
+        }
+        asort($list);
+
+        $list = [0 => trans('csv.do_not_map')] + $list;
+
+        return $list;
+
+    }
+}