diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 23b823a..1394f66 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -877,17 +877,14 @@ class MyProductsService(BaseService): memberSubscription.provision_port, selected_flavor) - web_files_list = MembersWebfiles.get_member_webfiles_by_member_file_group(member_id, "WEBFILES") + web_files_list = MembersProductsSettings.get_member_websettings_by_member_setting_type(member_id, "WEBFILES") # Simulate processing response_data = { - "settings_items": settings_items, "product_id": product_id, - "member_id": member_id, "subscription_template": str(subscription_template), "template_name": str(template_name), "product_subscription_uid": str(product_subscription_uid), - "blog_connect": str(blogConnect), "template_images": template_images } diff --git a/app/models/members_products_settings.py b/app/models/members_products_settings.py index 79e41dd..70d8827 100644 --- a/app/models/members_products_settings.py +++ b/app/models/members_products_settings.py @@ -98,6 +98,14 @@ class MembersProductsSettings(db.Model): update_p.setting_value = setting_value return + @classmethod + def get_member_websettings_by_member_setting_type(cls, member_id , setting_type): + setting_type_list = cls.query.filter_by(member_id=str(member_id), setting_type=str(setting_type)).all() + + if not setting_type_list: + return None + return setting_type_list + @classmethod def save_update_product_settings(cls, member_id,subscription_uid,product_id,settings_key,setting_type,setting_value ): diff --git a/app/models/members_webfiles.py b/app/models/members_webfiles.py index d467d08..2b9e43c 100644 --- a/app/models/members_webfiles.py +++ b/app/models/members_webfiles.py @@ -84,13 +84,13 @@ class MembersWebfiles(db.Model): return None return member_webfile - @classmethod - def get_member_webfiles_by_member_file_group(cls, member_id , file_group): - member_webfile = cls.query.filter_by(member_id=str(member_id), file_group=str(file_group)).first() - - if not member_webfile: - return None - return member_webfile + # @classmethod + # def get_member_webfiles_by_member_file_group(cls, member_id , file_group): + # member_webfile = cls.query.filter_by(member_id=str(member_id), web_files_list=str(file_group)).all() + # + # if not member_webfile: + # return None + # return member_webfile @classmethod def get_all_webfiles(cls, file_group=None, member_id=None, page=1, limit=20):