Merge pull request #113 from goldenstar999/backend

added sub-skill video function on admin part

Author: ninjadev999

backend/talent_picture/admin.py

@@ -13,7 +13,10 @@ class TalentPictureAdmin(admin.ModelAdmin):
         'path',
         'size',
         'file_type',
-        'updated'
+        'updated',
+        'approved',
+        'approved_date',
+        'approved_by'
     )
     list_display_links = ('id', 'caption')
     list_per_page = 25

backend/talent_video_greeting/admin.py

@@ -12,15 +12,25 @@ class TalentVideoGreetingAdmin(admin.ModelAdmin):
             'priority',
             'file_type',
             'size',
-            'url')
+            'url',
+            'approved',
+            'approved_date',
+            'approved_by'
+        )
+
         list_display_links = (
             'id',
             'user_email_display',
             'priority',
             'language',
             'file_type',
             'size',
-            'url')
+            'url',
+            'approved',
+            'approved_date',
+            'approved_by'
+        )
+        
         list_per_page = 25
 
         def user_email_display(self, obj):

backend/talent_video_greeting/migrations/0004_auto_20190215_1721.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.0.5 on 2019-02-15 17:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('talent_video_greeting', '0003_auto_20181129_0153'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='talentvideogreeting',
+            name='approved',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='talentvideogreeting',
+            name='approved_by',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name='talentvideogreeting',
+            name='approved_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

backend/talent_video_greeting/models.py

@@ -15,6 +15,9 @@ class TalentVideoGreeting(models.Model):
     active = models.BooleanField(default=True)
     language = models.CharField(max_length=50, null=True, blank=True)
     priority = models.IntegerField(blank=True, default=100)
+    approved = models.BooleanField(default=False)
+    approved_date = models.DateTimeField(blank=True, null=True)
+    approved_by = models.CharField(max_length=50, null=True, blank=True)
 
     def __str__(self):
         return 'talent: {user_email}, language: {language}, video: {video_url}, {video_size}'.format(

backend/talent_video_greeting/serializers.py

@@ -20,5 +20,8 @@ class Meta:
             'uploaded',
             'active',
             'language',
-            'priority'
+            'priority',
+            'approved',
+            'approved_date',
+            'approved_by'
         )

backend/talent_video_greeting/views.py

@@ -16,6 +16,7 @@
 from .serializers import TalentVideoGreetingSerializer
 from talent.models import Talent
 from authentication.models import User
+from user_note.models import UserNoteManager
 
 
 class GreetingVideoFileUploadPolicy(APIView):
@@ -146,6 +147,17 @@ def post(self, request, *args, **kwargs):
             obj.save()
             data['id'] = obj.id
             data['saved'] = True
+
+            # Logging
+            talent_user = obj.talent.user
+            UserNoteManager.profile_logger(
+                None, None, talent_user,
+                '{user} uploaded a greetings video ({language}).'.format(
+                    user=talent_user.first_name,
+                    language=obj.language
+                ),
+                obj
+            )
         return Response(data, status=status.HTTP_200_OK)
 
 
@@ -184,10 +196,45 @@ def put(self, request, pk, format=None):
         serializer = TalentVideoGreetingSerializer(talent_greeting_video_item, data=request.data)
         if serializer.is_valid():
             serializer.save()
+
+            user = request.user
+            if user and 'approved' in serializer.data:
+                talent_user = talent_greeting_video_item.talent.user
+                UserNoteManager.profile_logger(
+                    None, user, talent_user, 
+                    'Greetings video ({language}) {status} by {user}.'.format(
+                        language=talent_greeting_video_item.language,
+                        status='Approved' if serializer.data['approved'] else 'Rejected',
+                        user=user.first_name
+                    ),
+                    talent_greeting_video_item
+                )
+
             return Response(serializer.data)
         return Response({'error': serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
 
     def delete(self, request, pk, format=None):
         talent_greeting_video_item = self.get_object(pk)
+
+        user = request.user
+        if user:
+            talent_user = talent_greeting_video_item.talent.user
+            note = ''
+            if user.type == 'agency':
+                note = 'Greeting video ({language}) {status} by {user}. Comment: {comment}'.format(
+                    language=talent_greeting_video_item.language,
+                    status='Rejected',
+                    user=user.first_name,
+                    comment= request.data['comment'] if request.data and ('comment' in request.data) else ''
+                )
+            elif user.type == 'talent':
+                note = '{user} removed a greeing video ({language}).'.format(
+                    user=user.first_name,
+                    language=talent_greeting_video_item.language,
+                )
+            
+            UserNoteManager.profile_logger(None, user, talent_user, note, talent_greeting_video_item)
+
         talent_greeting_video_item.delete()
+
         return Response(status=status.HTTP_204_NO_CONTENT)

backend/talent_video_sub_skill/admin.py

@@ -12,15 +12,25 @@ class TalentVideoSubSkillAdmin(admin.ModelAdmin):
             'priority',
             'file_type',
             'size',
-            'url')
+            'url',
+            'approved',
+            'approved_date',
+            'approved_by'
+        )
+
         list_display_links = (
             'id',
             'user_email_display',
             'sub_skill_display',
             'priority',
             'file_type',
             'size',
-            'url')
+            'url',
+            'approved',
+            'approved_date',
+            'approved_by'
+        )
+
         list_per_page = 25
 
         def sub_skill_display(self, obj):

