Add merge() method to Account

Author: andreagrandi

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Add delete() method to Account
 - Add move() method to Account
 - Add reorder() method to Account
+- Add merge() method to Account
 - Add proper testing for ToshlException
 - Improve string representation of ToshlException
 - refactoring: each entity is in a separate module

setup.py

@@ -4,7 +4,7 @@
     name='toshl',
     version='0.0.4',
     url='https://github.com/andreagrandi/toshl-python',
-    download_url='https://github.com/andreagrandi/toshl-python/tarball/0.0.3',
+    download_url='https://github.com/andreagrandi/toshl-python/tarball/0.0.4',
     author='Andrea Grandi',
     author_email='[email protected]',
     description='Python client library for Toshl API.',

tests/test_account.py

@@ -313,3 +313,32 @@ def test_reorder_account_successful(self, mock_request):
             params=None, url='https://api.toshl.com/accounts/reorder',
             json=json_payload)
         assert response.json() == ''
+
+    @mock.patch('toshl.client.requests.request')
+    def test_merge_account_successful(self, mock_request):
+        accounts_list = ['1', '2']
+        dest_account = '2'
+
+        json_payload = {
+            'accounts': accounts_list,
+            'account': dest_account
+        }
+
+        mock_response = mock.Mock()
+        mock_response.json.return_value = ''
+        mock_response.status_code = 204
+        mock_request.return_value = mock_response
+
+        client = ToshlClient('abcd1234')
+        account = Account(client)
+        response = account.merge(accounts_list, dest_account)
+
+        mock_request.assert_called_once_with(
+            headers={
+                'Authorization': 'Bearer abcd1234',
+                'Content-Type': 'application/json'
+            },
+            method='POST',
+            params=None, url='https://api.toshl.com/accounts/merge',
+            json=json_payload)
+        assert response.json() == ''

toshl/account.py

@@ -58,3 +58,12 @@ def reorder(self, accounts_list):
 
         return self.client._make_request(
             '/accounts/reorder', 'POST', json=json_payload)
+
+    def merge(self, accounts_list, dest_account):
+        json_payload = {
+            'accounts': accounts_list,
+            'account': dest_account
+        }
+
+        return self.client._make_request(
+            '/accounts/merge', 'POST', json=json_payload)