From 2d7c9d779ab815653d6aa08ec03f5b7617f909b2 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Wed, 18 Jul 2018 18:37:01 +0300
Subject: [PATCH] Feed API added

---
 webapp/serializers.py |  7 +++++++
 webapp/urls.py        |  4 +++-
 webapp/views.py       | 16 ++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/webapp/serializers.py b/webapp/serializers.py
index 1e9745f..5e5d9ec 100644
--- a/webapp/serializers.py
+++ b/webapp/serializers.py
@@ -40,3 +40,10 @@ class SignupSerializer(serializers.ModelSerializer):
                 'view_name': 'signup-detail',
             }
         }
+
+
+class FeedSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Feed
+        fields = ('id', 'tags', 'visible', 'title', 'description',
+                  'content', 'publish_time', 'autohide')
diff --git a/webapp/urls.py b/webapp/urls.py
index dfd12a9..70b1fdc 100644
--- a/webapp/urls.py
+++ b/webapp/urls.py
@@ -18,12 +18,14 @@ from webapp.views import logout_view
 # from webapp.views import sosso_view
 # from webapp.views import contact_view
 
-from webapp.views import EventViewSet, SignupFormViewSet, SignupViewSet
+from webapp.views import EventViewSet, SignupFormViewSet, SignupViewSet,\
+    FeedViewSet
 
 router = routers.DefaultRouter()
 router.register(r'events', EventViewSet)
 router.register(r'signupForm', SignupFormViewSet)
 router.register(r'signup', SignupViewSet)
+router.register(r'feed', FeedViewSet)
 
 urlpatterns = [
     url(r'^', include(router.urls)),
diff --git a/webapp/views.py b/webapp/views.py
index 2b364fa..be0f932 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -19,18 +19,13 @@ from rest_framework.reverse import reverse
 # import requests
 from dealer.git import git
 
-from webapp.models import Event, SignupForm, Signup, Committee
-from webapp.serializers import EventSerializer, SignupFormSerializer, SignupSerializer
+from webapp.models import Event, SignupForm, Signup, Committee, Feed
+from webapp.serializers import *
 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
@@ -46,6 +41,11 @@ class SignupViewSet(viewsets.ModelViewSet):
     serializer_class = SignupSerializer
 
 
+class FeedViewSet(viewsets.ModelViewSet):
+    queryset = Feed.objects.all()
+    serializer_class = FeedSerializer
+
+
 # -- OLD CODEBASE -- #
 
 @require_http_methods(["GET"])
@@ -95,7 +95,7 @@ def about_view(request, *args, **kwargs):
         latest_commit = repo.git("rev-parse HEAD").decode('utf-8')
         latest_date = repo.git("show -s --format=%ci " + latest_commit).decode('utf-8')
         latest_tag = repo.git("describe --tags " + repo.git("rev-list --tags --max-count=1").decode('utf-8')).decode('utf-8')
-    except:
+    except Exception:
         pass
 
     context = {