From 22391090276aae28987da71f6a463ffe7e6c78fc Mon Sep 17 00:00:00 2001 From: Chris Veilleux Date: Fri, 24 May 2019 16:22:06 -0500 Subject: [PATCH] pass one instance of AccountSkillSettings instead of a list --- .../tests/features/steps/device_skills.py | 4 ++-- .../selene/data/skill/repository/setting.py | 21 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/api/public/tests/features/steps/device_skills.py b/api/public/tests/features/steps/device_skills.py index a28e1bf5..d46a1407 100644 --- a/api/public/tests/features/steps/device_skills.py +++ b/api/public/tests/features/steps/device_skills.py @@ -101,12 +101,12 @@ def create_skill_settings(context): @when('the skill settings are updated') def update_skill(context): response = json.loads(context.upload_device_response.data) - update_settings = [AccountSkillSetting( + update_settings = AccountSkillSetting( skill_id=response['uuid'], settings_display={}, settings_values=new_settings, devices=[context.device_name] - )] + ) db = connect_to_db(context.client_config['DB_CONNECTION_CONFIG']) skill_setting_repo = SkillSettingRepository(db, context.account.id) skill_setting_repo.update_skill_settings(update_settings) diff --git a/shared/selene/data/skill/repository/setting.py b/shared/selene/data/skill/repository/setting.py index a02c4603..b95407d2 100644 --- a/shared/selene/data/skill/repository/setting.py +++ b/shared/selene/data/skill/repository/setting.py @@ -49,15 +49,14 @@ class SkillSettingRepository(RepositoryBase): return skill_settings @use_transaction - def update_skill_settings(self, skill_settings: List[AccountSkillSetting]): - for settings_group in skill_settings: - db_request = self._build_db_request( - 'update_device_skill_settings.sql', - args=dict( - account_id=self.account_id, - settings_values=json.dumps(settings_group.settings_values), - skill_id=settings_group.skill_id, - device_names=tuple(settings_group.devices) - ) + def update_skill_settings(self, new_skill_settings: AccountSkillSetting): + db_request = self._build_db_request( + 'update_device_skill_settings.sql', + args=dict( + account_id=self.account_id, + settings_values=json.dumps(new_skill_settings.settings_values), + skill_id=new_skill_settings.skill_id, + device_names=tuple(new_skill_settings.devices) ) - self.cursor.update(db_request) + ) + self.cursor.update(db_request)