diff --git a/app/api/services/account.py b/app/api/services/account.py index 879e622..0a5779c 100644 --- a/app/api/services/account.py +++ b/app/api/services/account.py @@ -224,7 +224,7 @@ class AccountService(BaseService): introduction = str(validated_data.get('introduction')) url_name = str(validated_data.get('url_name')) - #verify is anybody is using this url name + # verify is anybody is using this url name urlNammeData = MembersProfile.get_any_member_profile_by_url_name(url_name) if urlNammeData: return { @@ -255,7 +255,7 @@ class AccountService(BaseService): profile_completed = member.profile_completed else: profile_result = MembersProfile.create_member_profile(member.id, practice, specialization, - introduction,url_name) + introduction, url_name) if profile_result: profile_uid = profile_result.uid @@ -303,11 +303,10 @@ class AccountService(BaseService): "uid": uid, }, 400 - member_id = member.id dList = [] - #LET get the ptovison actions + # LET get the ptovison actions prov_actions = ProvisionActions.get_provision_action_calendar_member_id(member_id=member_id, limit=100) if prov_actions: for prov_action in prov_actions: @@ -316,7 +315,8 @@ class AccountService(BaseService): "category": 3} dList.append(new_l) - member_actions = MembersActions.get_recent_member_calendar_actions_member_id(member_id=member_id, limit=100) + member_actions = MembersActions.get_recent_member_calendar_actions_member_id(member_id=member_id, + limit=100) if member_actions: for member_action in member_actions: new_l = {"uid": member_action.uid, @@ -444,6 +444,7 @@ class AccountService(BaseService): "email": member_data.email, "phone": member_data.phone, "full_address": member_data.full_address, + "picture": 'https://media.mermsemr.com/media/show/merms-profile', "country": member_data.country, } @@ -504,11 +505,9 @@ class AccountService(BaseService): "full_address": full_address, # "email": email, } - Members.set_member_update_profile(uid,profile_data) + Members.set_member_update_profile(uid, profile_data) - - - #Read the saved data + # Read the saved data member_data = Members.get_member_by_uid(uid) personal_data = { "firstname": member_data.firstname, @@ -552,7 +551,6 @@ class AccountService(BaseService): db.session.rollback() return ResponseHelper.internal_server_error() - @staticmethod def process_test_email(data): logger.info(f"Email Test Enter", exc_info=True) @@ -643,7 +641,6 @@ class AccountService(BaseService): finally: server.quit() # Close the connection - # @staticmethod # def get_profile_data(data): # diff --git a/app/api/services/login.py b/app/api/services/login.py index e35e856..316fc3a 100644 --- a/app/api/services/login.py +++ b/app/api/services/login.py @@ -5,7 +5,7 @@ from app.utils.logger import logger from app.api.services.base_service import BaseService from marshmallow import ValidationError from app.extensions import db -from app.models import PasswordReset, Members +from app.models import PasswordReset, Members from app.api.helpers.response_helper import ResponseHelper from werkzeug.security import generate_password_hash, check_password_hash from app.api.schemas.login import LoginSchema @@ -37,8 +37,8 @@ class LoginService(BaseService): } return ResponseHelper.success(data=invalid_data) reset_data = PasswordReset.create_reset(username=username) - BaseService.send_resetpass_mail(member.email, str(reset_data.uid), reset_data.id, member.firstname,member.lastname) #pending_uid, pending_id, firstname, lastname - + BaseService.send_resetpass_mail(member.email, str(reset_data.uid), reset_data.id, member.firstname, + member.lastname) # pending_uid, pending_id, firstname, lastname response_data = { "error_message": "", @@ -72,7 +72,7 @@ class LoginService(BaseService): validated_data = LoginService.validate_data(data, ResetPassVerify()) reset_token = validated_data.get('reset_token') logger.error("GOT HERE 000001 ") - data ={} + data = {} if not reset_token: return jsonify({'message': 'Error - missing reset_token '}), 403 try: @@ -91,7 +91,7 @@ class LoginService(BaseService): user_data = data["user"] reset_data = PasswordReset.get_rest_with_uid(user_data["pending_uid"]) logger.error(f"GOT HERE 000003 {reset_data} id = {reset_data.id}") - if reset_data.status> 0: + if reset_data.status > 0: invalid_data = { "error_message": "The link is invalid please try again later", "reset_message": "", @@ -99,7 +99,7 @@ class LoginService(BaseService): } return ResponseHelper.success(data=invalid_data) - PasswordReset.update_status(reset_data.id, reset_data.status+1) + PasswordReset.update_status(reset_data.id, reset_data.status + 1) response_data = { "error_message": "", @@ -138,7 +138,7 @@ class LoginService(BaseService): new_password = validated_data.get('new_password') logger.info("GOT HERE 000001 ") - data ={} + data = {} if not reset_token: return jsonify({'message': 'Error - missing reset_token '}), 403 try: @@ -161,7 +161,6 @@ class LoginService(BaseService): logger.info(f"GOT HERE RESET DATA id = {reset_data.id}") PasswordReset.update_status(reset_data.id, reset_data.status + 1) - username = reset_data.username member = Members.get_member_by_username(username) @@ -177,7 +176,7 @@ class LoginService(BaseService): Members.update_user_password(reset_data.id, member.uid, member.id, encrypted_pass) # update_user_passowrd(cls, reset_id, member_uid, member_id, new_passwprd_hash) BaseService.send_completepass_mail(member.email, str(reset_data.uid), reset_data.id, member.firstname, - member.lastname) # pending_uid, pending_id, firstname, lastname + member.lastname) # pending_uid, pending_id, firstname, lastname response_data = { "error_message": "", @@ -222,7 +221,7 @@ class LoginService(BaseService): } return ResponseHelper.success(data=invalid_data) - pass_check = check_password_hash(member.password, password) + pass_check = check_password_hash(member.password, password) logger.info("Password check: {}".format(pass_check)) if not member or not pass_check: invalid_data = { @@ -236,41 +235,41 @@ class LoginService(BaseService): user_data = {} user_data["id"] = member.id, - user_data["member_id"]= member.id, + user_data["member_id"] = member.id, user_data["uid"] = str(member.uid), user_token = jwt.encode( - {"user": user_data, 'exp' : datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)}, - Config.JWT_SECRET_KEY, - algorithm="HS256" - ) + {"user": user_data, 'exp': datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)}, + Config.JWT_SECRET_KEY, + algorithm="HS256" + ) # price_create_result = StripeIntegration.create_product('AmeyeTEST', 9999) # logger.info(f"Inside Stripe_Product ===== : {price_create_result}") # Simulate processing response_data = { "member_id": member.id, - "uid": str(member.uid), + "uid": str(member.uid), "username": member.username, "account_name": member.account_name, - "firstname":member.firstname, + "firstname": member.firstname, "lastname": member.lastname, - "room": member.uid, + "room": member.uid, "profile_completed": member.profile_completed, + "picture": 'https://media.mermsemr.com/media/show/merms-profile', "token": user_token } padded_member_id = str(member.id).zfill(6) customer_data = { - "email":"support+" + padded_member_id + "@chiefsoft.com", + "email": "support+" + padded_member_id + "@chiefsoft.com", "name": str(member.firstname) + ' ' + str(member.lastname), } - if member and (member.stripe_customer_id is None or member.stripe_customer_id==''): + if member and (member.stripe_customer_id is None or member.stripe_customer_id == ''): stripe_customer = BaseService.addStripeCustomer(customer_data) logger.info(f"Stripe_Customer ===== : {stripe_customer}") if stripe_customer is not None: logger.info(f"Stripe_Customer ID ===== : {stripe_customer.id}") - Members.set_user_stripe_id( member.uid, member.id, stripe_customer.id) - + Members.set_user_stripe_id(member.uid, member.id, stripe_customer.id) return ResponseHelper.success(data=response_data) @@ -301,7 +300,7 @@ class LoginService(BaseService): } return ResponseHelper.success(data=invalid_data) - pass_check = check_password_hash(member.password, password) + pass_check = check_password_hash(member.password, password) logger.info("Password check: {}".format(pass_check)) if not member or not pass_check: invalid_data = { @@ -312,24 +311,24 @@ class LoginService(BaseService): user_data = {} user_data["id"] = member.id, - user_data["member_id"]= member.id, + user_data["member_id"] = member.id, user_data["uid"] = str(member.uid), user_token = jwt.encode( - {"user": user_data, 'exp' : datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)}, - Config.JWT_SECRET_KEY, - algorithm="HS256" - ) + {"user": user_data, 'exp': datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)}, + Config.JWT_SECRET_KEY, + algorithm="HS256" + ) # Simulate processing response_data = { "member_id": member.id, - "uid": str(member.uid), + "uid": str(member.uid), "username": member.username, "account_name": member.account_name, - "firstname":member.firstname, + "firstname": member.firstname, "lastname": member.lastname, - "room": member.uid, + "room": member.uid, "token": user_token } # customer_data=[]