diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 1364108..1931979 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -942,7 +942,8 @@ class MyProductsService(BaseService): "error": f"File with ID {image_id} does not exist." }, 400 - if not product_data: + memberSubscription = MembersProducts.get_member_product_by_product_member_id(member_id, product_id) + if not memberSubscription: return { "message": "Please provide valid product_id", "error_message": "Error - Please select a valid product to view", @@ -954,52 +955,20 @@ class MyProductsService(BaseService): file_url = ( MyProductsService.MEDIA_SERVER + "/" + selectedFile.file_group + "/" + selectedFile.uid + "/" + selectedFile.filename).lower() - # result_file_list = MembersWebfiles.get_member_webfiles_by_member_id(member_id) - # file_list = [] - # if result_file_list: - # for t in result_file_list: - # file_list.append({ - # 'id': t.id, - # 'file_uid': t.uid, - # 'member_id': t.member_id, - # 'member_uid': t.member_uid, - # 'file_group': t.file_group, - # 'filename': t.filename, - # 'save_filename': t.save_filename, - # 'file_type': t.file_type, - # 'status': t.status, - # 'file_size': t.file_size, - # 'added': t.added.isoformat() if t.added else None, - # 'updated': t.updated.isoformat() if t.updated else None - # }) - # - # response_data = { - # "file_list": file_list, - # "media_server": settings.MEDIA_SERVER, - # } + product_subscription_uid = memberSubscription.uid - memberSubscription = MembersProducts.get_member_product_by_product_member_id(member_id, product_id) - - if memberSubscription is not None: - custom_template = "" if ( - memberSubscription.custom_template is None or len(memberSubscription.custom_template) - == 0) else memberSubscription.custom_template - - # logger.info(f"Incoming MyProduct data ==>>>> {memberSubscription}") - product_subscription_uid = memberSubscription.uid - - setting_value = file_url - subscription_uid = memberSubscription.uid - MembersProductsSettings.save_update_product_settings(member_id, subscription_uid, product_id, - image_id, - 'WEBFILE', setting_value) + setting_value = file_url + subscription_uid = memberSubscription.uid + MembersProductsSettings.save_update_product_settings(member_id, subscription_uid, product_id, + image_id, + 'WEBFILE', setting_value) # Simulate processing response_data = { "file_url": file_url, "product_id": product_id, "member_id": member_id, - "product_subscription_uid": str(product_subscription_uid), + "subscription_uid": str(product_subscription_uid), } return ResponseHelper.success(data=response_data)