From f1b6b3386a18f8cb93d446b8d40150075332d018 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 5 Feb 2016 21:10:55 +0100
Subject: [PATCH] Expanded entry for export.

---
 app/Export/Entry.php | 306 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 303 insertions(+), 3 deletions(-)

diff --git a/app/Export/Entry.php b/app/Export/Entry.php
index e5ffc32688..da30ec8444 100644
--- a/app/Export/Entry.php
+++ b/app/Export/Entry.php
@@ -10,6 +10,9 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Export;
 
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
 use FireflyIII\Models\TransactionJournal;
 
 /**
@@ -33,10 +36,38 @@ class Entry
 {
     /** @var  string */
     public $amount;
+    /** @var  int */
+    public $billId;
+    /** @var  string */
+    public $billName;
+    /** @var  int */
+    public $budgetId;
+    /** @var  string */
+    public $budgetName;
+    /** @var  int */
+    public $categoryId;
+    /** @var  string */
+    public $categoryName;
     /** @var  string */
     public $date;
     /** @var  string */
     public $description;
+    /** @var  string */
+    public $fromAccountIban;
+    /** @var  int */
+    public $fromAccountId;
+    /** @var  string */
+    public $fromAccountName;
+    /** @var  string */
+    public $fromAccountType;
+    /** @var  string */
+    public $toAccountIban;
+    /** @var  int */
+    public $toAccountId;
+    /** @var  string */
+    public $toAccountName;
+    /** @var  string */
+    public $toAccountType;
 
     /**
      * @param TransactionJournal $journal
@@ -51,6 +82,37 @@ class Entry
         $entry->setDate($journal->date->format('Y-m-d'));
         $entry->setAmount($journal->amount);
 
+        /** @var Budget $budget */
+        $budget = $journal->budgets->first();
+        if (!is_null($budget)) {
+            $entry->setBudgetId($budget->id);
+            $entry->setBudgetName($budget->name);
+        }
+
+        /** @var Category $category */
+        $category = $journal->categories->first();
+        if (!is_null($category)) {
+            $entry->setCategoryId($category->id);
+            $entry->setCategoryName($category->name);
+        }
+
+        if (!is_null($journal->bill_id)) {
+            $entry->setBillId($journal->bill_id);
+            $entry->setBillName($journal->bill->name);
+        }
+
+        /** @var Account $sourceAccount */
+        $sourceAccount = $journal->source_account;
+        $entry->setFromAccountId($sourceAccount->id);
+        $entry->setFromAccountName($sourceAccount->name);
+        $entry->setFromAccountType($sourceAccount->accountType->type);
+
+        /** @var Account $destination */
+        $destination = $journal->destination_account;
+        $entry->setToAccountId($destination->id);
+        $entry->setToAccountName($destination->name);
+        $entry->setToAccountType($destination->accountType->type);
+
         return $entry;
 
     }
@@ -63,9 +125,23 @@ class Entry
         // key = field name (see top of class)
         // value = field type (see csv.php under 'roles')
         return [
-            'amount'      => 'amount',
-            'date'        => 'date-transaction',
-            'description' => 'description',
+            'amount'          => 'amount',
+            'date'            => 'date-transaction',
+            'description'     => 'description',
+            'billId'          => 'bill-id',
+            'billName'        => 'bill-name',
+            'budgetId'        => 'budget-id',
+            'budgetName'      => 'budget-name',
+            'categoryId'      => 'category-id',
+            'categoryName'    => 'category-name',
+            'fromAccountId'   => 'account-id',
+            'fromAccountName' => 'account-name',
+            'fromAccountIban' => 'account-iban',
+            'fromAccountType' => '_ignore',
+            'toAccountId'     => 'opposing-id',
+            'toAccountName'   => 'opposing-name',
+            'toAccountIban'   => 'opposing-iban',
+            'toAccountType'   => '_ignore',
         ];
     }
 
@@ -85,6 +161,102 @@ class Entry
         $this->amount = $amount;
     }
 
+    /**
+     * @return int
+     */
+    public function getBillId()
+    {
+        return $this->billId;
+    }
+
+    /**
+     * @param int $billId
+     */
+    public function setBillId($billId)
+    {
+        $this->billId = $billId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillName()
+    {
+        return $this->billName;
+    }
+
+    /**
+     * @param string $billName
+     */
+    public function setBillName($billName)
+    {
+        $this->billName = $billName;
+    }
+
+    /**
+     * @return int
+     */
+    public function getBudgetId()
+    {
+        return $this->budgetId;
+    }
+
+    /**
+     * @param int $budgetId
+     */
+    public function setBudgetId($budgetId)
+    {
+        $this->budgetId = $budgetId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBudgetName()
+    {
+        return $this->budgetName;
+    }
+
+    /**
+     * @param string $budgetName
+     */
+    public function setBudgetName($budgetName)
+    {
+        $this->budgetName = $budgetName;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCategoryId()
+    {
+        return $this->categoryId;
+    }
+
+    /**
+     * @param int $categoryId
+     */
+    public function setCategoryId($categoryId)
+    {
+        $this->categoryId = $categoryId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCategoryName()
+    {
+        return $this->categoryName;
+    }
+
+    /**
+     * @param string $categoryName
+     */
+    public function setCategoryName($categoryName)
+    {
+        $this->categoryName = $categoryName;
+    }
+
     /**
      * @return string
      */
@@ -117,5 +289,133 @@ class Entry
         $this->description = $description;
     }
 
+    /**
+     * @return string
+     */
+    public function getFromAccountIban()
+    {
+        return $this->fromAccountIban;
+    }
+
+    /**
+     * @param string $fromAccountIban
+     */
+    public function setFromAccountIban($fromAccountIban)
+    {
+        $this->fromAccountIban = $fromAccountIban;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFromAccountId()
+    {
+        return $this->fromAccountId;
+    }
+
+    /**
+     * @param int $fromAccountId
+     */
+    public function setFromAccountId($fromAccountId)
+    {
+        $this->fromAccountId = $fromAccountId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFromAccountName()
+    {
+        return $this->fromAccountName;
+    }
+
+    /**
+     * @param string $fromAccountName
+     */
+    public function setFromAccountName($fromAccountName)
+    {
+        $this->fromAccountName = $fromAccountName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFromAccountType()
+    {
+        return $this->fromAccountType;
+    }
+
+    /**
+     * @param string $fromAccountType
+     */
+    public function setFromAccountType($fromAccountType)
+    {
+        $this->fromAccountType = $fromAccountType;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToAccountIban()
+    {
+        return $this->toAccountIban;
+    }
+
+    /**
+     * @param string $toAccountIban
+     */
+    public function setToAccountIban($toAccountIban)
+    {
+        $this->toAccountIban = $toAccountIban;
+    }
+
+    /**
+     * @return int
+     */
+    public function getToAccountId()
+    {
+        return $this->toAccountId;
+    }
+
+    /**
+     * @param int $toAccountId
+     */
+    public function setToAccountId($toAccountId)
+    {
+        $this->toAccountId = $toAccountId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToAccountName()
+    {
+        return $this->toAccountName;
+    }
+
+    /**
+     * @param string $toAccountName
+     */
+    public function setToAccountName($toAccountName)
+    {
+        $this->toAccountName = $toAccountName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToAccountType()
+    {
+        return $this->toAccountType;
+    }
+
+    /**
+     * @param string $toAccountType
+     */
+    public function setToAccountType($toAccountType)
+    {
+        $this->toAccountType = $toAccountType;
+    }
+
 
 }
\ No newline at end of file