login/logout/keep_alive resources created and implemented

tests fixed

betfairlightweight/endpoints/keepalive.py

@@ -1,6 +1,8 @@
+import datetime
 from requests import ConnectionError
 
 from .baseendpoint import BaseEndpoint
+from ..resources import KeepAliveResource
 from ..exceptions import KeepAliveError, APIError
 from ..utils import check_status_code
 
@@ -10,10 +12,11 @@ class KeepAlive(BaseEndpoint):
     _error = KeepAliveError
 
     def __call__(self, session=None):
+        date_time_sent = datetime.datetime.utcnow()
         response = self.request(session=session)
         response_json = response.json()
         self.client.set_session_token(response_json.get('token'))
-        return response_json
+        return self.process_response(response_json, KeepAliveResource, date_time_sent)
 
     def request(self, payload=None, params=None, session=None):
         session = session or self.client.session

betfairlightweight/endpoints/login.py

@@ -1,6 +1,8 @@
+import datetime
 from requests import ConnectionError
 
 from .baseendpoint import BaseEndpoint
+from ..resources import LoginResource
 from ..exceptions import LoginError, APIError
 from ..utils import check_status_code
 
@@ -10,10 +12,11 @@ class Login(BaseEndpoint):
     _error = LoginError
 
     def __call__(self, session=None):
+        date_time_sent = datetime.datetime.utcnow()
         response = self.request(self.url, session=session)
         response_json = response.json()
         self.client.set_session_token(response_json.get('sessionToken'))
-        return response_json
+        return self.process_response(response_json, LoginResource, date_time_sent)
 
     def request(self, method=None, params=None, session=None):
         session = session or self.client.session

betfairlightweight/endpoints/logout.py

@@ -1,6 +1,8 @@
+import datetime
 from requests import ConnectionError
 
 from .baseendpoint import BaseEndpoint
+from ..resources import LogoutResource
 from ..exceptions import LogoutError, APIError
 from ..utils import check_status_code
 
@@ -10,10 +12,11 @@ class Logout(BaseEndpoint):
     _error = LogoutError
 
     def __call__(self, session=None):
+        date_time_sent = datetime.datetime.utcnow()
         response = self.request(session=session)
         response_json = response.json()
         self.client.client_logout()
-        return response_json
+        return self.process_response(response_json, LogoutResource, date_time_sent)
 
     def request(self, payload=None, params=None, session=None):
         session = session or self.client.session

betfairlightweight/resources/__init__.py

@@ -1,3 +1,9 @@
+from .authresources import (
+    LoginResource,
+    KeepAliveResource,
+    LogoutResource,
+)
+
 from .bettingresources import (
     EventTypeResult,
     CompetitionResult,

betfairlightweight/resources/authresources.py

@@ -0,0 +1,32 @@
+from .baseresource import BaseResource
+
+
+class LoginResource(BaseResource):
+    class Meta(BaseResource.Meta):
+        identifier = 'login'
+        attributes = {
+            'sessionToken': 'session_token',
+            'loginStatus': 'login_status',
+        }
+
+
+class KeepAliveResource(BaseResource):
+    class Meta(BaseResource.Meta):
+        identifier = 'keep_alive'
+        attributes = {
+            'product': 'product',
+            'status': 'status',
+            'token': 'token',
+            'error': 'error',
+        }
+
+
+class LogoutResource(BaseResource):
+    class Meta(BaseResource.Meta):
+        identifier = 'logout'
+        attributes = {
+            'product': 'product',
+            'status': 'status',
+            'token': 'token',
+            'error': 'error',
+        }

tests/test_keepalive.py

@@ -6,6 +6,7 @@
 from betfairlightweight.endpoints.keepalive import KeepAlive, APIError
 from betfairlightweight import APIClient
 from betfairlightweight.exceptions import KeepAliveError
+from betfairlightweight.resources.authresources import KeepAliveResource
 
 
 class KeepAliveTest(unittest.TestCase):
@@ -20,7 +21,7 @@ def test_call(self, mock_response):
         mock_response.return_value = mock
         response = self.keep_alive()
 
-        assert response == mock.json()
+        assert isinstance(response, KeepAliveResource)
         assert self.keep_alive.client.session_token == mock.json().get('token')
 
     @mock.patch('betfairlightweight.baseclient.BaseClient.cert')

tests/test_login.py

@@ -6,6 +6,7 @@
 from betfairlightweight.endpoints.login import Login
 from betfairlightweight import APIClient
 from betfairlightweight.exceptions import LoginError, APIError
+from betfairlightweight.resources import LoginResource
 
 
 class LoginTest(unittest.TestCase):
@@ -20,7 +21,7 @@ def test_call(self, mock_response):
         mock_response.return_value = mock_json
         response = self.login()
 
-        assert response == mock_json.json()
+        assert isinstance(response, LoginResource)
         assert self.login.client.session_token == mock_json.json().get('sessionToken')
 
     @mock.patch('betfairlightweight.baseclient.BaseClient.cert')

tests/test_logout.py

@@ -6,6 +6,7 @@
 from betfairlightweight.endpoints.logout import Logout
 from betfairlightweight import APIClient
 from betfairlightweight.exceptions import LogoutError, APIError
+from betfairlightweight.resources import LogoutResource
 
 
 class LogoutTest(unittest.TestCase):
@@ -20,7 +21,7 @@ def test_call(self, mock_response):
         mock_response.return_value = mock
         response = self.logout()
 
-        assert response == mock.json()
+        assert isinstance(response, LogoutResource)
         assert self.logout.client.session_token is None
 
     @mock.patch('betfairlightweight.baseclient.BaseClient.cert')