Merge pull request #112 from goldenstar999/backend

added logging function and updated admin part

Author: ninjadev999

backend/.idea/workspace.xml

@@ -5,6 +5,7 @@
 from casting_request_talent.models import CastingRequestTalent
 from casting_request_talent.details_by_talent_serializers import CastingRequestTalentDetailByTalentSerializer
 from agency.casting_request_serializers import CastingRequestSearchSerializer, CastingRequestSetStatusSerializer
+from user_note.models import UserNoteManager
 from django.http import Http404
 from rest_framework.views import APIView
 from rest_framework.response import Response
@@ -57,13 +58,32 @@ def put(self, request, pk, format=None):
         serializer = CastingRequestSerializer(casting_request, data=request.data)
         if serializer.is_valid():
             serializer.save()
+
+            agency = request.user
+            client_user = casting_request.client.user
+            UserNoteManager.casting_request_logger(
+                agency, agency, client_user, 
+                'updated casting reqeust.',
+                casting_request
+            )
+
             return Response(serializer.data)
         return Response({'error': serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
 
     @swagger_auto_schema(responses={200: 'OK'})
     def delete(self, request, pk, format=None):
         casting_request = self.get_object(pk)
+
+        agency = request.user
+        client_user = casting_request.client.user
+        UserNoteManager.casting_request_logger(
+            agency, agency, client_user, 
+            'deteled casting reqeust.',
+            casting_request
+        )
+
         casting_request.delete()
+
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -82,12 +102,39 @@ def get_object(self, pk):
     def put(self, request, pk, format=None):
         casting_request = self.get_object(pk)
 
-        CastingRequestSerializer
         serializer = CastingRequestSetStatusSerializer(casting_request, data=request.data)
         if serializer.is_valid():
             casting_request.status = request.data['status']
             casting_request.status_updated_date = request.data['status_updated_date']
             casting_request.save()
+
+            agency_user = request.user
+            if agency_user:
+                client_user = casting_request.client.user
+                status = casting_request.status
+                if status == 'Requested':
+                    note = '{client_user} requested.'.format(client_user=client_user.first_name)
+                elif status == 'Reviewing':
+                    note = 'Reviewing'
+                elif status == 'In Progress':
+                    note = 'Contracted to confirm request.'
+                elif status == 'Accepted.':
+                    note = 'Accepted'
+                elif status == 'Declined.':
+                    note = 'Declined'
+                elif status == 'Canceled.':
+                    note = '{client_user} canceled.'.format(client_user=client_user)
+                elif status == 'Completed':
+                    note = 'Completed.'
+
+                UserNoteManager.casting_request_logger(agency_user.first_name, client_user, client_user, note, casting_request)
+
+                casting_request_talents = CastingRequestTalent.objects.filter(casting_request=casting_request)
+                if len(casting_request_talents) > 0:
+                    for casting_request_talent in casting_request_talents:
+                        talent_user = casting_request_talent.talent.user
+                        UserNoteManager.casting_request_talent_logger(agency_user.first_name, client_user, talent_user, note, casting_request_talent)
+                    
             new_serializer = CastingRequestDetailSerializer(casting_request)
             return Response(new_serializer.data)
             # serializer.save()

backend/agency/casting_request_views.py

@@ -1,26 +1,11 @@
 from django.conf.urls import include, url
 
-from rest_framework_jwt.views import obtain_jwt_token
-from rest_framework_jwt.views import obtain_jwt_token
 from rest_framework_jwt.views import refresh_jwt_token
 from rest_framework_jwt.views import verify_jwt_token
-
-from rest_framework import status
-from rest_framework.views import APIView
-from rest_framework.authtoken.views import ObtainAuthToken
-from rest_framework.authtoken.models import Token
-from rest_framework.response import Response
-from rest_framework.permissions import AllowAny
 from rest_framework.routers import DefaultRouter
 from .serializers import RegistrationSerializer
 from .models import User
-from .views import RegistrationAPIView, RegisterViewSet
-from rest_framework_jwt.settings import api_settings
-from drf_yasg.utils import swagger_auto_schema
-
-jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
-jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER
-
+from .views import RegistrationAPIView, RegisterViewSet, CustomAuthToken, Logout
 
 
 router = DefaultRouter()
@@ -30,25 +15,9 @@
     'post': 'create'
 })
 
