Skip to content

Add new Estateguru PDF-Importer #4259

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

Merged
Nirus2000 merged 1 commit into from
Sep 30, 2024
Merged

Add new Estateguru PDF-Importer #4259

Show file tree
Hide file tree
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
95 changes: 95 additions & 0 deletions ...ts/src/name/abuchen/portfolio/datatransfer/pdf/estateguru/EstateGuruPDFExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package name.abuchen.portfolio.datatransfer.pdf.estateguru;

import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.deposit;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.fee;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasAmount;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasDate;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasNote;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasSource;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.interest;
import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.removal;
import static name.abuchen.portfolio.datatransfer.ExtractorTestUtilities.countAccountTransactions;
import static name.abuchen.portfolio.datatransfer.ExtractorTestUtilities.countBuySell;
import static name.abuchen.portfolio.datatransfer.ExtractorTestUtilities.countSecurities;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.collection.IsEmptyCollection.empty;

import java.util.ArrayList;
import java.util.List;

import org.junit.Test;

import name.abuchen.portfolio.datatransfer.Extractor.Item;
import name.abuchen.portfolio.datatransfer.actions.AssertImportActions;
import name.abuchen.portfolio.datatransfer.pdf.EstateGuruPDFExtractor;
import name.abuchen.portfolio.datatransfer.pdf.PDFInputFile;
import name.abuchen.portfolio.model.Client;
import name.abuchen.portfolio.money.CurrencyUnit;

@SuppressWarnings("nls")
public class EstateGuruPDFExtractorTest
{
@Test
public void testKontoauszug01()
{
EstateGuruPDFExtractor extractor = new EstateGuruPDFExtractor(new Client());

List<Exception> errors = new ArrayList<>();

List<Item> results = extractor.extract(PDFInputFile.loadTestCase(getClass(), "Kontoauszug01.txt"), errors);

assertThat(errors, empty());
assertThat(countSecurities(results), is(0L));
assertThat(countBuySell(results), is(0L));
assertThat(countAccountTransactions(results), is(3L));
assertThat(results.size(), is(3));
new AssertImportActions().check(results, CurrencyUnit.EUR);

// assert transaction
assertThat(results, hasItem(deposit(hasDate("2023-07-25"), hasAmount("EUR", 300.00), //
hasSource("Kontoauszug01.txt"), hasNote(null))));

// assert transaction
assertThat(results, hasItem(deposit(hasDate("2021-01-15"), hasAmount("EUR", 1100.00), //
hasSource("Kontoauszug01.txt"), hasNote(null))));

// assert transaction
assertThat(results, hasItem(removal(hasDate("2020-02-02"), hasAmount("EUR", 51.70), //
hasSource("Kontoauszug01.txt"), hasNote(null))));
}

@Test
public void testKontoauszug02()
{
EstateGuruPDFExtractor extractor = new EstateGuruPDFExtractor(new Client());

List<Exception> errors = new ArrayList<>();

List<Item> results = extractor.extract(PDFInputFile.loadTestCase(getClass(), "Kontoauszug02.txt"), errors);

assertThat(errors, empty());
assertThat(countSecurities(results), is(0L));
assertThat(countBuySell(results), is(0L));
assertThat(countAccountTransactions(results), is(4L));
assertThat(results.size(), is(4));
new AssertImportActions().check(results, CurrencyUnit.EUR);

// assert transaction
assertThat(results, hasItem(interest(hasDate("2024-06-21"), hasAmount("EUR", 0.42), //
hasSource("Kontoauszug02.txt"), hasNote("Zins"))));

// assert transaction
assertThat(results, hasItem(interest(hasDate("2024-05-02"), hasAmount("EUR", 0.10), //
hasSource("Kontoauszug02.txt"), hasNote("Strafe"))));

// assert transaction
assertThat(results, hasItem(interest(hasDate("2024-04-10"), hasAmount("EUR", 0.01), //
hasSource("Kontoauszug02.txt"), hasNote("Entschädigung"))));

// assert transaction
assertThat(results, hasItem(fee(hasDate("2024-04-05"), hasAmount("EUR", 0.61), //
hasSource("Kontoauszug02.txt"), hasNote("Vermögensverwaltungsgebühr"))));
}
}
18 changes: 18 additions & 0 deletions ....portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/estateguru/Kontoauszug01.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
PDFBox Version: 1.8.17
Portfolio Performance Version: 0.69.0
-----------------------------------------
Transaktionsbericht

