Skip to content

refactor: add option to analyze query #82

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
whdalsrnt merged 1 commit into from
Sep 5, 2023
Merged

refactor: add option to analyze query #82

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
10 changes: 6 additions & 4 deletions src/spaceone/core/model/mongo_model/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,8 +1258,8 @@ def _make_date_filter(cls, date_field, key, operator):

@classmethod
def analyze(cls, *args, granularity=None, fields=None, select=None, group_by=None, field_group=None, filter=None,
filter_or=None, page=None, sort=None, start=None, end=None, date_field='date',
target='SECONDARY_PREFERRED', **kwargs):
filter_or=None, page=None, sort=None, start=None, end=None, date_field='date', start_field=None,
end_field=None, target='SECONDARY_PREFERRED', **kwargs):

if fields is None:
raise ERROR_REQUIRED_PARAMETER(key='fields')
Expand All @@ -1275,10 +1275,12 @@ def analyze(cls, *args, granularity=None, fields=None, select=None, group_by=Non
page_limit = page.get('limit')

if start:
filter += cls._make_date_filter(date_field, start, 'gte')
start_field = start_field or date_field
filter += cls._make_date_filter(start_field, start, 'gte')

if end:
filter += cls._make_date_filter(date_field, end, 'lte')
end_field = end_field or date_field
filter += cls._make_date_filter(end_field, end, 'lte')

group_keys = cls._make_group_keys(group_by, date_field, granularity)
group_fields = cls._make_group_fields(fields)
Expand Down