Improved handling of inbound and outbound transfers in CSV importer

portfolio-performance · Jul 17, 2016 · 2890208 · 2890208
1 parent 65c9317
commit 2890208
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/Extractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/Extractor.java
@@ -177,10 +177,12 @@ public Status apply(ImportAction action, Context context)
     static class AccountTransferItem extends Item
     {
         private final AccountTransferEntry entry;
+        private final boolean isOutbound;
 
-        public AccountTransferItem(AccountTransferEntry entry)
+        public AccountTransferItem(AccountTransferEntry entry, boolean isOutbound)
         {
             this.entry = entry;
+            this.isOutbound = isOutbound;
         }
 
         @Override
@@ -192,7 +194,8 @@ public Annotated getSubject()
         @Override
         public String getTypeInformation()
         {
-            return Messages.LabelTransferAccount;
+            return isOutbound ? PortfolioTransaction.Type.TRANSFER_OUT.toString()
+                            : PortfolioTransaction.Type.TRANSFER_IN.toString();
         }
 
         @Override
@@ -216,7 +219,10 @@ public Security getSecurity()
         @Override
         public Status apply(ImportAction action, Context context)
         {
-            return action.process(entry, context.getAccount(), context.getSecondaryAccount());
+            if (isOutbound)
+                return action.process(entry, context.getAccount(), context.getSecondaryAccount());
+            else
+                return action.process(entry, context.getSecondaryAccount(), context.getAccount());
         }
     }
 

diff --git a/...portfolio/src/name/abuchen/portfolio/datatransfer/csv/CSVAccountTransactionExtractor.java b/...portfolio/src/name/abuchen/portfolio/datatransfer/csv/CSVAccountTransactionExtractor.java
@@ -73,7 +73,7 @@ void extract(List<Item> items, String[] rawValues, Map<String, Column> field2col
                 entry.setCurrencyCode(amount.getCurrencyCode());
                 entry.setDate(date);
                 entry.setNote(note);
-                items.add(new AccountTransferItem(entry));
+                items.add(new AccountTransferItem(entry, type == Type.TRANSFER_OUT));
                 break;
             case BUY:
             case SELL: