Skip to content

Prefer CAMT over MT940 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gared wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prefer CAMT over MT940 #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions src/Console/ImportTransactionsCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
use DateTime;
use Fhp\Action\GetSEPAAccounts;
use Fhp\Action\GetStatementOfAccount;
use Fhp\Action\GetStatementOfAccountXML;
use Fhp\CAMT\CAMT;
use Fhp\FinTs;
use Fhp\Model\SEPAAccount;
use Fhp\Model\StatementOfAccount\StatementOfAccount;
use Fhp\UnsupportedException;
use Gared\FireflyImporter\Config\ConfigFileHandlerFactory;
use Gared\FireflyImporter\Config\Parser\Config;
use Gared\FireflyImporter\FinTS\FinTSFactory;
Expand Down Expand Up @@ -81,24 +85,19 @@ public function execute(InputInterface $input, OutputInterface $output): int

$account = $this->getAccount($finTs, $config);

$getStatementOfAccountRequest = GetStatementOfAccount::create(
account: $account,
from: DateTime::createFromInterface($config->account->fromDate),
to: DateTime::createFromInterface($config->account->toDate)
);
$finTs->execute($getStatementOfAccountRequest);
$statementAccount = $getStatementOfAccountRequest->getStatement();
$statementAccount = $this->getStatementOfAccount($account, $config, $finTs);

$table = new Table($output);

$table->setHeaders(['Credit/Debit', 'Amount', 'Description', 'Account Number', 'Name']);
$table->setHeaders(['Date', 'Credit/Debit', 'Amount', 'Description', 'Account Number', 'Name']);

$transactionMapper = new TransactionMapper();

$fireflyTransactions = [];
foreach ($statementAccount->getStatements() as $statement) {
foreach ($statement->getTransactions() as $transaction) {
$table->addRow([
$transaction->getBookingDate()?->format('Y-m-d'),
$transaction->getCreditDebit(),
$transaction->getAmount(),
$transaction->getMainDescription(),
Expand Down Expand Up @@ -133,6 +132,33 @@ public function execute(InputInterface $input, OutputInterface $output): int
return self::SUCCESS;
}

private function getStatementOfAccount(SEPAAccount $account, Config $config, FinTs $finTs): StatementOfAccount
{
try {
$getStatementOfAccountRequestXML = GetStatementOfAccountXML::create(
account: $account,
from: DateTime::createFromInterface($config->account->fromDate),
to: DateTime::createFromInterface($config->account->toDate)
);
$finTs->execute($getStatementOfAccountRequestXML);
$bookedXML = $getStatementOfAccountRequestXML->getBookedXML();

$parser = new CAMT();
$parsedCAMT = $parser->parse($bookedXML);

return StatementOfAccount::fromCAMTArray($parsedCAMT);
} catch (UnsupportedException) {
$getStatementOfAccountRequest = GetStatementOfAccount::create(
account: $account,
from: DateTime::createFromInterface($config->account->fromDate),
to: DateTime::createFromInterface($config->account->toDate)
);
$finTs->execute($getStatementOfAccountRequest);

return $getStatementOfAccountRequest->getStatement();
}
}

private function getAccount(FinTs $finTs, Config $config): SEPAAccount
{
$getSepaAccountsAction = GetSEPAAccounts::create();
Expand Down