Skip to content
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

Jump to bottom

get_orders_by_path formats HTTP request with datetimes while TDA expects dates #177

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

get_orders_by_path formats HTTP request with datetimes while TDA expects dates #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79b090f
get_orders_by_path uses datetimes while expecting dates
silasb Feb 20, 2021
9f1a901
Getting tests to pass
silasb Feb 20, 2021
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
8 changes: 4 additions & 4 deletions tda/client/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,15 @@ def _make_order_query(self,
raise ValueError('at most one of status or statuses may be set')

if from_entered_datetime is None:
from_entered_datetime = datetime.datetime(
year=1900, month=1, day=1)
today = datetime.datetime.utcnow()
from_entered_datetime = today + datetime.timedelta(days=-60)
if to_entered_datetime is None:
to_entered_datetime = datetime.datetime.utcnow()

params = {
'fromEnteredTime': self._format_datetime(
'fromEnteredTime': self._format_date(
'from_entered_datetime', from_entered_datetime),
'toEnteredTime': self._format_datetime(
'toEnteredTime': self._format_date(
'to_entered_datetime', to_entered_datetime),
}

Expand Down
43 changes: 21 additions & 22 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@
TRANSACTION_ID = 400000
WATCHLIST_ID = 5000000

MIN_ISO = '1900-01-01T00:00:00+0000'

NOW_DATETIME = datetime.datetime(2020, 1, 2, 3, 4, 5)
NOW_DATE = datetime.date(2020, 1, 2)
MIN_ISO = (NOW_DATE + datetime.timedelta(days=-60)).isoformat()
NOW_DATETIME_ISO = '2020-01-02T03:04:05+0000'
NOW_DATE_ISO = '2020-01-02'

Expand All @@ -42,7 +41,7 @@ def utcnow(cls):

EARLIER_DATETIME = datetime.datetime(2001, 1, 2, 3, 4, 5,
tzinfo=pytz.timezone('America/New_York'))
EARLIER_ISO = '2001-01-02T03:04:05-0456'
EARLIER_ISO = '2001-01-02'
EARLIER_MILLIS = 978422405000
EARLIER_DATE_STR = '2001-01-02'

Expand Down Expand Up @@ -104,7 +103,7 @@ def test_get_orders_by_path_vanilla(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO
'toEnteredTime': NOW_DATE_ISO
})


Expand All @@ -114,7 +113,7 @@ def test_get_orders_by_path_vanilla_str(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO
'toEnteredTime': NOW_DATE_ISO
})


Expand All @@ -124,7 +123,7 @@ def test_get_orders_by_path_from_not_datetime(self):
self.client.get_orders_by_path(
ACCOUNT_ID, from_entered_datetime='2020-01-01')
self.assertEqual(str(cm.exception),
"expected type 'datetime.datetime' for " +
"expected type in (datetime.date, datetime.datetime) for " +
"from_entered_datetime, got 'builtins.str'")


Expand All @@ -134,7 +133,7 @@ def test_get_orders_by_path_to_not_datetime(self):
self.client.get_orders_by_path(
ACCOUNT_ID, to_entered_datetime='2020-01-01')
self.assertEqual(str(cm.exception),
"expected type 'datetime.datetime' for " +
"expected type in (datetime.date, datetime.datetime) for " +
"to_entered_datetime, got 'builtins.str'")


Expand All @@ -144,7 +143,7 @@ def test_get_orders_by_path_max_results(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'maxResults': 100,
})

Expand All @@ -156,7 +155,7 @@ def test_get_orders_by_path_from_entered_datetime(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': EARLIER_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
})


Expand Down Expand Up @@ -185,7 +184,7 @@ def test_get_orders_by_path_status(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED'
})

Expand All @@ -197,7 +196,7 @@ def test_get_orders_by_path_status_unchecked(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED'
})

Expand All @@ -211,7 +210,7 @@ def test_get_orders_by_path_statuses(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED,EXPIRED'
})

Expand All @@ -223,7 +222,7 @@ def test_get_orders_by_path_statuses_scalar(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED'
})

Expand All @@ -236,7 +235,7 @@ def test_get_orders_by_path_statuses_unchecked(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/accounts/{accountId}/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED,EXPIRED'
})

Expand All @@ -249,7 +248,7 @@ def test_get_orders_by_query_vanilla(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO
'toEnteredTime': NOW_DATE_ISO
})


Expand All @@ -259,7 +258,7 @@ def test_get_orders_by_query_max_results(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'maxResults': 100,
})

Expand All @@ -270,7 +269,7 @@ def test_get_orders_by_query_from_entered_datetime(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': EARLIER_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
})


Expand Down Expand Up @@ -301,7 +300,7 @@ def test_get_orders_by_query_status(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED'
})

Expand All @@ -313,7 +312,7 @@ def test_get_orders_by_query_status_unchecked(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED'
})

Expand All @@ -326,7 +325,7 @@ def test_get_orders_by_query_statuses(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED,EXPIRED'
})

Expand All @@ -337,7 +336,7 @@ def test_get_orders_by_query_statuses_scalar(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED'
})

Expand All @@ -349,7 +348,7 @@ def test_get_orders_by_query_statuses_unchecked(self):
self.mock_session.get.assert_called_once_with(
self.make_url('/v1/orders'), params={
'fromEnteredTime': MIN_ISO,
'toEnteredTime': NOW_DATETIME_ISO,
'toEnteredTime': NOW_DATE_ISO,
'status': 'FILLED,EXPIRED'
})

Expand Down