Skip to content

Commit

Permalink
OpenConceptLab/ocl_issues#1183 | added parameters in swagger
Browse files Browse the repository at this point in the history
  • Loading branch information
snyaggarwal committed Jan 10, 2022
1 parent 614dd69 commit 8238470
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
11 changes: 10 additions & 1 deletion core/common/swagger_parameters.py
Expand Up @@ -5,7 +5,7 @@
INCLUDE_INVERSE_MAPPINGS_PARAM, UPDATED_SINCE_PARAM, INCLUDE_SOURCE_VERSIONS, INCLUDE_COLLECTION_VERSIONS, \
LAST_LOGIN_BEFORE_PARAM, LAST_LOGIN_SINCE_PARAM, DATE_JOINED_SINCE_PARAM, DATE_JOINED_BEFORE_PARAM, \
CASCADE_HIERARCHY_PARAM, CASCADE_METHOD_PARAM, MAP_TYPES_PARAM, EXCLUDE_MAP_TYPES_PARAM, CASCADE_MAPPINGS_PARAM, \
INCLUDE_MAPPINGS_PARAM, CASCADE_LEVELS_PARAM
INCLUDE_MAPPINGS_PARAM, CASCADE_LEVELS_PARAM, CASCADE_DIRECTION_PARAM
# HEADERS
from core.orgs.constants import NO_MEMBERS

Expand Down Expand Up @@ -144,3 +144,12 @@
cascade_levels_param = openapi.Parameter(
CASCADE_LEVELS_PARAM, openapi.IN_QUERY, type=openapi.TYPE_STRING, default='*', description='0, 1, 2...*'
)
cascade_direction_param = openapi.Parameter(
CASCADE_DIRECTION_PARAM, openapi.IN_QUERY, type=openapi.TYPE_BOOLEAN, default=False,
description='$cascade backward or up'
)
cascade_view_hierarchy = openapi.Parameter(
'view', openapi.IN_QUERY, type=openapi.TYPE_STRING, default='',
enum=['', 'hierarchy'],
description='Hierarchy (nested) or Flat Response'
)
5 changes: 5 additions & 0 deletions core/concepts/serializers.py
Expand Up @@ -299,6 +299,11 @@ class Meta:
fields = ConceptAbstractSerializer.Meta.fields + (
'id', 'name', 'type', 'url', 'version_url', 'entries', 'display_name')

def __init__(self, *args, **kwargs):
if 'mappings' in self.fields:
self.fields.pop('mappings', None)
super().__init__(*args, **kwargs)

def get_entries(self, obj):
result = []
if obj.cascaded_entries:
Expand Down
5 changes: 3 additions & 2 deletions core/concepts/views.py
Expand Up @@ -21,7 +21,7 @@
include_facets_header, updated_since_param, include_inverse_mappings_param, include_retired_param,
compress_header, include_source_versions_param, include_collection_versions_param, cascade_method_param,
cascade_map_types_params, cascade_exclude_map_types_params, cascade_hierarchy_param, cascade_mappings_param,
include_mappings_param, cascade_levels_param)
include_mappings_param, cascade_levels_param, cascade_direction_param, cascade_view_hierarchy)
from core.common.tasks import delete_concept, make_hierarchy
from core.common.utils import to_parent_uri_from_kwargs
from core.common.views import SourceChildCommonBaseView, SourceChildExtrasView, \
Expand Down Expand Up @@ -304,7 +304,8 @@ def get_object(self, queryset=None):
@swagger_auto_schema(
manual_parameters=[
cascade_method_param, cascade_map_types_params, cascade_exclude_map_types_params,
cascade_hierarchy_param, cascade_mappings_param, include_mappings_param, cascade_levels_param
cascade_hierarchy_param, cascade_mappings_param, include_mappings_param, cascade_levels_param,
cascade_direction_param, cascade_view_hierarchy
]
)
def get(self, request, **kwargs): # pylint: disable=unused-argument
Expand Down

0 comments on commit 8238470

Please sign in to comment.