kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

First attempt to run file import.

Browse Source
This commit is contained in:
James Cole
2018-05-10 06:26:57 +02:00
parent 6ef0eb73d0
commit 116f7ed613
2 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Import/Routine/FileRoutine.php
View File

@@ -61,17 +61,13 @@ class FileRoutine implements RoutineInterface
$processor->setJob($this->importJob); $processor->setJob($this->importJob);
$transactions = $processor->run(); $transactions = $processor->run();
// make processor run. $this->repository->setStatus($this->importJob, 'provider_finished');
// then done! $this->repository->setStage($this->importJob, 'final');
// move to status 'processor_finished'. $this->repository->setTransactions($this->importJob, $transactions);
// $this->repository->setStatus($this->importJob, 'provider_finished');
// $this->repository->setStage($this->importJob, 'final');
break; break;
default: default:
throw new FireflyException(sprintf('Import routine cannot handle stage "%s"', $this->importJob->stage)); throw new FireflyException(sprintf('Import routine cannot handle stage "%s"', $this->importJob->stage));
} }
exit;
} }
/** /**

58
app/Support/Import/Routine/File/CSVProcessor.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Import\Routine\File; namespace FireflyIII\Support\Import\Routine\File;
use Carbon\Carbon; use Carbon\Carbon;
use Carbon\Exceptions\InvalidDateException;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
@@ -91,16 +92,7 @@ class CSVProcessor implements FileProcessorInterface
// now validate all mapped values: // now validate all mapped values:
$this->validateMappedValues(); $this->validateMappedValues();
return $this->parseImportables($importables);
$array = $this->parseImportables($importables);
echo '<pre>';
print_r($array);
print_r($importables);
print_r($lines);
exit;
die('here we are');
} }
/** /**
@@ -401,6 +393,7 @@ class CSVProcessor implements FileProcessorInterface
* pos = assume * pos = assume
*/ */
$transactionType = 'unknown';
$accountId = $this->verifyObjectId('account-id', $importable->getAccountId()); $accountId = $this->verifyObjectId('account-id', $importable->getAccountId());
$billId = $this->verifyObjectId('bill-id', $importable->getForeignCurrencyId()); $billId = $this->verifyObjectId('bill-id', $importable->getForeignCurrencyId());
$budgetId = $this->verifyObjectId('budget-id', $importable->getBudgetId()); $budgetId = $this->verifyObjectId('budget-id', $importable->getBudgetId());
@@ -410,19 +403,45 @@ class CSVProcessor implements FileProcessorInterface
$opposingId = $this->verifyObjectId('opposing-id', $importable->getOpposingId()); $opposingId = $this->verifyObjectId('opposing-id', $importable->getOpposingId());
// also needs amount to be final. // also needs amount to be final.
//$account = $this->mapAccount($accountId, $importable->getAccountData()); //$account = $this->mapAccount($accountId, $importable->getAccountData());
$asset = $this->mapAssetAccount($accountId, $importable->getAccountData()); $source = $this->mapAssetAccount($accountId, $importable->getAccountData());
$sourceId = $asset->id; $destination = $this->mapOpposingAccount($opposingId, $amount, $importable->getOpposingAccountData());
$opposing = $this->mapOpposingAccount($opposingId, $amount, $importable->getOpposingAccountData());
$destId = $opposing->id;
if (bccomp($amount, '0') === 1) { if (bccomp($amount, '0') === 1) {
// amount is positive? Then switch: // amount is positive? Then switch:
[$destId, $sourceId] = [$sourceId, $destId]; [$destination, $source] = [$source, $destination];
} }
if ($source->accountType->type === AccountType::ASSET && $destination->accountType->type === AccountType::ASSET) {
$transactionType = 'transfer';
}
if ($source->accountType->type === AccountType::REVENUE) {
$transactionType = 'deposit';
}
if ($destination->accountType->type === AccountType::EXPENSE) {
$transactionType = 'withdrawal';
}
if ($transactionType === 'unknown') {
Log::error(
sprintf(
'Cannot determine transaction type. Source account is a %s, destination is a %s',
$source->accountType->type, $destination->accountType->type
), ['source' => $source->toArray(), 'dest' => $destination->toArray()]
);
}
try {
$date = Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $importable->getDate());
} catch (InvalidDateException $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
$date = new Carbon;
}
$dateStr = $date->format('Y-m-d');
return [ return [
'type' => 'unknown', // todo 'type' => $transactionType,
'date' => Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $importable->getDate()), 'date' => $dateStr,
'tags' => $importable->getTags(), // todo make sure its filled. 'tags' => $importable->getTags(), // todo make sure its filled.
'user' => $this->importJob->user_id, 'user' => $this->importJob->user_id,
'notes' => $importable->getNote(), 'notes' => $importable->getNote(),
@@ -462,9 +481,9 @@ class CSVProcessor implements FileProcessorInterface
'budget_name' => null === $budgetId ? $importable->getBudgetName() : null, 'budget_name' => null === $budgetId ? $importable->getBudgetName() : null,
'category_id' => $categoryId, 'category_id' => $categoryId,
'category_name' => null === $categoryId ? $importable->getCategoryName() : null, 'category_name' => null === $categoryId ? $importable->getCategoryName() : null,
'source_id' => $sourceId, 'source_id' => $source->id,
'source_name' => null, 'source_name' => null,
'destination_id' => $destId, 'destination_id' => $destination->id,
'destination_name' => null, 'destination_name' => null,
'foreign_currency_id' => $foreignCurrencyId, 'foreign_currency_id' => $foreignCurrencyId,
'foreign_currency_code' => null, 'foreign_currency_code' => null,
@@ -474,6 +493,7 @@ class CSVProcessor implements FileProcessorInterface
], ],
], ],
]; ];
} }
/** /**