Rest framework for Event and SignupForm

sikweb/base.py

@@ -220,7 +220,8 @@ REST_FRAMEWORK = {
         'rest_framework.permissions.IsAdminUser',
     ),
     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.TokenAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.BasicAuthentication',
     ),
     'DEFAULT_THROTTLE_CLASSES': (
         'members.throttles.BurstRateThrottle',

webapp/migrations/0045_auto_20180710_1901.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-10 16:01
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0044_auto_20180705_1851'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='signupform',
+            old_name='question',
+            new_name='questions',
+        ),
+    ]

webapp/migrations/0046_auto_20180710_2041.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-10 17:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0045_auto_20180710_1901'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='event',
+            name='signupForm',
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='signupForm',
+            field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, to='webapp.SignupForm'),
+            preserve_default=False,
+        ),
+    ]

webapp/migrations/0047_auto_20180710_2110.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-10 18:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0046_auto_20180710_2041'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='event',
+            name='signupForm',
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='signupForm',
+            field=models.ManyToManyField(blank=True, to='webapp.SignupForm'),
+        ),
+    ]

webapp/models.py

@@ -2,16 +2,16 @@
 
 from django.db import models
 from django.utils import timezone
-from datetime import timedelta
+# from datetime import timedelta
 from django.contrib.auth.models import User
 from webapp.utils import month_from_now
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import User
+# from django.contrib.auth.models import User
 from auditlog.registry import auditlog
 from phonenumber_field.modelfields import PhoneNumberField
-from django.contrib.postgres.fields import JSONField
+# from django.contrib.postgres.fields import JSONField
 
-import logging
+# import logging
 
 
 VERBOSE_NAME = _('Webapp')
@@ -92,7 +92,7 @@ class SignupForm(models.Model):
     start = models.DateTimeField(default=timezone.now)
     end = models.DateTimeField(default=timezone.now)
     # question = JSONField()
-    question = models.CharField(max_length=255)
+    questions = models.CharField(max_length=255)
 
     class Meta:
         verbose_name = _('Signup form')
@@ -112,7 +112,6 @@ class Signup(models.Model):
         verbose_name_plural = _('Sign-ups')
 
 
-
 class BaseRole(models.Model):
     """Base model for occupations/roles."""
 

webapp/serializers.py

@@ -0,0 +1,42 @@
+from rest_framework import serializers
+from webapp.models import *
+
+
+class SignupFormSerializer(serializers.HyperlinkedModelSerializer):
+
+    class Meta:
+        model = SignupForm
+        fields = ('id', 'start', 'end', 'questions')
+
+
+class EventSerializer(serializers.HyperlinkedModelSerializer):
+    signupForm = SignupFormSerializer(many=True, read_only=True, required=False)
+    signup_id = serializers.PrimaryKeyRelatedField(
+        many=True,
+        source="signupForm",
+        queryset=SignupForm.objects.all())
+
+    class Meta:
+        model = Event
+        fields = ('id', 'tags', 'visible', 'title', 'description',
+                  'content', 'start_time', 'end_time', 'signup_id', 'signupForm')
+        depth = 1
+
+    def create(self, validated_data):
+        signupForms = validated_data.pop('signupForm')
+        event = Event.objects.create(**validated_data)
+        for signupForm in signupForms:
+            event.signupForm.add(signupForm)
+        event.save()
+        return event
+
+
+class SignupSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = Signup
+        fields = ('id', 'signupForm', 'answer')
+        extra_kwargs = {
+            'url': {
+                'view_name': 'signup-detail',
+            }
+        }

webapp/translation.py

@@ -54,7 +54,6 @@ class TemplateQuestionTranslationOptions(TranslationOptions):
     fields = ()
 
 
-
 @register(BaseRole)
 class BaseRoleTranslationOptions(TranslationOptions):
     """Class for base role translation options"""

webapp/urls.py

@@ -1,45 +1,70 @@
 """Webapp urls."""
 
-from django.conf.urls import url
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.conf.urls import url, include
+from rest_framework import routers
+# from rest_framework.urlpatterns import format_suffix_patterns
+# from django.conf import settings
+# from django.utils.translation import ugettext_lazy as _
 
-from webapp.views import main_index
+# from webapp.views import main_index
 from webapp.views import login_view
 from webapp.views import logout_view