NAME NAME (Investor)

Anfangssaldo € 72,69
Auszahlung € -1.584,71
Einzahlung € 4.100,00
Endsaldo € 13,74


Zahlungsdatum Bestätigungsdatum Cashflow-Typ Cashflow-Status Projektname Betrag Saldo
25.07.2023, 09:10 25.07.2023, 09:10 Einzahlung Genehmigt € 300,00 € 364,11
15.01.2021, 12:41 15.01.2021, 12:41 Einzahlung Genehmigt € 1.100,00 € 1.115,71
02.02.2020, 00:10 03.02.2020, 17:59 Auszahlung Genehmigt (€ -51,70) € 51,72
Estateguru OÜ, Tartu mnt 10/Pääsukese 2, Tallinn, 10145, Estland, info@estateguru.co
31 changes: 31 additions & 0 deletions ....portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/estateguru/Kontoauszug02.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
PDFBox Version: 1.8.17
Portfolio Performance Version: 0.69.0
-----------------------------------------
Transaktionsbericht

NAME NAME (Investor)

Anfangssaldo € 106,65
Zins € 79,18
Gebühr € -1,55
Strafe € 1,59
Entschädigung € 0,04
Endsaldo € 6,50


Zahlungsdatum Bestätigungsdatum Cashflow-Typ Cashflow-Status Projektname Betrag Saldo
#60572767
21.06.2024, 03:00 21.06.2024, 06:00 Zins Genehmigt Entwicklungskredit - 2.Stufe € 0,42 € 6,50
(Finnland)
#43684138
02.05.2024, 03:00 03.05.2024, 06:00 Strafe Genehmigt Entwicklungskredit - 3.Stufe € 0,10 € 36,33
(Finnland)
#14605226
Überbrückung
10.04.2024, 00:00 11.04.2024, 06:00 Entschädigung Genehmigt skredit - € 0,01 € 53,12
1.Stufe
(Estland)
#31681870
05.04.2024, 00:34 05.04.2024, 00:34 Vermögensverwaltungsgebühr Genehmigt (€ -0,61) € 63,00
#14605226
Estateguru OÜ, Tartu mnt 10/Pääsukese 2, Tallinn, 10145, Estland, info@estateguru.co 7
142 changes: 142 additions & 0 deletions ...abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/EstateGuruPDFExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
package name.abuchen.portfolio.datatransfer.pdf;

import static name.abuchen.portfolio.util.TextUtil.trim;

import name.abuchen.portfolio.datatransfer.pdf.PDFParser.Block;
import name.abuchen.portfolio.datatransfer.pdf.PDFParser.DocumentType;
import name.abuchen.portfolio.datatransfer.pdf.PDFParser.Transaction;
import name.abuchen.portfolio.model.AccountTransaction;
import name.abuchen.portfolio.model.Client;

