Merge pull request #16 from uc-cdis/fix/get-params

Fix/get params

indexclient/client.py

@@ -5,7 +5,7 @@
     from urllib.parse import urljoin
 
 import requests
-
+import copy
 
 UPDATABLE_ATTRS = ['file_name', 'urls', 'version']
 
@@ -90,8 +90,20 @@ def get_with_params(self, params=None):
         Return a document object corresponding to the supplied parameters, such
         as ``{'hashes': {'md5': '...', 'size': '...'}}``.
         """
+        # need to include all the hashes in the request
+        # index client like signpost or indexd will need to handle the
+        # query param `'hash': 'hash_type:hash'`
+        params_copy = copy.deepcopy(params)
+        reformatted_params = dict()
+        if 'hashes' in params_copy:
+            reformatted_params['hash'] = []
+            for hash_type, hash in params_copy['hashes'].items():
+                reformatted_params['hash'].append(str(hash_type) + ':' + str(hash))
+            del params_copy['hashes']
+        reformatted_params.update(params_copy)
+
         try:
-            response = self._get("index", params=params)
+            response = self._get('index', params=reformatted_params)
         except requests.HTTPError as e:
             if e.response.status_code == 404:
                 return None

test-requirements.txt

@@ -1,4 +1,5 @@
 pytest==3.0.6
+mock
 -e git+https://github.com/uc-cdis/[email protected]#egg=cdisutilstest
 -e git+https://github.com/uc-cdis/[email protected]#egg=cdispyutils
 -e git+https://github.com/uc-cdis/[email protected]#egg=indexd

tests/test_import.py

@@ -1,5 +1,39 @@
+# Python 2 and 3 compatible
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
+
 def test_import_index():
     '''
     Try to import the index package.
     '''
     import indexclient
+
+
+@patch("indexclient.client.handle_error")
+@patch("requests.get")
+def test_hashes(get_request_mock, handle_error_mock):
+    from indexclient.client import IndexClient
+    input_params = {
+        'hashes': {
+            'md5': '00000000000000000000000000000001'
+        },
+        'size': '1'
+    }
+
+    expected_format =  {
+        'hash': [
+            'md5:00000000000000000000000000000001'
+        ],
+        'size': '1'
+    }
+
+    with patch("indexclient.client.IndexClient._get") as get_mock:
+        client = IndexClient('base_url')
+        client.get_with_params(input_params)
+
+        assert get_mock.called
+        args, kwargs = get_mock.call_args_list[0]
+        assert kwargs['params'] == expected_format