Fix various bugs in the import routine, discovered by Doug.

app/Factory/TransactionFactory.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Factory;
 
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -105,6 +106,16 @@ class TransactionFactory
         $destinationType = $this->accountType($journal, 'destination');
         Log::debug(sprintf('Expect source destination to be of type %s', $destinationType));
         $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']);
+
+        Log::debug(sprintf('Source type is "%s", destination type is "%s"', $sourceType, $destinationType));
+        // throw big fat error when source type === dest type
+        if ($sourceAccount->accountType->type === $destinationAccount->accountType->type) {
+            throw new FireflyException(sprintf('Source and destination account cannot be both of the type "%s"', $destinationAccount->accountType->type));
+        }
+        if ($sourceAccount->accountType->type !== AccountType::ASSET && $destinationAccount->accountType->type !== AccountType::ASSET) {
+            throw new FireflyException('At least one of the accounts must be an asset account.');
+        }
+
         // first make a "negative" (source) transaction based on the data in the array.
         $source = $this->create(
             [

app/Helpers/Collector/JournalCollector.php

@@ -768,6 +768,14 @@ class JournalCollector implements JournalCollectorInterface
         return $this;
     }
 
+    /**
+     * @return EloquentBuilder
+     */
+    public function getQuery(): EloquentBuilder
+    {
+        return $this->query;
+    }
+
     /**
      * @param Collection $set
      *

app/Helpers/Collector/JournalCollectorInterface.php

@@ -27,6 +27,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use FireflyIII\User;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
@@ -35,6 +36,7 @@ use Illuminate\Support\Collection;
  */
 interface JournalCollectorInterface
 {
+
     /**
      * @param string $filter
      *
@@ -78,6 +80,11 @@ interface JournalCollectorInterface
      */
     public function getPaginatedJournals(): LengthAwarePaginator;
 
+    /**
+     * @return EloquentBuilder
+     */
+    public function getQuery(): EloquentBuilder;
+
     /**
      * @return JournalCollectorInterface
      */

app/Import/Storage/ImportArrayStorage.php

@@ -303,7 +303,7 @@ class ImportArrayStorage
                 'existing'    => $existingId,
                 'description' => $transaction['description'] ?? '',
                 'amount'      => $transaction['transactions'][0]['amount'] ?? 0,
-                'date'        => isset($transaction['date']) ? $transaction['date'] : '',
+                'date'        => $transaction['date'] ?? '',
             ]
         );
 
@@ -413,7 +413,14 @@ class ImportArrayStorage
             $store['date']        = Carbon::createFromFormat('Y-m-d', $store['date']);
             $store['description'] = $store['description'] === '' ? '(empty description)' : $store['description'];
             // store the journal.
+            try {
                 $journal = $this->journalRepos->store($store);
+            } catch(FireflyException $e) {
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
+                $this->repository->addErrorMessage($this->importJob, sprintf('Row #%d could not be imported. %s', $index, $e->getMessage()));
+                continue;
+            }
             Log::debug(sprintf('Stored as journal #%d', $journal->id));
             $collection->push($journal);
         }

app/Repositories/Journal/JournalRepository.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Repositories\Journal;
 
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\TransactionJournalFactory;
 use FireflyIII\Factory\TransactionJournalMetaFactory;
 use FireflyIII\Models\Account;
@@ -738,8 +739,7 @@ class JournalRepository implements JournalRepositoryInterface
      *
      * @return TransactionJournal
      *
-     * @throws \FireflyIII\Exceptions\FireflyException
+     * @throws FireflyException
-     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function store(array $data): TransactionJournal
     {

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Repositories\Journal;
 
 use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
@@ -325,7 +326,7 @@ interface JournalRepositoryInterface
 
     /**
      * @param array $data
-     *
+     * @throws FireflyException
      * @return TransactionJournal
      */
     public function store(array $data): TransactionJournal;

app/Services/Internal/Support/TransactionServiceTrait.php

@@ -190,6 +190,7 @@ trait TransactionServiceTrait
      */
     protected function findCategory(?int $categoryId, ?string $categoryName): ?Category
     {
+        Log::debug(sprintf('Going to find or create category #%d, with name "%s"', $categoryId, $categoryName));
         /** @var CategoryFactory $factory */
         $factory = app(CategoryFactory::class);
         $factory->setUser($this->user);

app/Support/Import/Placeholder/ImportTransaction.php

@@ -179,7 +179,9 @@ class ImportTransaction
                 $this->budgetName = $columnValue->getValue();
                 break;
             case 'category-id':
-                $this->categoryId = $this->getMappedValue($columnValue);
+                $value = $this->getMappedValue($columnValue);
+                Log::debug(sprintf('Set category ID to %d in ImportTransaction object', $value));
+                $this->categoryId = $value;
                 break;
             case 'category-name':
                 $this->categoryName = $columnValue->getValue();

app/Support/Import/Routine/File/ImportableConverter.php

@@ -279,11 +279,14 @@ class ImportableConverter
      */
     private function verifyObjectId(string $key, int $objectId): ?int
     {
+
         if (isset($this->mappedValues[$key]) && \in_array($objectId, $this->mappedValues[$key], true)) {
+            Log::debug(sprintf('verifyObjectId(%s, %d) is valid!',$key, $objectId));
             return $objectId;
         }
 
-        return null;
+        Log::debug(sprintf('verifyObjectId(%s, %d) is NOT in the list, but it could still be valid.',$key, $objectId));
+        return $objectId;
     }
 
 

app/Support/Import/Routine/File/MappedValuesValidator.php

@@ -87,6 +87,7 @@ class MappedValuesValidator
         $return = [];
         Log::debug('Now in validateMappedValues()');
         foreach ($mappings as $role => $values) {
+            Log::debug(sprintf('Now at role "%s"', $role));
             $values = array_unique($values);
             if (\count($values) > 0) {
                 switch ($role) {
@@ -115,9 +116,11 @@ class MappedValuesValidator
                         $return[$role] = $valid;
                         break;
                     case 'category-id':
+                        Log::debug('Going to validate these category ids: ', $values);
                         $set           = $this->catRepos->getByIds($values);
                         $valid         = $set->pluck('id')->toArray();
                         $return[$role] = $valid;
+                        Log::debug('Valid category IDs are: ', $valid);
                         break;
                 }
             }