From a146c5bf7820402470440620eae26f4f145743e8 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sat, 11 May 2019 13:31:48 +0200
Subject: [PATCH] Improve jsonification

---
 freqtrade/rpc/api_server.py               |  5 +++++
 freqtrade/tests/rpc/test_rpc_apiserver.py | 22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/freqtrade/rpc/api_server.py b/freqtrade/rpc/api_server.py
index 573f89143..4ddda307a 100644
--- a/freqtrade/rpc/api_server.py
+++ b/freqtrade/rpc/api_server.py
@@ -1,5 +1,6 @@
 import logging
 import threading
+from datetime import datetime, date
 from ipaddress import IPv4Address
 from typing import Dict
 
@@ -18,6 +19,10 @@ class ArrowJSONEncoder(JSONEncoder):
         try:
             if isinstance(obj, Arrow):
                 return obj.for_json()
+            elif isinstance(obj, date):
+                return obj.strftime("%Y-%m-%d")
+            elif isinstance(obj, datetime):
+                return obj.strftime("%Y-%m-%d %H:%M:%S")
             iterable = iter(obj)
         except TypeError:
             pass
diff --git a/freqtrade/tests/rpc/test_rpc_apiserver.py b/freqtrade/tests/rpc/test_rpc_apiserver.py
index 52a456d68..cefbb9acd 100644
--- a/freqtrade/tests/rpc/test_rpc_apiserver.py
+++ b/freqtrade/tests/rpc/test_rpc_apiserver.py
@@ -2,6 +2,7 @@
 Unit test file for rpc/api_server.py
 """
 
+from datetime import datetime
 from unittest.mock import MagicMock, PropertyMock
 
 import pytest
@@ -9,12 +10,13 @@ import pytest
 from freqtrade.__init__ import __version__
 from freqtrade.rpc.api_server import ApiServer
 from freqtrade.state import State
-from freqtrade.tests.conftest import get_patched_freqtradebot, patch_apiserver, patch_get_signal
+from freqtrade.tests.conftest import (get_patched_freqtradebot,
+                                      patch_apiserver, patch_get_signal)
 
 
 @pytest.fixture
 def botclient(default_conf, mocker):
-    default_conf.update({"api_server":{"enabled": True,
+    default_conf.update({"api_server": {"enabled": True,
                                        "listen_ip_address": "127.0.0.1",
                                        "listen_port": "8080"}})
     ftbot = get_patched_freqtradebot(mocker, default_conf)
@@ -163,3 +165,19 @@ def test_api_count(botclient, mocker, ticker, fee, markets):
     response_success_assert(rc)
     assert rc.json["current"] == 1.0
     assert rc.json["max"] == 1.0
+
+
+def test_api_daily(botclient, mocker, ticker, fee, markets):
+    ftbot, client = botclient
+    patch_get_signal(ftbot, (True, False))
+    mocker.patch.multiple(
+        'freqtrade.exchange.Exchange',
+        get_balances=MagicMock(return_value=ticker),
+        get_ticker=ticker,
+        get_fee=fee,
+        markets=PropertyMock(return_value=markets)
+    )
+    rc = client.get("/daily")
+    response_success_assert(rc)
+    assert len(rc.json) == 7
+    assert rc.json[0][0] == str(datetime.utcnow().date())