From 31d271084fe78f29a2358d719a95fb8e4e119128 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Mon, 6 May 2019 06:55:12 +0200
Subject: [PATCH] Move json to persistence

---
 freqtrade/persistence.py  | 12 ++++++++----
 freqtrade/rpc/telegram.py |  5 +----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/freqtrade/persistence.py b/freqtrade/persistence.py
index d25ea9fed..6088dba72 100644
--- a/freqtrade/persistence.py
+++ b/freqtrade/persistence.py
@@ -214,11 +214,15 @@ class Trade(_DECL_BASE):
                 f'open_rate={self.open_rate:.8f}, open_since={open_since})')
 
     def to_json(self) -> Dict[str, Any]:
-
         return {
             'trade_id': self.id,
             'pair': self.pair,
-            'date': arrow.get(self.open_date),
+            'open_date_hum': arrow.get(self.open_date).humanize(),
+            'open_date': self.open_date.strftime("%Y-%m-%d %H:%M:%S"),
+            'close_date_hum': (arrow.get(self.close_date).humanize()
+                               if self.close_date else None),
+            'close_date': (self.close_date.strftime("%Y-%m-%d %H:%M:%S")
+                           if self.close_date else None),
             'open_rate': self.open_rate,
             'close_rate': self.close_rate,
             'amount': round(self.amount, 8),
@@ -226,8 +230,8 @@ class Trade(_DECL_BASE):
             'stop_loss': self.stop_loss,
             'stop_loss_pct': (self.stop_loss_pct * 100) if self.stop_loss_pct else None,
             'initial_stop_loss': self.initial_stop_loss,
-            'initial_stop_loss_pct': (self.initial_stop_loss_pct * 100)
-            if self.initial_stop_loss_pct else None,
+            'initial_stop_loss_pct': (self.initial_stop_loss_pct * 100
+                                      if self.initial_stop_loss_pct else None),
         }
 
     def adjust_min_max_rates(self, current_price: float):
diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index dc0bad2b2..497c117ac 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -193,14 +193,11 @@ class Telegram(RPC):
 
         try:
             results = self._rpc_trade_status()
-            # pre format data
-            for result in results:
-                result['date'] = result['date'].humanize()
 
             messages = []
             for r in results:
                 lines = [
-                    "*Trade ID:* `{trade_id}` `(since {date})`",
+                    "*Trade ID:* `{trade_id}` `(since {open_date_hum})`",
                     "*Current Pair:* {pair}",
                     "*Amount:* `{amount} ({stake_amount} {base_currency})`",
                     "*Open Rate:* `{open_rate:.8f}`",