From a947f21652bf44ca0b8af68a6d5166b1c2db4593 Mon Sep 17 00:00:00 2001 From: henu Date: Wed, 29 Mar 2017 19:37:56 +0300 Subject: [PATCH] Change memberRequest model to Request model --- members/admin.py | 4 +- members/migrations/0003_auto_20170329_1928.py | 67 +++++++++++++++++++ members/models.py | 5 +- members/serializers.py | 4 +- members/views.py | 6 +- 5 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 members/migrations/0003_auto_20170329_1928.py diff --git a/members/admin.py b/members/admin.py index bacee5d..7550b85 100644 --- a/members/admin.py +++ b/members/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from members.models import Member, MemberRequest +from members.models import Member, Request # Register your models here. admin.site.register(Member) -admin.site.register(MemberRequest) +admin.site.register(Request) diff --git a/members/migrations/0003_auto_20170329_1928.py b/members/migrations/0003_auto_20170329_1928.py new file mode 100644 index 0000000..ddffdda --- /dev/null +++ b/members/migrations/0003_auto_20170329_1928.py @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-03-29 16:28 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0002_auto_20170329_1857'), + ] + + operations = [ + migrations.CreateModel( + name='Payment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date', models.DateTimeField(default=datetime.datetime(1970, 1, 1, 2, 0))), + ('source', models.CharField(max_length=255)), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('email', models.EmailField(max_length=255)), + ], + ), + migrations.CreateModel( + name='Request', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=127)), + ('last_name', models.CharField(max_length=127)), + ('email', models.EmailField(max_length=254)), + ('POR', models.CharField(default='ei_tiedossa', max_length=255)), + ('AYY', models.BooleanField(default=False)), + ('jas', models.BooleanField(default=False)), + ('submitted', models.DateTimeField(default=django.utils.timezone.now)), + ], + options={ + 'abstract': False, + }, + ), + migrations.RemoveField( + model_name='memberrequest', + name='member', + ), + migrations.AlterField( + model_name='member', + name='POR', + field=models.CharField(default='ei_tiedossa', max_length=255), + ), + migrations.AlterField( + model_name='member', + name='paid', + field=models.DateTimeField(default=django.utils.timezone.now), + ), + migrations.DeleteModel( + name='MemberRequest', + ), + migrations.AddField( + model_name='payment', + name='member', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='members.Member'), + ), + ] diff --git a/members/models.py b/members/models.py index 7fefdd0..744bf94 100644 --- a/members/models.py +++ b/members/models.py @@ -11,7 +11,7 @@ class BaseMember(models.Model): first_name = models.CharField(max_length=127) last_name = models.CharField(max_length=127) email = models.EmailField() - POR = models.CharField(max_length=255) # place of residence + POR = models.CharField(default="ei_tiedossa", max_length=255) # place of residence AYY = models.BooleanField(default=False) jas = models.BooleanField(default=False) @@ -19,7 +19,7 @@ class BaseMember(models.Model): abstract = True -class MemberRequest(BaseMember): +class Request(BaseMember): ''' Member request model represents one member request. ''' @@ -55,4 +55,3 @@ class Member(BaseMember): ''' created = models.DateTimeField(default=timezone.now) paid = models.DateTimeField(default=timezone.now) #this needs to be assigned as Payment.date - diff --git a/members/serializers.py b/members/serializers.py index 097d6c1..c473ff5 100644 --- a/members/serializers.py +++ b/members/serializers.py @@ -1,7 +1,7 @@ from rest_framework import serializers from django.utils import timezone from datetime import datetime -from members.models import Member, MemberRequest +from members.models import Member, Request from django.conf import settings @@ -37,7 +37,7 @@ class MemberSerializer(serializers.Serializer): instance.save() return instance -class MemberRequestSerializer(serializers.ModelSerializer): +class MemberRequestSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) submitted = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S") first_name = serializers.CharField(required=True, max_length=127) diff --git a/members/views.py b/members/views.py index f3e6316..8570dba 100644 --- a/members/views.py +++ b/members/views.py @@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseBadRequest from django.core.exceptions import ValidationError -from members.models import Member, MemberRequest +from members.models import Member, Request import json from django.core.mail import send_mail import requests @@ -39,13 +39,13 @@ class MemberDetails(generics.RetrieveUpdateDestroyAPIView): throttle_classes = (BurstRateThrottle, SustainedRateThrottle, ) class MemberRequestList(generics.ListCreateAPIView): - queryset = MemberRequest.objects.all() + queryset = Request.objects.all() serializer_class = MemberRequestSerializer permission_classes = (HasRights, permissions.IsAuthenticated, ) throttle_classes = (BurstRateThrottle, SustainedRateThrottle, ) class MemberRequestDetail(generics.RetrieveUpdateDestroyAPIView): - queryset = MemberRequest.objects.all() + queryset = Request.objects.all() serializer_class = MemberRequestSerializer permission_classes = (HasRights, permissions.IsAuthenticated, ) throttle_classes = (BurstRateThrottle, SustainedRateThrottle, )