@SuppressWarnings("nls")
public class EstateGuruPDFExtractor extends AbstractPDFExtractor
{
public EstateGuruPDFExtractor(Client client)
{
super(client);

addBankIdentifier("Estateguru");

addAccountStatementTransaction();
}

@Override
public String getLabel()
{
return "Estateguru";
}

private void addAccountStatementTransaction()
{
final DocumentType type = new DocumentType("Transaktionsbericht");
this.addDocumentTyp(type);

// @formatter:off
// 25.07.2023, 09:10 25.07.2023, 09:10 Einzahlung Genehmigt € 300,00 € 364,11
// @formatter:on
Block depositBlock = new Block("^[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} Einzahlung .*$");
type.addBlock(depositBlock);
depositBlock.set(new Transaction<AccountTransaction>()

.subject(() -> {
AccountTransaction accountTransaction = new AccountTransaction();
accountTransaction.setType(AccountTransaction.Type.DEPOSIT);
return accountTransaction;
})

.section("date", "currency", "amount") //
.match("^(?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}), [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} .*" //
+ "(?<currency>\\p{Sc}) (?<amount>[\\.,\\d]+) " //
+ "\\p{Sc} [\\.,\\d]+$") //
.assign((t, v) -> {
t.setDateTime(asDate(v.get("date")));
t.setCurrencyCode(asCurrencyCode(v.get("currency")));
t.setAmount(asAmount(v.get("amount")));
})

.wrap(TransactionItem::new));

// @formatter:off
// 02.02.2020, 00:10 03.02.2020, 17:59 Auszahlung Genehmigt (€ -51,70) € 51,72
// @formatter:on
Block removalBlock = new Block("^[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} Auszahlung .*$");
type.addBlock(removalBlock);
removalBlock.set(new Transaction<AccountTransaction>()

.subject(() -> {
AccountTransaction accountTransaction = new AccountTransaction();
accountTransaction.setType(AccountTransaction.Type.REMOVAL);
return accountTransaction;
})

.section("date", "currency", "amount") //
.match("^(?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}), [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} .*" //
+ "\\((?<currency>\\p{Sc}) \\-(?<amount>[\\.,\\d]+)\\) " //
+ "\\p{Sc} [\\.,\\d]+$") //
.assign((t, v) -> {
t.setDateTime(asDate(v.get("date")));
t.setCurrencyCode(asCurrencyCode(v.get("currency")));
t.setAmount(asAmount(v.get("amount")));
})

.wrap(TransactionItem::new));

// @formatter:off
// 21.06.2024, 03:00 21.06.2024, 06:00 Zins Genehmigt Entwicklungskredit - 2.Stufe € 0,42 € 6,50
// 23.04.2024, 03:00 24.04.2024, 06:00 Strafe Genehmigt Entwicklungskredit - 2.Stufe € 0,07 € 23,08
// 10.04.2024, 00:00 11.04.2024, 06:00 Entschädigung Genehmigt skredit - € 0,01 € 53,12
// @formatter:on
Block interestBlock = new Block(
"^[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} " //
+ "(Zins|Strafe|Entsch.digung).*$");
type.addBlock(interestBlock);
interestBlock.set(new Transaction<AccountTransaction>()

.subject(() -> {
AccountTransaction accountTransaction = new AccountTransaction();
accountTransaction.setType(AccountTransaction.Type.INTEREST);
return accountTransaction;
})

.section("date", "note", "currency", "amount") //
.match("^(?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}), [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} "
+ "(?<note>(Zins|Strafe|Entsch.digung)).*" //
+ "(?<currency>\\p{Sc}) (?<amount>[\\.,\\d]+) " //
+ "\\p{Sc} [\\.,\\d]+$") //
.assign((t, v) -> {
t.setDateTime(asDate(v.get("date")));
t.setCurrencyCode(asCurrencyCode(v.get("currency")));
t.setAmount(asAmount(v.get("amount")));
t.setNote(trim(v.get("note")));
})

.wrap(TransactionItem::new));

// @formatter:off
// 05.04.2024, 00:34 05.04.2024, 00:34 Vermögensverwaltungsgebühr Genehmigt (€ -0,61) € 63,00
// @formatter:on
Block feesBlock = new Block("^[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} Verm.gensverwaltungsgeb.hr.*$");
type.addBlock(feesBlock);
feesBlock.set(new Transaction<AccountTransaction>()

.subject(() -> {
AccountTransaction accountTransaction = new AccountTransaction();
accountTransaction.setType(AccountTransaction.Type.FEES);
return accountTransaction;
})

.section("date", "note", "currency", "amount") //
.match("^(?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}), [\\d]{2}:[\\d]{2} [\\d]{2}\\.[\\d]{2}\\.[\\d]{4}, [\\d]{2}:[\\d]{2} "
+ "(?<note>Verm.gensverwaltungsgeb.hr).*" //
+ "\\((?<currency>\\p{Sc}) \\-(?<amount>[\\.,\\d]+)\\) " //
+ "\\p{Sc} [\\.,\\d]+$") //
.assign((t, v) -> {
t.setDateTime(asDate(v.get("date")));
t.setCurrencyCode(asCurrencyCode(v.get("currency")));
t.setAmount(asAmount(v.get("amount")));
t.setNote(trim(v.get("note")));
})

.wrap(TransactionItem::new));
}
}
1 change: 1 addition & 0 deletions name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/PDFImportAssistant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public PDFImportAssistant(Client client, List<File> files)
extractors.add(new EasyBankAGPDFExtractor(client));
extractors.add(new EbasePDFExtractor(client));
extractors.add(new ErsteBankPDFExtractor(client));
extractors.add(new EstateGuruPDFExtractor(client));
extractors.add(new FidelityInternationalPDFExtractor(client));
extractors.add(new FILFondbankPDFExtractor(client));
extractors.add(new FindependentAGPDFExtractor(client));
Expand Down