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

Refactoring #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactoring #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aba815d
UserCreate View Updated
Oct 1, 2020
faaad42
Code Refactored and Dead Code Removed
Oct 1, 2020
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
92 changes: 43 additions & 49 deletions users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ class UserCreate(APIView):

def post(self, request, format='json'):
serializer = BlogCustomUserSerializer(data=request.data)
if serializer.is_valid():
user = serializer.save()
token = Token.objects.create(user=user)
json = {}
json['username'] = serializer.data['username']
json['email'] = serializer.data['email']
json['token'] = token.key
if user:
return Response(json, status=status.HTTP_201_CREATED)
serializer.is_valid(raise_exception=True)

return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
user = serializer.save()
token = Token.objects.create(user=user)

json = {}
json['username'] = serializer.data['username']
json['email'] = serializer.data['email']
json['token'] = token.key

return Response(json, status=status.HTTP_201_CREATED)


class UserLogin(APIView):
Expand All @@ -46,12 +46,10 @@ class UserLogin(APIView):
def post(self, request, format='json'):
serializer = LoginSerializer(data=request.data)

if serializer.is_valid():
user = get_and_authenticate_user(**serializer.validated_data)
data = AuthSerializer(user).data
return Response(data=data, status=status.HTTP_200_OK)

return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
serializer.is_valid(raise_exception=True)
user = get_and_authenticate_user(**serializer.validated_data)
data = AuthSerializer(user).data
return Response(data=data, status=status.HTTP_200_OK)


class ChangePassword(generics.UpdateAPIView):
Expand All @@ -68,25 +66,23 @@ def update(self, request, *args, **kwargs):
self.object = self.get_object()
serializer = ResetPasswordSerializer(data=request.data)

if serializer.is_valid():

if not self.object.check_password(serializer.validated_data.get("old_password")):
return Response({"old_password": ["incorrect password."]}, status=status.HTTP_400_BAD_REQUEST)
serializer.is_valid(raise_exception=True)

self.object.set_password(
serializer.validated_data.get("password1"))
self.object.save()
if not self.object.check_password(serializer.validated_data.get("old_password")):
return Response({"old_password": ["incorrect password."]}, status=status.HTTP_400_BAD_REQUEST)

response = {
'status': 'success',
'code': status.HTTP_200_OK,
'message': 'Password updated successfully',
'data': []
}
self.object.set_password(
serializer.validated_data.get("password1"))
self.object.save()

return Response(response)
response = {
'status': 'success',
'code': status.HTTP_200_OK,
'message': 'Password updated successfully',
'data': []
}

return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
return Response(response)


class UpdateProfie(generics.UpdateAPIView):
Expand All @@ -103,27 +99,25 @@ def update(self, request, *args, **kwargs):
self.object = self.get_object()

serializer = UpdateProfileSerializer(data=request.data)
if serializer.is_valid():

response = {
'message': 'No Changes were made.',
'data': []
}
serializer.is_valid()

if serializer.validated_data.get("email"):
self.object.updateEmail(serializer.validated_data.get("email"))
self.object.save()
response = {
'message': 'No Changes were made.',
'data': []
}

response['message'] = 'Profile updated successfully'
response['data'].append("email:"+self.object.email)
if serializer.validated_data.get("email"):
self.object.updateEmail(serializer.validated_data.get("email"))
self.object.save()

if serializer.validated_data.get("bio"):
self.object.updateBio(serializer.validated_data.get("bio"))
self.object.save()
response['message'] = 'Profile updated successfully'
response['data'].append("email:"+self.object.email)

response['message'] = 'Profile updated successfully'
response['data'].append("bio:"+self.object.bio)
if serializer.validated_data.get("bio"):
self.object.updateBio(serializer.validated_data.get("bio"))
self.object.save()

return Response(response)
response['message'] = 'Profile updated successfully'
response['data'].append("bio:"+self.object.bio)

return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
return Response(response)