Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improved code of user.py with dict.get() and suggestions #1124

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

improved code of user.py with dict.get() and suggestions #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4091169
enhanced code of user.py with dict.get()
aakankshaagr May 25, 2021
ec66d78
reformatted users.py with black
aakankshaagr Jun 20, 2021
29bf220
added sugesstions to users.py
aakankshaagr Jun 21, 2021
747d858
reformatted with black
aakankshaagr Jun 21, 2021
e706c05
removed keyerror
aakankshaagr Jun 21, 2021
66550c9
Merge branch 'anitab-org:develop' into develop
aakankshaagr Jul 6, 2021
02b982e
Merge branch 'anitab-org:develop' into develop
aakankshaagr Jul 25, 2021
b5e5781
removed None as suggested
aakankshaagr Jul 25, 2021
6f6df83
edited tests and user.py
aakankshaagr Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 14 additions & 59 deletions app/api/dao/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

from flask_restx import marshal
from sqlalchemy import func

from app import messages
from app.api.dao.mentorship_relation import MentorshipRelationDAO
from app.api.email_utils import confirm_token
Expand Down Expand Up @@ -226,7 +225,7 @@ def update_user_profile(user_id: int, data: Dict[str, str]):
if not user:
return messages.USER_DOES_NOT_EXIST, HTTPStatus.NOT_FOUND

username = data.get("username", None)
username = data.get("username")
if username:
user_with_same_username = UserModel.find_by_username(username)

Expand All @@ -236,77 +235,33 @@ def update_user_profile(user_id: int, data: Dict[str, str]):
messages.USER_USES_A_USERNAME_THAT_ALREADY_EXISTS,
HTTPStatus.BAD_REQUEST,
)

user.username = username

if "name" in data and data["name"]:
user.name = data["name"]
user.name = data.get("name")

if "bio" in data:
if data["bio"]:
user.bio = data["bio"]
else:
user.bio = None
user.bio = data.get("bio")

if "location" in data:
if data["location"]:
user.location = data["location"]
else:
user.location = None
user.location = data.get("location")

if "occupation" in data:
if data["occupation"]:
user.occupation = data["occupation"]
else:
user.occupation = None
user.occupation = data.get("occupation")

if "organization" in data:
if data["organization"]:
user.organization = data["organization"]
else:
user.organization = None
user.organization = data.get("organization")

if "slack_username" in data:
if data["slack_username"]:
user.slack_username = data["slack_username"]
else:
user.slack_username = None
user.slack_username = data.get("slack_username")

if "social_media_links" in data:
if data["social_media_links"]:
user.social_media_links = data["social_media_links"]
else:
user.social_media_links = None
user.social_media_links = data.get("social_media_links")

if "skills" in data:
if data["skills"]:
user.skills = data["skills"]
else:
user.skills = None
user.skills = data.get("skills")

if "interests" in data:
if data["interests"]:
user.interests = data["interests"]
else:
user.interests = None
user.interests = data.get("interests")

if "resume_url" in data:
if data["resume_url"]:
user.resume_url = data["resume_url"]
else:
user.resume_url = None
user.resume_url = data.get("resume_url")

if "photo_url" in data:
if data["photo_url"]:
user.photo_url = data["photo_url"]
else:
user.photo_url = None
user.photo_url = data.get("photo_url")

if "need_mentoring" in data:
user.need_mentoring = data["need_mentoring"]
user.need_mentoring = data.get("need_mentoring")

if "available_to_mentor" in data:
user.available_to_mentor = data["available_to_mentor"]
user.available_to_mentor = data.get("available_to_mentor")

user.save_to_db()

Expand Down
2 changes: 1 addition & 1 deletion tests/users/test_dao_update_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_update_fields_with_empty_data(self):
self.assertEqual("good_developer", self.admin_user.occupation)
self.assertEqual("good_org", self.admin_user.organization)

data = dict(occupation="", organization="")
data = dict(occupation=None, organization=None)
UserDAO.update_user_profile(self.admin_user.id, data)

self.assertIsNone(self.admin_user.occupation)
Expand Down