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
+3 -6
View File
@@ -303,7 +303,6 @@ class AccountService(BaseService):
"uid": uid, "uid": uid,
}, 400 }, 400
member_id = member.id member_id = member.id
dList = [] dList = []
@@ -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,
} }
@@ -506,8 +507,6 @@ class AccountService(BaseService):
} }
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 = {
@@ -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
+3 -4
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": "",
@@ -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)
@@ -257,6 +256,7 @@ class LoginService(BaseService):
"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)
@@ -271,7 +271,6 @@ class LoginService(BaseService):
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)
except ValidationError as err: except ValidationError as err: