delere userfriendship request model, add serializer, add perform_create in views

JoinTheCityREST/app/User/models.py

@@ -12,16 +12,10 @@ class UserFriendship(models.Model):
     friend = models.ForeignKey(User, related_name='user_friend',
                              blank=False, null=False, default=None)
 
-class UserFriendshipRequest(models.Model):
-    user = models.ForeignKey(User, related_name='user_friend_request_recived',
-                             blank=False, null=False, default=None)
-    creted_by = models.ForeignKey(User, related_name='user_friend_requeset_creator',
-                             blank=False, null=False, default=None)
-
 class UserEventRequest(models.Model):
     user = models.ForeignKey(User, related_name='user_event_request_recived',
                              blank=False, null=False, default=None)
-    creted_by = models.ForeignKey(User, related_name='user_event_requeset_creator',
+    created_by = models.ForeignKey(User, related_name='user_event_requeset_creator',
                              blank=False, null=False, default=None)
     event = models.ForeignKey(Event, related_name='event',
                              blank=False, null=False, default=None)

JoinTheCityREST/app/User/serializers.py

 from django.contrib.auth.models import User
 from rest_framework import serializers
-from app.Tag.models import Tag
-from app.User.models import UserFriendship, UserFriendshipRequest, UserAPI, UserEvent, UserEventRequest
+from app.Event.serializers import EventSerializer
+from app.User.models import UserFriendship, UserAPI, UserEvent, UserEventRequest
 
 
 class UserSerializer(serializers.HyperlinkedModelSerializer):
@@ -12,17 +12,12 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
 class UserFriendshipSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = UserFriendship
-        fields = ()
-
-class UserFriendshipRequestSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        model = UserFriendshipRequest
-        fields = ()
+        fields = ('url', 'friend')
 
 class UserEventRequestSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = UserEventRequest
-        fields = ()
+        fields = ('url', 'event', 'created_by')
 
 class UserAPISerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
@@ -32,4 +27,4 @@ class UserAPISerializer(serializers.HyperlinkedModelSerializer):
 class UserEventSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = UserEvent
-        fields = ('url', 'user', 'event')
\ No newline at end of file
+        fields = ('url', 'event')
\ No newline at end of file

JoinTheCityREST/app/User/views.py

 from django.contrib.auth.models import User
 from rest_framework import viewsets, permissions
-from app.User.models import UserFriendship, UserFriendshipRequest, UserAPI, UserEvent, UserEventRequest
-from app.User.serializers import UserFriendshipSerializer, UserFriendshipRequestSerializer, UserAPISerializer, \
+from app.User.models import UserFriendship, UserAPI, UserEvent, UserEventRequest
+from app.User.serializers import UserFriendshipSerializer, UserAPISerializer, \
     UserEventSerializer, UserEventRequestSerializer, UserSerializer
 
 
@@ -21,6 +21,9 @@ class UserFriendshipViewSet(viewsets.ModelViewSet):
     serializer_class = UserFriendshipSerializer
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
+    def perform_create(self, serializer):
+        serializer.save(user=self.request.user)
+
     def list(self, request):
         user = request.user
         queryset = UserFriendship.objects.filter(user=user).all()
@@ -28,20 +31,6 @@ class UserFriendshipViewSet(viewsets.ModelViewSet):
         serializer = UserFriendshipSerializer(page, many=True, context={'request': request})
         return self.get_paginated_response(serializer.data)
 
-class UserFriendshipRequestViewSet(viewsets.ModelViewSet):
-    """
-    User Friendships
-    """
-    queryset = UserFriendshipRequest.objects.all()
-    serializer_class = UserFriendshipRequestSerializer
-    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
-
-    def list(self, request):
-        user = request.user
-        queryset = UserFriendshipRequest.objects.filter(user=user).all()
-        page = self.paginate_queryset(queryset)
-        serializer = UserFriendshipRequestSerializer(page, many=True, context={'request': request})
-        return self.get_paginated_response(serializer.data)
 
 class UserEventRequestViewSet(viewsets.ModelViewSet):
     """
@@ -51,6 +40,9 @@ class UserEventRequestViewSet(viewsets.ModelViewSet):
     serializer_class = UserEventRequestSerializer
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
+    def perform_create(self, serializer):
+        serializer.save(user=self.request.user)
+
     def list(self, request):
         user = request.user
         queryset = UserEventRequest.objects.filter(user=user).all()
@@ -82,6 +74,9 @@ class UserEventViewSet(viewsets.ModelViewSet):
     serializer_class = UserEventSerializer
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
+    def perform_create(self, serializer):
+        serializer.save(user=self.request.user)
+
     def list(self, request):
         user = request.user
         queryset = UserEvent.objects.filter(user=user).all()