From 579966e7aadf48427c6db8f48ec40637504ba3d1 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Tue, 14 Jan 2020 00:52:15 +0000 Subject: [PATCH] Move search result member into its own object --- apiserver/apiserver/api/serializers.py | 68 +++++++++++++++++++++----- apiserver/apiserver/api/views.py | 15 ++++-- webclient/src/Account.js | 12 ++++- webclient/src/Admin.js | 32 +++--------- webclient/src/Members.js | 34 +++++++------ webclient/src/utils.js | 2 +- 6 files changed, 105 insertions(+), 58 deletions(-) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index 2a6106c..fc3e075 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -42,24 +42,31 @@ def process_image(upload): return small, medium, large - - -# member viewing member list or other member -class OtherMemberSerializer(serializers.ModelSerializer): - q = serializers.CharField(write_only=True, max_length=64) - seq = serializers.IntegerField(write_only=True) - - class Meta: - model = models.Member - fields = ['q', 'seq', 'id', 'preferred_name', 'last_name', 'status', 'current_start_date', 'photo_small', 'photo_large'] - class UserEmailField(serializers.ModelField): def to_representation(self, obj): return getattr(obj.user, 'email', obj.old_email) def to_internal_value(self, data): return serializers.EmailField().run_validation(data) -# member viewing himself + + +class AdminCardSerializer(serializers.ModelSerializer): + card_number = serializers.CharField() + class Meta: + model = models.Card + fields = '__all__' + read_only_fields = ['last_seen_at'] + + + + +# member viewing other members +class OtherMemberSerializer(serializers.ModelSerializer): + class Meta: + model = models.Member + fields = ['id', 'preferred_name', 'last_name', 'status', 'current_start_date', 'photo_small', 'photo_large'] + +# member viewing his own details class MemberSerializer(serializers.ModelSerializer): photo = serializers.ImageField(write_only=True, required=False) email = UserEmailField(serializers.EmailField) @@ -85,12 +92,15 @@ class MemberSerializer(serializers.ModelSerializer): 'photo_medium', 'photo_small', 'user', + 'old_email', ] def update(self, instance, validated_data): if instance.user: instance.user.email = validated_data.get('email', instance.user.email) instance.user.save() + else: + instance.old_email = validated_data.get('email', instance.old_email) photo = validated_data.get('photo', None) if photo: @@ -101,7 +111,7 @@ class MemberSerializer(serializers.ModelSerializer): return super().update(instance, validated_data) -# adming viewing member +# admin viewing member details class AdminMemberSerializer(MemberSerializer): class Meta: model = models.Member @@ -113,10 +123,41 @@ class AdminMemberSerializer(MemberSerializer): 'photo_medium', 'photo_small', 'user', + 'old_email', ] +# member viewing member list or search result +class SearchSerializer(serializers.Serializer): + q = serializers.CharField(write_only=True, max_length=64) + seq = serializers.IntegerField(write_only=True) + member = serializers.SerializerMethodField() + + def get_member(self, obj): + serializer = OtherMemberSerializer(obj) + return serializer.data + +# admin viewing search result +class AdminSearchSerializer(serializers.Serializer): + cards = serializers.SerializerMethodField() + member = serializers.SerializerMethodField() + + def get_member(self, obj): + serializer = AdminMemberSerializer(obj) + return serializer.data + + def get_cards(self, obj): + if obj.user: + queryset = obj.user.cards + else: + queryset = models.Card.objects.filter(member_id=obj.id) + serializer = AdminCardSerializer(data=queryset, many=True) + serializer.is_valid() + return serializer.data + + + class UserTrainingSerializer(serializers.ModelSerializer): class Meta: model = models.Training @@ -174,6 +215,7 @@ class AdminCourseSerializer(serializers.ModelSerializer): fields = '__all__' + class RegistrationSerializer(RegisterSerializer): first_name = serializers.CharField(max_length=32) last_name = serializers.CharField(max_length=32) diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index a078d9e..717e50d 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -21,6 +21,7 @@ class IsOwnerOrAdmin(BasePermission): def has_object_permission(self, request, view, obj): return obj.user == request.user or is_admin_director(request.user) + class RetrieveUpdateViewSet( viewsets.GenericViewSet, mixins.RetrieveModelMixin, @@ -41,12 +42,20 @@ def gen_search_strings(): NUM_SEARCH_RESULTS = 10 class SearchViewSet(viewsets.GenericViewSet, mixins.RetrieveModelMixin): permission_classes = [AllowMetadata | IsAuthenticated] - serializer_class = serializers.OtherMemberSerializer + + def get_serializer_class(self): + if is_admin_director(self.request.user) and self.action == 'retrieve': + return serializers.AdminSearchSerializer + else: + return serializers.SearchSerializer def get_queryset(self): queryset = models.Member.objects.all() search = self.request.data.get('q', '').lower() + if not search_strings: + gen_search_strings() # init cache + if len(search): choices = search_strings.keys() @@ -68,7 +77,7 @@ class SearchViewSet(viewsets.GenericViewSet, mixins.RetrieveModelMixin): queryset = result_objects else: - gen_search_strings() + gen_search_strings() # update cache queryset = queryset.order_by('-vetted_date') return queryset @@ -81,7 +90,7 @@ class SearchViewSet(viewsets.GenericViewSet, mixins.RetrieveModelMixin): seq = 0 queryset = self.get_queryset()[:NUM_SEARCH_RESULTS] - serializer = self.serializer_class(queryset, many=True) + serializer = serializers.SearchSerializer(queryset, many=True) return Response({'seq': seq, 'results': serializer.data}) diff --git a/webclient/src/Account.js b/webclient/src/Account.js index e069aad..bf55598 100644 --- a/webclient/src/Account.js +++ b/webclient/src/Account.js @@ -17,7 +17,7 @@ function ChangePasswordForm(props) { const handleSubmit = (e) => { setLoading(true); - requester('/rest-auth/password/change/', 'POST', props.token, input) + requester('/password/change/', 'POST', props.token, input) .then(res => { setError({}); history.push('/'); @@ -32,7 +32,7 @@ function ChangePasswordForm(props) { const makeProps = (name) => ({ name: name, onChange: handleChange, - value: input[name], + value: input[name] || '', error: error[name], }); @@ -43,16 +43,19 @@ function ChangePasswordForm(props) { @@ -139,6 +142,11 @@ export function AccountForm(props) { required {...makeProps('city')} /> + diff --git a/webclient/src/Admin.js b/webclient/src/Admin.js index 32cd943..abb24ce 100644 --- a/webclient/src/Admin.js +++ b/webclient/src/Admin.js @@ -5,7 +5,7 @@ import { Container, Checkbox, Divider, Dropdown, Form, Grid, Header, Icon, Image import { BasicTable, staticUrl, requester } from './utils.js'; export function AdminMemberForm(props) { - const [input, setInput] = useState(false); + const [input, setInput] = useState(props.result.member); const [error, setError] = useState(false); const [loading, setLoading] = useState(false); const [success, setSuccess] = useState(false); @@ -16,17 +16,6 @@ export function AdminMemberForm(props) { const handleChange = (e) => handleValues(e, e.currentTarget); const handleCheck = (e, v) => setInput({ ...input, [v.name]: v.checked }); - useEffect(() => { - requester('/members/'+id+'/', 'GET', props.token) - .then(res => { - setInput(res); - }) - .catch(err => { - console.log(err); - setError(true); - }); - }, []); - const handleSubmit = (e) => { setLoading(true); setSuccess(false); @@ -35,6 +24,7 @@ export function AdminMemberForm(props) { setLoading(false); setSuccess(true); setError(false); + props.setResult({ ...props.result, member: res }); }) .catch(err => { setLoading(false); @@ -57,6 +47,11 @@ export function AdminMemberForm(props) {
Edit Member Details
+ + { - requester('/members/'+id+'/', 'GET', props.token) - .then(res => { - setMember(res); - }) - .catch(err => { - console.log(err); - setError(true); - }); - }, []); - return (
{!error ? diff --git a/webclient/src/Members.js b/webclient/src/Members.js index 9a09ce1..614a033 100644 --- a/webclient/src/Members.js +++ b/webclient/src/Members.js @@ -8,7 +8,7 @@ import { NotFound, PleaseLogin } from './Misc.js'; import { AdminMemberInfo, AdminMemberForm } from './Admin.js'; export function Members(props) { - const [members, setMembers] = useState(false); + const [response, setResponse] = useState(false); const searchDefault = {seq: 0, q: ''}; const [search, setSearch] = useState(searchDefault); const { token } = props; @@ -16,8 +16,8 @@ export function Members(props) { useEffect(() => { requester('/search/', 'POST', token, search) .then(res => { - if (!search.seq || res.seq > members.seq) { - setMembers(res); + if (!search.seq || res.seq > response.seq) { + setResponse(res); } }) .catch(err => { @@ -48,16 +48,16 @@ export function Members(props) { {search.q.length ? 'Search Results' : 'Newest Vetted Members'} - {members ? + {response ? - {members.results.length ? - members.results.map((x, i) => - - + {response.results.length ? + response.results.map((x, i) => + + - {x.preferred_name} {x.last_name} - Status: {x.status || 'Unknown'} - Joined: {x.current_start_date || 'Unknown'} + {x.member.preferred_name} {x.member.last_name} + Status: {x.member.status || 'Unknown'} + Joined: {x.member.current_start_date || 'Unknown'} ) @@ -74,7 +74,7 @@ export function Members(props) { }; export function MemberDetail(props) { - const [member, setMember] = useState(false); + const [result, setResult] = useState(false); const [error, setError] = useState(false); const { token, user } = props; const { id } = useParams(); @@ -82,7 +82,7 @@ export function MemberDetail(props) { useEffect(() => { requester('/search/'+id+'/', 'GET', token) .then(res => { - setMember(res); + setResult(res); }) .catch(err => { console.log(err); @@ -90,6 +90,8 @@ export function MemberDetail(props) { }); }, []); + const member = result.member || false; + return ( {!error ? @@ -104,7 +106,7 @@ export function MemberDetail(props) {

{isAdmin(user) ? - + : @@ -122,7 +124,9 @@ export function MemberDetail(props) { - {isAdmin(user) && } + {isAdmin(user) && + + } diff --git a/webclient/src/utils.js b/webclient/src/utils.js index 12fc40f..e2a6f6c 100644 --- a/webclient/src/utils.js +++ b/webclient/src/utils.js @@ -51,7 +51,7 @@ export const requester = (route, method, token, data) => { return response.json(); }) .catch(error => { - const code = error.data.status; + const code = error.data ? error.data.status : null; if (code == 413) { throw customError({non_field_errors: ['File too big']}); } else if (code >= 400 && code < 500) {