Skip to content

CPS-76 Accept rql.Query in BaseResource.list method #91

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

Merged
marcserrat merged 1 commit into from
Mar 23, 2020
Merged

CPS-76 Accept rql.Query in BaseResource.list method #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions connect/resources/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import functools
import logging
from typing import Any, List, Dict, Tuple
from typing import Any, List, Dict, Tuple, Union

import requests
from requests import compat
Expand All @@ -15,6 +15,7 @@
from connect.logger import function_log
from connect.models.base import BaseModel
from connect.models.server_error_response import ServerErrorResponse
from connect.rql import Query


class ApiClient(object):
Expand Down Expand Up @@ -158,8 +159,13 @@ def filters(self, **kwargs):
return filters

def list(self, filters=None):
# type: (Dict[str, Any]) -> List[Any]
# type: (Union[Query, Dict[str, Any]]) -> List[Any]
filters = filters or self.filters()
self.logger.info('Get list request with filters - {}'.format(filters))
response, _ = self._api.get(params=filters)
if isinstance(filters, Query):
compiled = filters.compile()
self.logger.info('Get list request with Query - {}'.format(compiled))
response, _ = ApiClient(self._api.config, self._api.base_path + compiled).get()
else:
self.logger.info('Get list request with filters - {}'.format(filters))
response, _ = self._api.get(params=filters)
return self.model_class.deserialize(response)