[MODIFIED] added video count, course section obj on video

vianhazman · Dec 10, 2019 · a76225f · a76225f
1 parent 52e9f28
commit a76225f
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 347 deletions.
diff --git a/config/nginx/django.conf b/config/nginx/django.conf
@@ -7,7 +7,7 @@ server {
 
     location /static/ {
         autoindex on;
-        alias /contentcs_service/staticfiles/;
+        alias /static/;
     }
 
     location /media/ {

diff --git a/contentcs_service/settings.py b/contentcs_service/settings.py
@@ -169,7 +169,7 @@
 # Heroku
 STATIC_URL = '/static/'
 PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
-STATIC_ROOT= os.path.join(PROJECT_ROOT,'staticfiles/')
+STATIC_ROOT= os.path.join(BASE_DIR,'static/')
 MEDIA_URL = '/src/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 

diff --git a/objects/migrations/0001_initial.py b/objects/migrations/0001_initial.py
diff --git a/objects/migrations/0002_auto_20191005_1036.py b/objects/migrations/0002_auto_20191005_1036.py
diff --git a/objects/migrations/0003_auto_20191012_0807.py b/objects/migrations/0003_auto_20191012_0807.py
diff --git a/objects/migrations/0004_auto_20191012_0820.py b/objects/migrations/0004_auto_20191012_0820.py
diff --git a/objects/migrations/0005_auto_20191012_1116.py b/objects/migrations/0005_auto_20191012_1116.py
diff --git a/objects/migrations/0006_auto_20191103_1344.py b/objects/migrations/0006_auto_20191103_1344.py
diff --git a/objects/migrations/0007_auto_20191103_1345.py b/objects/migrations/0007_auto_20191103_1345.py
diff --git a/objects/migrations/0008_auto_20191111_0917.py b/objects/migrations/0008_auto_20191111_0917.py
diff --git a/objects/migrations/0009_auto_20191111_1606.py b/objects/migrations/0009_auto_20191111_1606.py
diff --git a/objects/migrations/__init__.py b/objects/migrations/__init__.py
diff --git a/objects/serializers/__pycache__/course.cpython-35.pyc b/objects/serializers/__pycache__/course.cpython-35.pyc
diff --git a/objects/serializers/__pycache__/section.cpython-35.pyc b/objects/serializers/__pycache__/section.cpython-35.pyc
diff --git a/objects/serializers/__pycache__/video.cpython-35.pyc b/objects/serializers/__pycache__/video.cpython-35.pyc
diff --git a/objects/serializers.py → objects/serializers/course.py b/objects/serializers.py → objects/serializers/course.py
@@ -1,55 +1,27 @@
 from rest_framework import serializers
 
+from objects.serializers.section import SectionSerializer
 from userauth.models import UserProfile
-from .models import Course, Section, Video
+from objects.models import Course, Section, Video
 from userauth.serializers import UserProfileSerializers
 from django.forms.models import model_to_dict
 from userauth.constants import getAdminUser
-
-class VideoSerializer(serializers.ModelSerializer):
-
-    created_by_profile = serializers.SerializerMethodField('handle_admin', read_only=True)
-
-    def handle_admin(self, obj):
-        user = UserProfile.objects.filter(user=obj.created_by)
-        if user.count() == 1:
-            return UserProfileSerializers(user[0]).data
-        return getAdminUser(obj.created_by.id)
-
-    class Meta:
-        model = Video
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return Video.objects.create(**validated_data)
-
-
-class SectionSerializer(serializers.ModelSerializer):
-    videos = VideoSerializer(many=True, read_only=True, allow_null=True)
-    created_by_profile = serializers.SerializerMethodField('handle_admin', read_only=True)
-
-    def handle_admin(self, obj):
-        user = UserProfile.objects.filter(user=obj.created_by)
-        if user.count() == 1:
-            return UserProfileSerializers(user[0]).data
-        return getAdminUser(obj.created_by.id)
-
-    class Meta:
-        model = Section
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return Section.objects.create(**validated_data)
+from django.shortcuts import get_list_or_404, get_object_or_404
 
 class CourseSerializer(serializers.ModelSerializer):
     created_by_profile = serializers.SerializerMethodField('handle_admin',read_only=True)
+    no_of_videos = serializers.SerializerMethodField('get_video_count',read_only=True)
 
     def handle_admin(self, obj):
         user = UserProfile.objects.filter(user=obj.created_by)
         if user.count() == 1:
             return UserProfileSerializers(user[0]).data
         return getAdminUser(obj.created_by.id)
 
+    def get_video_count(self,obj):
+        section = obj.sections.all()
+        count = sum([i.videos.count() for i in section])
+        return count
     class Meta:
         model = Course
         fields = '__all__'
@@ -72,6 +44,4 @@ class Meta:
         fields = '__all__'
 
     def create(self, validated_data):
-        return Course.objects.create(**validated_data)
-
-
+        return Course.objects.create(**validated_data)
diff --git a/objects/serializers/section.py b/objects/serializers/section.py
@@ -0,0 +1,24 @@
+from rest_framework import serializers
+
+from objects.serializers.video import VideoSerializer
+from userauth.models import UserProfile
+from objects.models import Section
+from userauth.serializers import UserProfileSerializers
+from userauth.constants import getAdminUser
+
+class SectionSerializer(serializers.ModelSerializer):
+    videos = VideoSerializer(many=True, read_only=True, allow_null=True)
+    created_by_profile = serializers.SerializerMethodField('handle_admin', read_only=True)
+
+    def handle_admin(self, obj):
+        user = UserProfile.objects.filter(user=obj.created_by)
+        if user.count() == 1:
+            return UserProfileSerializers(user[0]).data
+        return getAdminUser(obj.created_by.id)
+
+    class Meta:
+        model = Section
+        fields = '__all__'
+
+    def create(self, validated_data):
+        return Section.objects.create(**validated_data)