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.

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

Feature#7.1 Update #19

Merged
merged 12 commits into from
Jan 3, 2021
Merged

Feature#7.1 Update #19

merged 12 commits into from
Jan 3, 2021

Conversation

yuri-0415
Copy link
Contributor

merge 오류가 나서 수정했습니다

merge 오류가 나서 수정했습니다
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/serializers.py Outdated Show resolved Hide resolved
wadium/wadium/settings.py Outdated Show resolved Hide resolved
@yuri-0415
Copy link
Contributor Author

상규님 수정사항 반영했습니다!

Copy link
Collaborator

@gyusang gyusang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feature 7.1 <- main merge했습니다.
작업하기 전에 pull 부탁드립니다.

wadium/user/serializers.py Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/serializers.py Outdated Show resolved Hide resolved
wadium/user/views.py Outdated Show resolved Hide resolved

def list(self, request):
username = request.query_params.get('username')
users = self.get_queryset().filter(username__icontains=username)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

users = users.select_related('userprofile').prefetch_related('emails') 등으로 N+1 문제를 완화하면 좋겠습니다.

wadium/user/views.py Outdated Show resolved Hide resolved
wadium/user/serializers.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@gyusang gyusang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

일부 수정했습니다 👍

@yuri-0415
Copy link
Contributor Author

일부 수정했습니다 👍

merge 하면 될까요?

@yuri-0415 yuri-0415 merged commit e868965 into main Jan 3, 2021
@gyusang gyusang removed a link to an issue Jan 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

user/{user_id}/about/, user/?username=username 만들기
2 participants