-
-class CustomAuthToken(ObtainAuthToken):
-
-    def post(self, request, *args, **kwargs):
-        serializer = self.serializer_class(
-            data=request.data,
-            context={'request': request}
-        )
-        serializer.is_valid(raise_exception=True)
-        user = serializer.validated_data['user']
-        payload = jwt_payload_handler(user)
-        payload['type'] = user.type
-        token = jwt_encode_handler(payload)
-        return Response({'token': token})
-
-
 urlpatterns = [
     url(r'^login/', CustomAuthToken.as_view()), #obtain_jwt_token
-    url(r'^logout/', refresh_jwt_token),
+    url(r'^logout/', Logout.as_view()), #refresh_jwt_token
     url(r'^token/refresh/', refresh_jwt_token),
     url(r'^token/verify/', verify_jwt_token),
     url(r'^register', register, name='register')

backend/authentication/urls.py

@@ -1,15 +1,24 @@
+from .models import User
+from .serializers import RegistrationSerializer
+from user_note.models import UserNoteManager
+from talent.models import Talent
 from django.shortcuts import render
-
-# Create your views here.
+from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import status
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from rest_framework.authtoken.views import ObtainAuthToken
 from rest_framework.decorators import api_view
 from rest_framework import viewsets
-from .models import User
-from .serializers import RegistrationSerializer
-from talent.models import Talent
+from rest_framework_jwt.settings import api_settings
+from rest_framework.authtoken.models import Token
+from rest_framework.permissions import AllowAny
+from datetime import datetime
+from pytz import timezone
+
+jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
+jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER
 
 
 class RegisterViewSet(viewsets.ModelViewSet):
@@ -44,4 +53,40 @@ def post(self, request):
 
         # return super(RegistrationAPIView, self).post(request, *args, **kwargs)
 
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+
+class CustomAuthToken(ObtainAuthToken):
+    def post(self, request, *args, **kwargs):
+        serializer = self.serializer_class(
+            data=request.data,
+            context={'request': request}
+        )
+        serializer.is_valid(raise_exception=True)
+        user = serializer.validated_data['user']
+        payload = jwt_payload_handler(user)
+        payload['type'] = user.type
+        token = jwt_encode_handler(payload)
+        UserNoteManager.login_logger(
+            None, None, user, 
+            '{now} logged in'.format(now=UserNoteManager.get_current_time()),
+            user
+        )
+        return Response({'token': token})
+
+
+class Logout(APIView):
+    def post(self, request, *args, **kwargs):
+        # simply delete the token to force a login
+        user = request.user
+        UserNoteManager.logout_logger(
+            None, None, user, 
+            '{now} logged out'.format(now=UserNoteManager.get_current_time()),
+            user
+        )
+        try:
+            user.auth_token.delete()
+        except (AttributeError, ObjectDoesNotExist):
+            pass
+        
+        return Response(status=status.HTTP_200_OK)

backend/authentication/views.py

@@ -3,6 +3,7 @@
 from casting_request.models import CastingRequest
 from casting_request.serializers import CastingRequestSerializer, CastingRequestCreateSerializer
 from casting_request.detail_serializers import  CastingRequestDetailSerializer
+from user_note.models import UserNoteManager
 from django.http import Http404
 from rest_framework.views import APIView
 from rest_framework.response import Response
@@ -46,13 +47,27 @@ def put(self, request, pk, format=None):
         serializer = CastingRequestSerializer(casting_request, data=request.data)
         if serializer.is_valid():
             serializer.save()
+            user = request.user
+            if user:
+                note = '{client} updated casting reqeust.'.format(client=user.first_name)
+                if casting_request.status == 'Requested':
+                    note = '{client} submited.'.format(client=user.first_name)
+                UserNoteManager.casting_request_logger(None, None, user, note, casting_request)
+                
             return Response(serializer.data)
         return Response({'error': serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
 
     @swagger_auto_schema(responses={200: 'OK'})
     def delete(self, request, pk, format=None):
         casting_request = self.get_object(pk)
         casting_request.delete()
+        user = request.user
+        if user:
+            UserNoteManager.casting_request_logger(
+                None, None, user, 
+                '{client} deleted this casting reqeust.'.format(client=user.first_name),
+                casting_request
+            )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -93,6 +108,14 @@ def post(self, request, format=None):
                 comments=data['comments']
             )
             new_casting_request.save()
+            UserNoteManager.casting_request_logger(
+                None, None, client.user, 
+                '{client} created a new casting reqeust.'.format(
+                    client=client.user.first_name,
+                    casting_request_id=new_casting_request.id
+                ), 
+                new_casting_request
+            )
 
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response({'error': serializer.errors}, status=status.HTTP_400_BAD_REQUEST)