From c41e46213a60bc928909dcbdeff24a5682c759f3 Mon Sep 17 00:00:00 2001 From: Matheus Lima Date: Wed, 29 May 2019 13:43:02 -0300 Subject: [PATCH] Moving conversion from the repository to the endpoint class --- api/account/account_api/endpoints/skill_settings.py | 6 +++++- shared/selene/data/skill/repository/setting.py | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/api/account/account_api/endpoints/skill_settings.py b/api/account/account_api/endpoints/skill_settings.py index ab67e1c3..747184b0 100644 --- a/api/account/account_api/endpoints/skill_settings.py +++ b/api/account/account_api/endpoints/skill_settings.py @@ -38,6 +38,7 @@ class SkillSettingsEndpoint(SeleneEndpoint): def get(self, skill_id): self._authenticate() skill_settings = self._get_skill_settings(skill_id) + # The response object is manually built here to bypass the camel case conversion return Response(response=json.dumps(skill_settings), status=HTTPStatus.OK, content_type='application_json') @property @@ -52,8 +53,11 @@ class SkillSettingsEndpoint(SeleneEndpoint): def _get_skill_settings(self, skill_id: str): skill_settings = self.setting_repository.get_skill_settings(skill_id) + skill_settings = list(map(lambda setting: { + 'settingsDisplay': setting['settings_display'], + 'settingsValues': setting['settings_values'], + 'devices': setting['devices']}, skill_settings)) _parse_selection_options(skill_settings) - return skill_settings def put(self, skill_id): diff --git a/shared/selene/data/skill/repository/setting.py b/shared/selene/data/skill/repository/setting.py index 7a9dae69..6719de7d 100644 --- a/shared/selene/data/skill/repository/setting.py +++ b/shared/selene/data/skill/repository/setting.py @@ -25,8 +25,9 @@ class SkillSettingRepository(RepositoryBase): settings_display = row['settings_display']['skillMetadata'] skill_settings.append( dict( - settingsDisplay=settings_display, - settingsValues=row['settings_values'], + skill_id=skill_id, + settings_display=settings_display, + settings_values=row['settings_values'], devices=row['devices'] ) )