-from webapp.views import about_view
-from webapp.views import guild_view
-from webapp.views import freshmen_view
-from webapp.views import jobs_view
-from webapp.views import event_calendar_view
-from webapp.views import international_view
-from webapp.views import sosso_view
-from webapp.views import contact_view
+# from webapp.views import about_view
+# from webapp.views import guild_view
+# from webapp.views import freshmen_view
+# from webapp.views import jobs_view
+# from webapp.views import event_calendar_view
+# from webapp.views import international_view
+# from webapp.views import sosso_view
+# from webapp.views import contact_view
+
+from webapp.views import EventViewSet, SignupFormViewSet, SignupViewSet
+
+router = routers.DefaultRouter()
+router.register(r'events', EventViewSet)
+router.register(r'signupForm', SignupFormViewSet)
+router.register(r'signup', SignupViewSet)
 
 urlpatterns = [
-    # main
-    url(r'^$', main_index),
-
+    url(r'^', include(router.urls)),
     # login stuff
     url(r'^login$', login_view),
     url(r'^logout$', logout_view),
-
-    # git revision
-    url(r'^about', about_view),
-
-    # pages
-    url(r'^guild', guild_view),
-    url(r'^freshmen', freshmen_view),
-    url(r'^event_calendar', event_calendar_view),
-    url(r'^international', international_view),
-    url(r'^sosso', sosso_view),
-    url(r'^contact', contact_view),
-
-    # corporate
-    url(r'^jobs', jobs_view),
 ]
+# urlpatterns = [
+#     # main
+#     url(r'^$', main_index),
+#     url(r'^api/$', api_root),
+#     url(r'^api/events/$', EventList.as_view(), name='event-list'),
+#     url(r'^api/events/(?P<pk>[0-9]+)/$', EventDetail.as_view(), name='event-detail'),
+#     url(r'^api/signup/$', SignupFormList.as_view(), name='signupform-list'),
+#     url(r'^api/signup/(?P<pk>[0-9]+)/$', SignupFormDetail.as_view(), name='signup-detail'),
+
+#     url(r'^api/signup/create$', SignupFormCreate.as_view(), name='signupform-create'),
+
+#     # url(r'^signupform/$', SignupFormList.as_view(), name='signupform-list'),
+#     # url(r'^signupform/(?P<pk>[0-9]+)/$', SignupFormDetail.as_view(), name='signupform-detail'),
+
+#     # login stuff
+#     url(r'^login$', login_view),
+#     url(r'^logout$', logout_view),
+
+#     # git revision
+#     url(r'^about', about_view),
+
+#     # pages
+#     url(r'^guild', guild_view),
+#     url(r'^freshmen', freshmen_view),
+#     url(r'^event_calendar', event_calendar_view),
+#     url(r'^international', international_view),
+#     url(r'^sosso', sosso_view),
+#     url(r'^contact', contact_view),
+
+#     # corporate
+#     url(r'^jobs', jobs_view),
+# ]
 
 
-if settings.DEBUG:
-    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-    urlpatterns += staticfiles_urlpatterns()
+# if settings.DEBUG:
+#     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+#     urlpatterns += staticfiles_urlpatterns()

webapp/views.py

@@ -1,22 +1,52 @@
 """Webapp views."""
 
-from django.db.models import Count
+# from django.db.models import Count
 from django.shortcuts import render, redirect
 from django.contrib.auth import login, logout, authenticate
 from django.views.decorators.http import require_http_methods
-from django.views.decorators.csrf import ensure_csrf_cookie
-from django.http import HttpResponse, HttpResponseRedirect
-from django.contrib.auth.decorators import permission_required, login_required
-from django.conf import settings
-from django.utils import timezone
+# from django.views.decorators.csrf import ensure_csrf_cookie
+# from django.http import HttpResponse, HttpResponseRedirect
+# from django.contrib.auth.decorators import permission_required, login_required
+# from django.conf import settings
+# from django.utils import timezone
+from rest_framework.decorators import api_view
+from rest_framework import viewsets
+# from rest_framework import permissions, authentication
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
 
-import logging
-import requests
+# import logging
+# import requests
 from dealer.git import git
 
-from webapp.models import Official, Committee
+from webapp.models import Event, SignupForm, Signup, Committee
+from webapp.serializers import EventSerializer, SignupFormSerializer, SignupSerializer
 from members.views.utils import *
 
+# -- REST API -- #
+
+
+@api_view(['GET'])
+def api_root(request, format=None):
+    return Response({'events': reverse('event-list', request=request, format=format), })
+
+
+class EventViewSet(viewsets.ModelViewSet):
+    queryset = Event.objects.all()
+    serializer_class = EventSerializer
+
+
+class SignupFormViewSet(viewsets.ModelViewSet):
+    queryset = SignupForm.objects.all()
+    serializer_class = SignupFormSerializer
+
+
+class SignupViewSet(viewsets.ModelViewSet):
+    queryset = Signup.objects.all()
+    serializer_class = SignupSerializer
+
+
+# -- OLD CODEBASE -- #
 
 @require_http_methods(["GET"])
 def main_index(request, *args, **kwargs):