backend/talent_video_sub_skill/migrations/0004_auto_20190217_1931.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.0.5 on 2019-02-17 19:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('talent_video_sub_skill', '0003_auto_20181129_0153'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='talentvideosubskill',
+            name='approved',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='talentvideosubskill',
+            name='approved_by',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name='talentvideosubskill',
+            name='approved_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

backend/talent_video_sub_skill/models.py

@@ -16,6 +16,9 @@ class TalentVideoSubSkill(models.Model):
     updated = models.DateTimeField(auto_now=True)
     uploaded = models.BooleanField(default=False)
     active = models.BooleanField(default=True)
+    approved = models.BooleanField(default=False)
+    approved_date = models.DateTimeField(blank=True, null=True)
+    approved_by = models.CharField(max_length=50, null=True, blank=True)
 
     def __str__(self):
         return 'talent: {user_email}, sub_skill: {sub_skill}, video: {video_url}, {video_size}'.format(

backend/talent_video_sub_skill/serializers.py

@@ -20,7 +20,10 @@ class Meta:
             'timestamp',
             'updated',
             'uploaded',
-            'active'
+            'active',
+            'approved',
+            'approved_date',
+            'approved_by'
         )
 
 

backend/talent_video_sub_skill/views.py

@@ -17,10 +17,12 @@
 from talent.models import Talent
 from authentication.models import User
 from sub_skill.models import SubSkill
+from user_note.models import UserNoteManager
 from drf_yasg.utils import swagger_auto_schema
 from drf_yasg import openapi
 from rest_framework.decorators import api_view
 
+
 class SubSkillVideoFileUploadPolicy(APIView):
     """
     This view is to get the AWS Upload Policy for images to s3 bucket.
@@ -143,7 +145,6 @@ def post(self, request, *args, **kwargs):
         course_obj = None
         data = {}
         type_ = request.data.get('fileType')
-        print(file_id, size, type_)
         if file_id:
             obj = TalentVideoSubSkill.objects.get(id=int(file_id))
             obj.size = int(size)
@@ -152,6 +153,18 @@ def post(self, request, *args, **kwargs):
             obj.save()
             data['id'] = obj.id
             data['saved'] = True
+            
+            # Logging
+            talent_user = obj.talent.user
+            UserNoteManager.profile_logger(
+                None, None, talent_user,
+                '{user} uploaded a sub skill video ({sub_skill_name}).'.format(
+                    user=talent_user.first_name,
+                    sub_skill_name=obj.sub_skill.name
+                ),
+                obj
+            )
+
         return Response(data, status=status.HTTP_200_OK)
 
 
@@ -173,7 +186,7 @@ def get(self, request, pk, format=None):
 
 class SubSkillVideoDetail(APIView):
     """
-    Retrieve a greeting video instance.
+    Retrieve a subskill video instance.
     """
     def get_object(self, pk):
         try:
@@ -191,12 +204,47 @@ def put(self, request, pk, format=None):
         serializer = TalentVideoSubSkillSerializer(talent_sub_skill_video_item, data=request.data)
         if serializer.is_valid():
             serializer.save()
+
+            user = request.user
+            if user and 'approved' in serializer.data:
+                talent_user = talent_sub_skill_video_item.talent.user
+                UserNoteManager.profile_logger(
+                    None, user, talent_user, 
+                    'A subskill video ({sub_skill_name}) {status} by {user}.'.format(
+                        sub_skill_name=talent_sub_skill_video_item.sub_skill.name,
+                        status='Approved' if serializer.data['approved'] else 'Rejected',
+                        user=user.first_name
+                    ),
+                    talent_sub_skill_video_item
+                )
+                
             return Response(serializer.data)
         return Response({'error': serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
 
     def delete(self, request, pk, format=None):
         talent_sub_skill_video_item = self.get_object(pk)
+
+        user = request.user
+        if user:
+            talent_user = talent_sub_skill_video_item.talent.user
+            note = ''
+            if user.type == 'agency':
+                note = 'Greeting video ({sub_skill_name}) {status} by {user}. Comment: {comment}'.format(
+                    sub_skill_name=talent_sub_skill_video_item.sub_skill.name,
+                    status='Rejected',
+                    user=user.first_name,
+                    comment= request.data['comment'] if request.data and ('comment' in request.data) else ''
+                )
+            elif user.type == 'talent':
+                note = '{user} removed a greeing video ({sub_skill_name}).'.format(
+                    user=user.first_name,
+                    sub_skill_name=talent_sub_skill_video_item.sub_skill.name,
+                )
+            
+            UserNoteManager.profile_logger(None, user, talent_user, note, talent_sub_skill_video_item)
+
         talent_sub_skill_video_item.delete()
+
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

backend/user_note/migrations/0004_auto_20190215_1721.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.5 on 2019-02-15 17:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_note', '0003_auto_20190214_0209'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usernote',
+            name='note_type',
+            field=models.CharField(choices=[('Profile', 'Profile'), ('CastingRequest', 'CastingRequest'), ('CastingRequestTalent', 'CastingRequestTalent'), ('Search', 'Search'), ('View', 'View'), ('Favorite', 'Favorite'), ('Share', 'Share'), ('Block', 'Block'), ('MedicalCondition', 'MedicalCondition'), ('Medical', 'Medical'), ('Login', 'Login'), ('Logout', 'Logout'), ('TID', 'TID'), ('ChangePassword', 'ChangePassword'), ('Rating', 'Rating'), ('PersonalInfo', 'PersonalInfo'), ('Immigration', 'Immigration'), ('Language', 'Language')], default='Profile', max_length=30),
+        ),
+    ]

frontend/src/apis/adminAPIs.js

@@ -112,5 +112,20 @@ class AdminAPI {
     this.processRequestWithToken(`agency/casting_request/set_status/${castingRequestId}`, 'put', data, handleResponse);
   }
 
+  static saveGreetingVideo(videoId, data, handleResponse) {
+    this.processRequestWithToken(`talent_video_greetings/${videoId}`, 'put', data, handleResponse);
+  }
+
+  static deleteGreetingVideo(videoId, data, handleResponse) {
+    this.processRequestWithToken(`talent_video_greetings/${videoId}`, 'delete', data, handleResponse);
+  }
+
+  static saveSubSkillVideo(videoId, data, handleResponse) {
+    this.processRequestWithToken(`talent_video_sub_skills/${videoId}`, 'put', data, handleResponse);
+  }
+
+  static deleteSubSkillVideo(videoId, data, handleResponse) {
+    this.processRequestWithToken(`talent_video_sub_skills/${videoId}`, 'delete', data, handleResponse);
+  }
 }
 export default AdminAPI