|
@@ -147,7 +147,7 @@ async def user_profile(token: str = Depends(oauth2_scheme)):
|
|
left_sec = user_obj['left_time']
|
|
left_sec = user_obj['left_time']
|
|
|
|
|
|
video_info_list = []
|
|
video_info_list = []
|
|
- statement = 'SELECT * FROM history_input WHERE user_id='+str(user_obj['id']+' ORDER BY timestamp DESC LIMIT 50')
|
|
|
|
|
|
+ statement = 'SELECT * FROM history_input WHERE user_id='+str(user_obj['id'])+' ORDER BY timestamp DESC LIMIT 50')
|
|
for row in db.query(statement):
|
|
for row in db.query(statement):
|
|
video_info_list.append({'id':row['id'],'title':row['name'],'duration':row['duration'],'url':row['link'],'time_stamp':row['timestamp'].strftime("%m/%d/%Y, %H:%M:%S")})
|
|
video_info_list.append({'id':row['id'],'title':row['name'],'duration':row['duration'],'url':row['link'],'time_stamp':row['timestamp'].strftime("%m/%d/%Y, %H:%M:%S")})
|
|
dic_return = {'user_info':{'id':user_id,'userName':user_obj['username'],'email':user_obj['email'],'video_num':video_num,'total_sec':total_sec,'left_sec':user_obj['left_time']},'video_info':video_info_list}
|
|
dic_return = {'user_info':{'id':user_id,'userName':user_obj['username'],'email':user_obj['email'],'video_num':video_num,'total_sec':total_sec,'left_sec':user_obj['left_time']},'video_info':video_info_list}
|
|
@@ -161,7 +161,7 @@ async def edit_profile(userModel : models.UserProfile ,token: str = Depends(oaut
|
|
user_id = get_user_id(token)
|
|
user_id = get_user_id(token)
|
|
print(user_id)
|
|
print(user_id)
|
|
user_obj = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
|
|
user_obj = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
|
|
- user_obj['email'] = 'asdadasd'
|
|
|
|
|
|
+ user_obj['email'] = userModel.email
|
|
db['users'].update(dict(user_obj), ['id'])
|
|
db['users'].update(dict(user_obj), ['id'])
|
|
return {'msg':'ok'}
|
|
return {'msg':'ok'}
|
|
|
|
|