MERMS/MermsCoreFlask
1
0
Fork 0
Code Issues Pull Requests Releases Activity

URL data

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-12-02 11:49:05 -05:00
parent c94982fd2c
commit 4a53f57bbc
2 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/services/account.py
+8 -11
View File
@@ -224,7 +224,7 @@ class AccountService(BaseService):
introduction = str(validated_data.get('introduction')) introduction = str(validated_data.get('introduction'))
url_name = str(validated_data.get('url_name')) 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) urlNammeData = MembersProfile.get_any_member_profile_by_url_name(url_name)
if urlNammeData: if urlNammeData:
return { return {
@@ -255,7 +255,7 @@ class AccountService(BaseService):
profile_completed = member.profile_completed profile_completed = member.profile_completed
else: else:
profile_result = MembersProfile.create_member_profile(member.id, practice, specialization, profile_result = MembersProfile.create_member_profile(member.id, practice, specialization,
introduction,url_name) introduction, url_name)
if profile_result: if profile_result:
profile_uid = profile_result.uid profile_uid = profile_result.uid
@@ -303,11 +303,10 @@ class AccountService(BaseService):
"uid": uid, "uid": uid,
}, 400 }, 400
member_id = member.id member_id = member.id
dList = [] 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) prov_actions = ProvisionActions.get_provision_action_calendar_member_id(member_id=member_id, limit=100)
if prov_actions: if prov_actions:
for prov_action in prov_actions: for prov_action in prov_actions:
@@ -316,7 +315,8 @@ class AccountService(BaseService):
"category": 3} "category": 3}
dList.append(new_l) 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: if member_actions:
for member_action in member_actions: for member_action in member_actions:
new_l = {"uid": member_action.uid, new_l = {"uid": member_action.uid,
@@ -444,6 +444,7 @@ class AccountService(BaseService):
"email": member_data.email, "email": member_data.email,
"phone": member_data.phone, "phone": member_data.phone,
"full_address": member_data.full_address, "full_address": member_data.full_address,
"picture": 'https://media.mermsemr.com/media/show/merms-profile',
"country": member_data.country, "country": member_data.country,
} }
@@ -504,11 +505,9 @@ class AccountService(BaseService):
"full_address": full_address, "full_address": full_address,
# "email": email, # "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) member_data = Members.get_member_by_uid(uid)
personal_data = { personal_data = {
"firstname": member_data.firstname, "firstname": member_data.firstname,
@@ -552,7 +551,6 @@ class AccountService(BaseService):
db.session.rollback() db.session.rollback()
return ResponseHelper.internal_server_error() return ResponseHelper.internal_server_error()
@staticmethod @staticmethod
def process_test_email(data): def process_test_email(data):
logger.info(f"Email Test Enter", exc_info=True) logger.info(f"Email Test Enter", exc_info=True)
@@ -643,7 +641,6 @@ class AccountService(BaseService):
finally: finally:
server.quit() # Close the connection server.quit() # Close the connection
# @staticmethod # @staticmethod
# def get_profile_data(data): # def get_profile_data(data):
# #
app/api/services/login.py
+16 -17
View File
@@ -37,8 +37,8 @@ class LoginService(BaseService):
} }
return ResponseHelper.success(data=invalid_data) return ResponseHelper.success(data=invalid_data)
reset_data = PasswordReset.create_reset(username=username) 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 = { response_data = {
"error_message": "", "error_message": "",
@@ -72,7 +72,7 @@ class LoginService(BaseService):
validated_data = LoginService.validate_data(data, ResetPassVerify()) validated_data = LoginService.validate_data(data, ResetPassVerify())
reset_token = validated_data.get('reset_token') reset_token = validated_data.get('reset_token')
logger.error("GOT HERE 000001 ") logger.error("GOT HERE 000001 ")
data ={} data = {}
if not reset_token: if not reset_token:
return jsonify({'message': 'Error - missing reset_token '}), 403 return jsonify({'message': 'Error - missing reset_token '}), 403
try: try:
@@ -91,7 +91,7 @@ class LoginService(BaseService):
user_data = data["user"] user_data = data["user"]
reset_data = PasswordReset.get_rest_with_uid(user_data["pending_uid"]) reset_data = PasswordReset.get_rest_with_uid(user_data["pending_uid"])
logger.error(f"GOT HERE 000003 {reset_data} id = {reset_data.id}") logger.error(f"GOT HERE 000003 {reset_data} id = {reset_data.id}")
if reset_data.status> 0: if reset_data.status > 0:
invalid_data = { invalid_data = {
"error_message": "The link is invalid please try again later", "error_message": "The link is invalid please try again later",
"reset_message": "", "reset_message": "",
@@ -99,7 +99,7 @@ class LoginService(BaseService):
} }
return ResponseHelper.success(data=invalid_data) 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 = { response_data = {
"error_message": "", "error_message": "",
@@ -138,7 +138,7 @@ class LoginService(BaseService):
new_password = validated_data.get('new_password') new_password = validated_data.get('new_password')
logger.info("GOT HERE 000001 ") logger.info("GOT HERE 000001 ")
data ={} data = {}
if not reset_token: if not reset_token:
return jsonify({'message': 'Error - missing reset_token '}), 403 return jsonify({'message': 'Error - missing reset_token '}), 403
try: try:
@@ -161,7 +161,6 @@ class LoginService(BaseService):
logger.info(f"GOT HERE RESET DATA id = {reset_data.id}") logger.info(f"GOT HERE RESET DATA id = {reset_data.id}")
PasswordReset.update_status(reset_data.id, reset_data.status + 1) PasswordReset.update_status(reset_data.id, reset_data.status + 1)
username = reset_data.username username = reset_data.username
member = Members.get_member_by_username(username) member = Members.get_member_by_username(username)
@@ -236,11 +235,11 @@ class LoginService(BaseService):
user_data = {} user_data = {}
user_data["id"] = member.id, user_data["id"] = member.id,
user_data["member_id"]= member.id, user_data["member_id"] = member.id,
user_data["uid"] = str(member.uid), user_data["uid"] = str(member.uid),
user_token = jwt.encode( user_token = jwt.encode(
{"user": user_data, 'exp' : datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)}, {"user": user_data, 'exp': datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)},
Config.JWT_SECRET_KEY, Config.JWT_SECRET_KEY,
algorithm="HS256" algorithm="HS256"
) )
@@ -253,24 +252,24 @@ class LoginService(BaseService):
"uid": str(member.uid), "uid": str(member.uid),
"username": member.username, "username": member.username,
"account_name": member.account_name, "account_name": member.account_name,
"firstname":member.firstname, "firstname": member.firstname,
"lastname": member.lastname, "lastname": member.lastname,
"room": member.uid, "room": member.uid,
"profile_completed": member.profile_completed, "profile_completed": member.profile_completed,
"picture": 'https://media.mermsemr.com/media/show/merms-profile',
"token": user_token "token": user_token
} }
padded_member_id = str(member.id).zfill(6) padded_member_id = str(member.id).zfill(6)
customer_data = { customer_data = {
"email":"support+" + padded_member_id + "@chiefsoft.com", "email": "support+" + padded_member_id + "@chiefsoft.com",
"name": str(member.firstname) + ' ' + str(member.lastname), "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) stripe_customer = BaseService.addStripeCustomer(customer_data)
logger.info(f"Stripe_Customer ===== : {stripe_customer}") logger.info(f"Stripe_Customer ===== : {stripe_customer}")
if stripe_customer is not None: if stripe_customer is not None:
logger.info(f"Stripe_Customer ID ===== : {stripe_customer.id}") 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) return ResponseHelper.success(data=response_data)
@@ -312,11 +311,11 @@ class LoginService(BaseService):
user_data = {} user_data = {}
user_data["id"] = member.id, user_data["id"] = member.id,
user_data["member_id"]= member.id, user_data["member_id"] = member.id,
user_data["uid"] = str(member.uid), user_data["uid"] = str(member.uid),
user_token = jwt.encode( user_token = jwt.encode(
{"user": user_data, 'exp' : datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)}, {"user": user_data, 'exp': datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)},
Config.JWT_SECRET_KEY, Config.JWT_SECRET_KEY,
algorithm="HS256" algorithm="HS256"
) )
@@ -327,7 +326,7 @@ class LoginService(BaseService):
"uid": str(member.uid), "uid": str(member.uid),
"username": member.username, "username": member.username,
"account_name": member.account_name, "account_name": member.account_name,
"firstname":member.firstname, "firstname": member.firstname,
"lastname": member.lastname, "lastname": member.lastname,
"room": member.uid, "room": member.uid,
"token": user_token "token": user_token