Clean up and remove tommy :(
This commit is contained in:
Jan Tuomi
+5
-145
@@ -10,52 +10,17 @@ import json
|
||||
import requests
|
||||
import logging
|
||||
|
||||
|
||||
from members.models import Member, Request
|
||||
from members.forms import MemberForm
|
||||
|
||||
'''Rest API'''
|
||||
from members.serializers import MemberSerializer, MemberRequestSerializer
|
||||
from rest_framework import generics
|
||||
from rest_framework import generics, status, authentication, exceptions, permissions
|
||||
from rest_framework.decorators import api_view, permission_classes
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from members.permissions import HasRights
|
||||
from members.throttles import BurstRateThrottle, SustainedRateThrottle
|
||||
|
||||
# Logger function, you can use the same idea when implementing other loggers to other apps
|
||||
memberlogger = logging.getLogger(__name__)
|
||||
logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s', level=settings.LOGGERLEVEL, filename=settings.LOGPATH)
|
||||
|
||||
|
||||
#API views
|
||||
########################################
|
||||
class MembersList(generics.ListCreateAPIView):
|
||||
queryset = Member.objects.all()
|
||||
serializer_class = MemberSerializer
|
||||
permission_classes = (HasRights, permissions.IsAuthenticated, )
|
||||
throttle_classes = (BurstRateThrottle, SustainedRateThrottle, )
|
||||
|
||||
class MemberDetails(generics.RetrieveUpdateDestroyAPIView):
|
||||
queryset = Member.objects.all()
|
||||
serializer_class = MemberSerializer
|
||||
permission_classes = (HasRights, permissions.IsAuthenticated, )
|
||||
throttle_classes = (BurstRateThrottle, SustainedRateThrottle, )
|
||||
|
||||
class MemberRequestList(generics.ListCreateAPIView):
|
||||
queryset = Request.objects.all()
|
||||
serializer_class = MemberRequestSerializer
|
||||
permission_classes = (HasRights, permissions.IsAuthenticated, )
|
||||
throttle_classes = (BurstRateThrottle, SustainedRateThrottle, )
|
||||
|
||||
class MemberRequestDetail(generics.RetrieveUpdateDestroyAPIView):
|
||||
queryset = Request.objects.all()
|
||||
serializer_class = MemberRequestSerializer
|
||||
permission_classes = (HasRights, permissions.IsAuthenticated, )
|
||||
throttle_classes = (BurstRateThrottle, SustainedRateThrottle, )
|
||||
|
||||
########################################
|
||||
# function to validate reCaptcha
|
||||
'''
|
||||
Recaptcha is used in member applications
|
||||
'''
|
||||
def validate_recaptcha(response):
|
||||
values = {
|
||||
'secret': settings.GOOGLE_RECAPTCHA_SECRET_KEY,
|
||||
@@ -173,11 +138,6 @@ def delete_member(request, *args, **kwargs):
|
||||
def list_applications(request, *args, **kwargs):
|
||||
return render(request, 'list_applications.html', {})
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def tommy_blooper(request, *args, **kwargs):
|
||||
return render(request, 'tommy_blooper.html', {})
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@@ -201,51 +161,17 @@ def edit_application(request, *args, **kwargs):
|
||||
else:
|
||||
return render(request, 'edit_application.html', {'member_id' : i})
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
def application_index(request, *args, **kwargs):
|
||||
return render(request, 'application_index.html', {})
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
def application_success_index(request, *args, **kwargs):
|
||||
return render(request, 'application_success.html', {})
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def members(request, *args, **kwargs):
|
||||
mems = list(map(lambda m: m.get_dict(), Member.objects.all()))
|
||||
return HttpResponse(json.dumps(mems))
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET", "POST", "DELETE", "PUT"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def member(request, *args, **kwargs):
|
||||
|
||||
# get, put and delete together since all operate on existing objects
|
||||
if request.method in ['GET', 'PUT', 'DELETE']:
|
||||
|
||||
# get object by id or give 404
|
||||
idx = kwargs.pop("idx", None)
|
||||
try:
|
||||
mem = Member.objects.get(pk=idx)
|
||||
except Member.DoesNotExist:
|
||||
resp = HttpResponse('{"error":"object not found"}')
|
||||
resp.status_code = 404
|
||||
return resp
|
||||
|
||||
# delete object if requested
|
||||
if request.method == 'DELETE':
|
||||
try:
|
||||
mem.delete()
|
||||
return HttpResponse('{"status":"success"}')
|
||||
except:
|
||||
resp = HttpResponse('{"error" : "could not delete object"}')
|
||||
resp.status_code = 500
|
||||
return resp
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["POST"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
@@ -266,72 +192,6 @@ def csv_import(request, *args, **kwargs):
|
||||
return resp
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def member_requests(request, *args, **kwargs):
|
||||
reqs = list(map(lambda r: r.get_dict(), MemberRequest.objects.all()))
|
||||
return HttpResponse(json.dumps(reqs))
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
def new_member_request(request, *args, **kwargs):
|
||||
try:
|
||||
data = json.loads(request.body.decode("utf-8"))
|
||||
# get captcha response from member
|
||||
captcha = data.pop("reCaptchaResponse", "")
|
||||
# send response to google and check it out
|
||||
captcha_ok = validate_recaptcha(captcha)
|
||||
# if not ok, inform user
|
||||
if not captcha_ok:
|
||||
return HttpResponseBadRequest('{"error": "Captcha not ok. Please try again."}')
|
||||
# if ok continue
|
||||
mem = Member.create_from_dict(data)
|
||||
req = MemberRequest.objects.create(member=mem)
|
||||
|
||||
# Build the email body
|
||||
subject = 'New application'
|
||||
message = 'You have new application\r\n'
|
||||
message += 'Member info:\r\n'
|
||||
message += 'First name: ' + mem.first_name + '\r\n'
|
||||
message += 'Last name: ' + mem.last_name + '\r\n'
|
||||
message += 'Email: ' + mem.email + '\r\n'
|
||||
message += 'Place of residence: ' + mem.POR + '\r\n'
|
||||
message += 'AYY-membership: ' + str(mem.AYY) + '\r\n'
|
||||
message += 'To mail list: ' + str(mem.jas) + '\r\n'
|
||||
message += 'Created: ' + mem.created.isoformat(' ') + '\r\n'
|
||||
message += 'Please go to the https://sika.sahkoinsinoorikilta.fi/members/ and do something about it!\r\n'
|
||||
|
||||
# TODO: send mail when application is ready
|
||||
# send_mail_wrapper(subject, message)
|
||||
|
||||
return HttpResponse(json.dumps(mem.get_dict()))
|
||||
|
||||
except ValueError:
|
||||
return HttpResponseBadRequest('{"error" : "Invalid parameters supplied"}')
|
||||
except TimeoutError:
|
||||
return HttpResponseBadRequest('{"error" : "Much error, no connection"}')
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET", "POST", "DELETE"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def handle_mem_request(request, idx, *args, **kwargs):
|
||||
try:
|
||||
req = MemberRequest.objects.get(pk=idx)
|
||||
except MemberRequest.DoesNotExist:
|
||||
resp = HttpResponse('{"error":"object not found"}')
|
||||
resp.status_code = 404
|
||||
return resp
|
||||
if request.method == 'GET':
|
||||
return HttpResponse(json.dumps(req.get_dict()))
|
||||
elif request.method == 'DELETE':
|
||||
req.member.delete()
|
||||
else: # method == POST because other aren't allowed here
|
||||
req.delete()
|
||||
return HttpResponse('{"status":"success"}')
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
|
||||
Reference in New Issue
Block a user