From 05e9bac50a35c09b09cf66a362fb367046033b1e Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 30 Jun 2021 17:03:15 +0530 Subject: [PATCH 01/12] separate forum app --- forum/__init__.py | 0 forum/admin.py | 7 + forum/apps.py | 5 + forum/forms.py | 43 +++++ forum/models.py | 64 ++++++++ forum/tests.py | 3 + forum/urls.py | 33 ++++ forum/views.py | 155 ++++++++++++++++++ yaksh/admin.py | 4 +- yaksh/forms.py | 44 +---- yaksh/models.py | 60 +------ .../yaksh/course_detail_options.html | 2 +- yaksh/templates/yaksh/course_forum.html | 6 +- yaksh/templates/yaksh/course_modules.html | 2 +- yaksh/templates/yaksh/lessons_forum.html | 4 +- yaksh/templates/yaksh/post_comments.html | 6 +- yaksh/templates/yaksh/show_video.html | 2 +- yaksh/templates/yaksh/sidebar.html | 4 +- yaksh/views.py | 148 +---------------- 19 files changed, 331 insertions(+), 261 deletions(-) create mode 100644 forum/__init__.py create mode 100644 forum/admin.py create mode 100644 forum/apps.py create mode 100644 forum/forms.py create mode 100644 forum/models.py create mode 100644 forum/tests.py create mode 100644 forum/urls.py create mode 100644 forum/views.py diff --git a/forum/__init__.py b/forum/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/forum/admin.py b/forum/admin.py new file mode 100644 index 000000000..63ad5a5c6 --- /dev/null +++ b/forum/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + +from .models import Post, Comment + +# Register your models here. +admin.site.register(Post) +admin.site.register(Comment) \ No newline at end of file diff --git a/forum/apps.py b/forum/apps.py new file mode 100644 index 000000000..99ee7e7e9 --- /dev/null +++ b/forum/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ForumConfig(AppConfig): + name = 'forum' diff --git a/forum/forms.py b/forum/forms.py new file mode 100644 index 000000000..305c54f17 --- /dev/null +++ b/forum/forms.py @@ -0,0 +1,43 @@ +from django import forms + +from .models import Post, Comment + +class PostForm(forms.ModelForm): + class Meta: + model = Post + fields = ["title", "description", "image", "anonymous"] + widgets = { + 'title': forms.TextInput( + attrs={ + 'class': 'form-control' + } + ), + 'description': forms.Textarea( + attrs={ + 'class': 'form-control' + } + ), + 'image': forms.FileInput( + attrs={ + 'class': 'form-control-file' + } + ) + } + + +class CommentForm(forms.ModelForm): + class Meta: + model = Comment + fields = ["description", "image", "anonymous"] + widgets = { + 'description': forms.Textarea( + attrs={ + 'class': 'form-control' + } + ), + 'image': forms.FileInput( + attrs={ + 'class': 'form-control-file' + } + ) + } diff --git a/forum/models.py b/forum/models.py new file mode 100644 index 000000000..46c8a2530 --- /dev/null +++ b/forum/models.py @@ -0,0 +1,64 @@ +import uuid + +from django.db import models +from django.contrib.contenttypes.models import ContentType +from django.contrib.auth.models import User +from django.contrib.contenttypes.fields import ( + GenericForeignKey, GenericRelation +) + + +def validate_image(image): + file_size = image.file.size + limit_mb = 30 + if file_size > limit_mb * 1024 * 1024: + raise ValidationError("Max size of file is {0} MB".format(limit_mb)) + + +def get_image_dir(instance, filename): + return os.sep.join(( + 'post_%s' % (instance.uid), filename + )) + + +class ForumBase(models.Model): + uid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False) + creator = models.ForeignKey(User, on_delete=models.CASCADE) + description = models.TextField() + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) + image = models.ImageField(upload_to=get_image_dir, blank=True, + null=True, validators=[validate_image]) + active = models.BooleanField(default=True) + anonymous = models.BooleanField(default=False) + + +class Post(ForumBase): + title = models.CharField(max_length=200) + target_ct = models.ForeignKey(ContentType, + blank=True, + null=True, + related_name='target_obj', + on_delete=models.CASCADE) + target_id = models.PositiveIntegerField(null=True, + blank=True, + db_index=True) + target = GenericForeignKey('target_ct', 'target_id') + + def __str__(self): + return self.title + + def get_last_comment(self): + return self.comment.last() + + def get_comments_count(self): + return self.comment.filter(active=True).count() + + +class Comment(ForumBase): + post_field = models.ForeignKey(Post, on_delete=models.CASCADE, + related_name='comment') + + def __str__(self): + return 'Comment by {0}: {1}'.format(self.creator.username, + self.post_field.title) \ No newline at end of file diff --git a/forum/tests.py b/forum/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/forum/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/forum/urls.py b/forum/urls.py new file mode 100644 index 000000000..8c360f96a --- /dev/null +++ b/forum/urls.py @@ -0,0 +1,33 @@ +from django.conf.urls import url +from django.urls import path +from forum import views + +app_name = 'forum' + +urlpatterns = [ + url( + r'^course_forum/(?P\d+)/$', + views.course_forum, + name='course_forum' + ), + url( + r'^lessons_forum/(?P\d+)/$', + views.lessons_forum, + name='lessons_forum' + ), + url( + r'^(?P\d+)/post/(?P[0-9a-f-]+)/$', + views.post_comments, + name='post_comments' + ), + url( + r'^(?P\d+)/post/(?P[0-9a-f-]+)/delete/', + views.hide_post, + name='hide_post' + ), + url( + r'^(?P\d+)/comment/(?P[0-9a-f-]+)/delete/', + views.hide_comment, + name='hide_comment' + ), +] \ No newline at end of file diff --git a/forum/views.py b/forum/views.py new file mode 100644 index 000000000..38a6d5975 --- /dev/null +++ b/forum/views.py @@ -0,0 +1,155 @@ +from django.shortcuts import render, redirect +from django.contrib.contenttypes.models import ContentType +from django.contrib.auth.decorators import login_required +from django.shortcuts import render, get_object_or_404 +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.contrib import messages + +from yaksh.models import Course +from yaksh.views import is_moderator +from yaksh.decorators import email_verified, has_profile + +from .models import Post, Comment +from .forms import PostForm, CommentForm + + +@login_required +@email_verified +def course_forum(request, course_id): + user = request.user + base_template = 'user.html' + moderator = False + if is_moderator(user): + base_template = 'manage.html' + moderator = True + course = get_object_or_404(Course, id=course_id) + course_ct = ContentType.objects.get_for_model(course) + if (not course.is_creator(user) and not course.is_teacher(user) + and not course.is_student(user)): + raise Http404('You are not enrolled in {0} course'.format(course.name)) + search_term = request.GET.get('search_post') + if search_term: + posts = Post.objects.filter( + Q(title__icontains=search_term) | + Q(description__icontains=search_term), + target_ct=course_ct, target_id=course.id, active=True + ) + else: + posts = Post.objects.filter( + target_ct=course_ct, target_id=course.id, active=True + ).order_by('-modified_at') + paginator = Paginator(posts, 10) + page = request.GET.get('page') + posts = paginator.get_page(page) + if request.method == "POST": + form = PostForm(request.POST, request.FILES) + if form.is_valid(): + new_post = form.save(commit=False) + new_post.creator = user + new_post.target = course + new_post.anonymous = request.POST.get('anonymous', '') == 'on' + new_post.save() + messages.success(request, "Added post successfully") + return redirect('forum:post_comments', + course_id=course.id, uuid=new_post.uid) + else: + form = PostForm() + return render(request, 'yaksh/course_forum.html', { + 'user': user, + 'course': course, + 'base_template': base_template, + 'moderator': moderator, + 'objects': posts, + 'form': form, + 'user': user + }) + + +@login_required +@email_verified +def lessons_forum(request, course_id): + user = request.user + base_template = 'user.html' + moderator = False + if is_moderator(user): + base_template = 'manage.html' + moderator = True + course = get_object_or_404(Course, id=course_id) + course_ct = ContentType.objects.get_for_model(course) + lesson_posts = course.get_lesson_posts() + return render(request, 'yaksh/lessons_forum.html', { + 'user': user, + 'base_template': base_template, + 'moderator': moderator, + 'course': course, + 'posts': lesson_posts, + }) + + +@login_required +@email_verified +def post_comments(request, course_id, uuid): + user = request.user + base_template = 'user.html' + if is_moderator(user): + base_template = 'manage.html' + post = get_object_or_404(Post, uid=uuid) + comments = post.comment.filter(active=True) + course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user) + and not course.is_student(user)): + raise Http404('You are not enrolled in {0} course'.format(course.name)) + form = CommentForm() + if request.method == "POST": + form = CommentForm(request.POST, request.FILES) + if form.is_valid(): + new_comment = form.save(commit=False) + new_comment.creator = request.user + new_comment.post_field = post + new_comment.anonymous = request.POST.get('anonymous', '') == 'on' + new_comment.save() + messages.success(request, "Added comment successfully") + return redirect(request.path_info) + return render(request, 'yaksh/post_comments.html', { + 'post': post, + 'comments': comments, + 'base_template': base_template, + 'form': form, + 'user': user, + 'course': course + }) + + +@login_required +@email_verified +def hide_post(request, course_id, uuid): + user = request.user + course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user)): + raise Http404( + 'Only a course creator or a teacher can delete the post.' + ) + post = get_object_or_404(Post, uid=uuid) + post.comment.active = False + post.active = False + post.save() + messages.success(request, "Post deleted successfully") + return redirect('forum:course_forum', course_id) + + +@login_required +@email_verified +def hide_comment(request, course_id, uuid): + user = request.user + if course_id: + course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user)): + raise Http404( + 'Only a course creator or a teacher can delete the comments' + ) + comment = get_object_or_404(Comment, uid=uuid) + post_uid = comment.post_field.uid + comment.active = False + comment.save() + messages.success(request, "Post comment deleted successfully") + return redirect('forum:post_comments', course_id, post_uid) \ No newline at end of file diff --git a/yaksh/admin.py b/yaksh/admin.py index 101053691..14599bc7a 100644 --- a/yaksh/admin.py +++ b/yaksh/admin.py @@ -1,7 +1,7 @@ from yaksh.models import Question, Quiz, QuestionPaper, Profile from yaksh.models import (TestCase, StandardTestCase, StdIOBasedTestCase, Course, AnswerPaper, CourseStatus, LearningModule, - Lesson, Post, Comment, Topic, TableOfContents, + Lesson, Topic, TableOfContents, LessonQuizAnswer, Answer, AssignmentUpload ) from django.contrib import admin @@ -49,8 +49,6 @@ class QuizAdmin(admin.ModelAdmin): admin.site.register(Profile, ProfileAdmin) admin.site.register(Question) admin.site.register(TestCase) -admin.site.register(Post) -admin.site.register(Comment) admin.site.register(StandardTestCase) admin.site.register(StdIOBasedTestCase) admin.site.register(Course, CourseAdmin) diff --git a/yaksh/forms.py b/yaksh/forms.py index 01e691d50..b5b54cdf0 100644 --- a/yaksh/forms.py +++ b/yaksh/forms.py @@ -1,8 +1,7 @@ from django import forms from yaksh.models import ( get_model_class, Profile, Quiz, Question, Course, QuestionPaper, Lesson, - LearningModule, TestCase, languages, question_types, Post, Comment, - Topic + LearningModule, TestCase, languages, question_types, Topic ) from grades.models import GradingSystem from django.contrib.auth import authenticate @@ -627,47 +626,6 @@ class Meta: fields = ["type"] -class PostForm(forms.ModelForm): - class Meta: - model = Post - fields = ["title", "description", "image", "anonymous"] - widgets = { - 'title': forms.TextInput( - attrs={ - 'class': 'form-control' - } - ), - 'description': forms.Textarea( - attrs={ - 'class': 'form-control' - } - ), - 'image': forms.FileInput( - attrs={ - 'class': 'form-control-file' - } - ) - } - - -class CommentForm(forms.ModelForm): - class Meta: - model = Comment - fields = ["description", "image", "anonymous"] - widgets = { - 'description': forms.Textarea( - attrs={ - 'class': 'form-control' - } - ), - 'image': forms.FileInput( - attrs={ - 'class': 'form-control-file' - } - ) - } - - class TopicForm(forms.ModelForm): timer = forms.CharField() diff --git a/yaksh/models.py b/yaksh/models.py index 8e5562b3d..f890d2d72 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -55,7 +55,7 @@ from yaksh.settings import SERVER_POOL_PORT, SERVER_HOST_NAME from .file_utils import extract_files, delete_files from grades.models import GradingSystem - +from forum.models import Post languages = ( ("python", "Python"), @@ -251,20 +251,7 @@ def render_template(template_path, data=None): context = Context(data) render = template.render(context) return render - - -def validate_image(image): - file_size = image.file.size - limit_mb = 30 - if file_size > limit_mb * 1024 * 1024: - raise ValidationError("Max size of file is {0} MB".format(limit_mb)) - - -def get_image_dir(instance, filename): - return os.sep.join(( - 'post_%s' % (instance.uid), filename - )) - + def is_valid_time_format(time): try: @@ -2851,49 +2838,6 @@ class TestCaseOrder(models.Model): ############################################################################## -class ForumBase(models.Model): - uid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False) - creator = models.ForeignKey(User, on_delete=models.CASCADE) - description = models.TextField() - created_at = models.DateTimeField(auto_now_add=True) - modified_at = models.DateTimeField(auto_now=True) - image = models.ImageField(upload_to=get_image_dir, blank=True, - null=True, validators=[validate_image]) - active = models.BooleanField(default=True) - anonymous = models.BooleanField(default=False) - - -class Post(ForumBase): - title = models.CharField(max_length=200) - target_ct = models.ForeignKey(ContentType, - blank=True, - null=True, - related_name='target_obj', - on_delete=models.CASCADE) - target_id = models.PositiveIntegerField(null=True, - blank=True, - db_index=True) - target = GenericForeignKey('target_ct', 'target_id') - - def __str__(self): - return self.title - - def get_last_comment(self): - return self.comment.last() - - def get_comments_count(self): - return self.comment.filter(active=True).count() - - -class Comment(ForumBase): - post_field = models.ForeignKey(Post, on_delete=models.CASCADE, - related_name='comment') - - def __str__(self): - return 'Comment by {0}: {1}'.format(self.creator.username, - self.post_field.title) - - class TOCManager(models.Manager): def get_data(self, course_id, lesson_id): diff --git a/yaksh/templates/yaksh/course_detail_options.html b/yaksh/templates/yaksh/course_detail_options.html index 0910c01fa..ad2c57430 100644 --- a/yaksh/templates/yaksh/course_detail_options.html +++ b/yaksh/templates/yaksh/course_detail_options.html @@ -63,7 +63,7 @@
  • Create a new Post
    - +  Clear Search
    @@ -114,7 +114,7 @@

    Create a new Post

    {% for post in posts %} - {{post.title}} + {{post.title}} {{ post.description|truncatewords:10 }} Last updated: {{post.modified_at}} @@ -137,7 +137,7 @@

    Create a new Post

    {% if user == course.creator or user in course.get_teachers %} - + {% endif %} diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html index 39b9c9763..8d9982708 100644 --- a/yaksh/templates/yaksh/course_modules.html +++ b/yaksh/templates/yaksh/course_modules.html @@ -7,7 +7,7 @@
    {{ course.name }} - Discussion Forum + Discussion Forum
    {% if course.view_grade %} diff --git a/yaksh/templates/yaksh/lessons_forum.html b/yaksh/templates/yaksh/lessons_forum.html index 070738fa3..c5b023e4c 100644 --- a/yaksh/templates/yaksh/lessons_forum.html +++ b/yaksh/templates/yaksh/lessons_forum.html @@ -61,7 +61,7 @@

    {{course.name}}

    {% for post in posts %} - {{post.title}} + {{post.title}} {{ post.description|safe|truncatewords:10 }} Last updated: {{post.modified_at}} @@ -84,7 +84,7 @@

    {{course.name}}

    {% if user == course.creator or user in course.get_teachers %} - + {% endif %} diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html index 17576b8f1..2a28a63e9 100644 --- a/yaksh/templates/yaksh/post_comments.html +++ b/yaksh/templates/yaksh/post_comments.html @@ -6,7 +6,7 @@ {% block content %}
    - +  Back to Posts
    @@ -38,7 +38,7 @@ {% endif %} {{post.created_at}} - {% if user == course.creator or user in course.get_teachers %}{% endif %} + {% if user == course.creator or user in course.get_teachers %}{% endif %}
    @@ -77,7 +77,7 @@
    - {{comment.created_at}} {% if user == course.creator or user in course.get_teachers %} {% endif %} + {{comment.created_at}} {% if user == course.creator or user in course.get_teachers %} {% endif %}

    {{comment.description|safe}}

    diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html index faa773511..10854f024 100644 --- a/yaksh/templates/yaksh/show_video.html +++ b/yaksh/templates/yaksh/show_video.html @@ -262,7 +262,7 @@
    - {{comment.created_at}} {% if user.profile.is_moderator %} {% endif %} + {{comment.created_at}} {% if user.profile.is_moderator %} {% endif %}

    {{comment.description|safe}}

    diff --git a/yaksh/templates/yaksh/sidebar.html b/yaksh/templates/yaksh/sidebar.html index f6edc7f14..973194431 100644 --- a/yaksh/templates/yaksh/sidebar.html +++ b/yaksh/templates/yaksh/sidebar.html @@ -2,12 +2,12 @@
    • - + Course Forum
    • - + Lessons Forum
      • diff --git a/yaksh/views.py b/yaksh/views.py index 37275149a..936b6c6f2 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -42,17 +42,19 @@ QuestionPaper, QuestionSet, Quiz, Question, StandardTestCase, StdIOBasedTestCase, StringTestCase, TestCase, User, get_model_class, FIXTURES_DIR_PATH, MOD_GROUP_NAME, Lesson, LessonFile, - LearningUnit, LearningModule, CourseStatus, question_types, Post, Comment, + LearningUnit, LearningModule, CourseStatus, question_types, Topic, TableOfContents, LessonQuizAnswer, MicroManager, QRcode, QRcodeHandler, dict_to_yaml ) from stats.models import TrackLesson +from forum.models import Post +from forum.forms import CommentForm from yaksh.forms import ( UserRegisterForm, UserLoginForm, QuizForm, QuestionForm, QuestionFilterForm, CourseForm, ProfileForm, UploadFileForm, FileForm, QuestionPaperForm, LessonForm, LessonFileForm, LearningModuleForm, ExerciseForm, TestcaseForm, - SearchFilterForm, PostForm, CommentForm, TopicForm, VideoQuizForm + SearchFilterForm, TopicForm, VideoQuizForm ) from yaksh.settings import SERVER_POOL_PORT, SERVER_HOST_NAME from .settings import URL_ROOT @@ -3449,148 +3451,6 @@ def mark_notification(request, message_uid=None): return redirect(reverse("yaksh:view_notifications")) -@login_required -@email_verified -def course_forum(request, course_id): - user = request.user - base_template = 'user.html' - moderator = False - if is_moderator(user): - base_template = 'manage.html' - moderator = True - course = get_object_or_404(Course, id=course_id) - course_ct = ContentType.objects.get_for_model(course) - if (not course.is_creator(user) and not course.is_teacher(user) - and not course.is_student(user)): - raise Http404('You are not enrolled in {0} course'.format(course.name)) - search_term = request.GET.get('search_post') - if search_term: - posts = Post.objects.filter( - Q(title__icontains=search_term) | - Q(description__icontains=search_term), - target_ct=course_ct, target_id=course.id, active=True - ) - else: - posts = Post.objects.filter( - target_ct=course_ct, target_id=course.id, active=True - ).order_by('-modified_at') - paginator = Paginator(posts, 10) - page = request.GET.get('page') - posts = paginator.get_page(page) - if request.method == "POST": - form = PostForm(request.POST, request.FILES) - if form.is_valid(): - new_post = form.save(commit=False) - new_post.creator = user - new_post.target = course - new_post.anonymous = request.POST.get('anonymous', '') == 'on' - new_post.save() - messages.success(request, "Added post successfully") - return redirect('yaksh:post_comments', - course_id=course.id, uuid=new_post.uid) - else: - form = PostForm() - return render(request, 'yaksh/course_forum.html', { - 'user': user, - 'course': course, - 'base_template': base_template, - 'moderator': moderator, - 'objects': posts, - 'form': form, - 'user': user - }) - - -@login_required -@email_verified -def lessons_forum(request, course_id): - user = request.user - base_template = 'user.html' - moderator = False - if is_moderator(user): - base_template = 'manage.html' - moderator = True - course = get_object_or_404(Course, id=course_id) - course_ct = ContentType.objects.get_for_model(course) - lesson_posts = course.get_lesson_posts() - return render(request, 'yaksh/lessons_forum.html', { - 'user': user, - 'base_template': base_template, - 'moderator': moderator, - 'course': course, - 'posts': lesson_posts, - }) - - -@login_required -@email_verified -def post_comments(request, course_id, uuid): - user = request.user - base_template = 'user.html' - if is_moderator(user): - base_template = 'manage.html' - post = get_object_or_404(Post, uid=uuid) - comments = post.comment.filter(active=True) - course = get_object_or_404(Course, id=course_id) - if (not course.is_creator(user) and not course.is_teacher(user) - and not course.is_student(user)): - raise Http404('You are not enrolled in {0} course'.format(course.name)) - form = CommentForm() - if request.method == "POST": - form = CommentForm(request.POST, request.FILES) - if form.is_valid(): - new_comment = form.save(commit=False) - new_comment.creator = request.user - new_comment.post_field = post - new_comment.anonymous = request.POST.get('anonymous', '') == 'on' - new_comment.save() - messages.success(request, "Added comment successfully") - return redirect(request.path_info) - return render(request, 'yaksh/post_comments.html', { - 'post': post, - 'comments': comments, - 'base_template': base_template, - 'form': form, - 'user': user, - 'course': course - }) - - -@login_required -@email_verified -def hide_post(request, course_id, uuid): - user = request.user - course = get_object_or_404(Course, id=course_id) - if (not course.is_creator(user) and not course.is_teacher(user)): - raise Http404( - 'Only a course creator or a teacher can delete the post.' - ) - post = get_object_or_404(Post, uid=uuid) - post.comment.active = False - post.active = False - post.save() - messages.success(request, "Post deleted successfully") - return redirect('yaksh:course_forum', course_id) - - -@login_required -@email_verified -def hide_comment(request, course_id, uuid): - user = request.user - if course_id: - course = get_object_or_404(Course, id=course_id) - if (not course.is_creator(user) and not course.is_teacher(user)): - raise Http404( - 'Only a course creator or a teacher can delete the comments' - ) - comment = get_object_or_404(Comment, uid=uuid) - post_uid = comment.post_field.uid - comment.active = False - comment.save() - messages.success(request, "Post comment deleted successfully") - return redirect('yaksh:post_comments', course_id, post_uid) - - @login_required @email_verified def add_marker(request, course_id, lesson_id): From 27abae8d23a78c437a36837fc1efe6616fe72ebd Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 5 Jul 2021 17:11:04 +0530 Subject: [PATCH 02/12] Move templates and test to forum app --- .../templates/forum}/course_forum.html | 2 +- .../templates/forum}/lessons_forum.html | 1 - .../templates/forum}/post_comments.html | 2 +- forum/tests.py | 3 - forum/tests/__init__.py | 0 forum/tests/test_models.py | 85 ++ forum/tests/test_views.py | 476 ++++++++++ forum/views.py | 8 +- online_test/urls.py | 4 +- yaksh/test_models.py | 80 -- yaksh/test_views.py | 469 +-------- yaksh/urls.py | 888 +++++++++++++----- 12 files changed, 1205 insertions(+), 813 deletions(-) rename {yaksh/templates/yaksh => forum/templates/forum}/course_forum.html (99%) rename {yaksh/templates/yaksh => forum/templates/forum}/lessons_forum.html (99%) rename {yaksh/templates/yaksh => forum/templates/forum}/post_comments.html (99%) delete mode 100644 forum/tests.py create mode 100644 forum/tests/__init__.py create mode 100644 forum/tests/test_models.py create mode 100644 forum/tests/test_views.py diff --git a/yaksh/templates/yaksh/course_forum.html b/forum/templates/forum/course_forum.html similarity index 99% rename from yaksh/templates/yaksh/course_forum.html rename to forum/templates/forum/course_forum.html index 8e28aab1a..6a5a36177 100644 --- a/yaksh/templates/yaksh/course_forum.html +++ b/forum/templates/forum/course_forum.html @@ -178,4 +178,4 @@

      Create a new Post

      }); }); -{% endblock script %} \ No newline at end of file +{% endblock script %} diff --git a/yaksh/templates/yaksh/lessons_forum.html b/forum/templates/forum/lessons_forum.html similarity index 99% rename from yaksh/templates/yaksh/lessons_forum.html rename to forum/templates/forum/lessons_forum.html index c5b023e4c..50e4dc0a6 100644 --- a/yaksh/templates/yaksh/lessons_forum.html +++ b/forum/templates/forum/lessons_forum.html @@ -101,4 +101,3 @@

      {{course.name}}

    {% endblock content %} - diff --git a/yaksh/templates/yaksh/post_comments.html b/forum/templates/forum/post_comments.html similarity index 99% rename from yaksh/templates/yaksh/post_comments.html rename to forum/templates/forum/post_comments.html index 2a28a63e9..cc7711996 100644 --- a/yaksh/templates/yaksh/post_comments.html +++ b/forum/templates/forum/post_comments.html @@ -116,4 +116,4 @@ }); }); -{% endblock script %} \ No newline at end of file +{% endblock script %} diff --git a/forum/tests.py b/forum/tests.py deleted file mode 100644 index 7ce503c2d..000000000 --- a/forum/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/forum/tests/__init__.py b/forum/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/forum/tests/test_models.py b/forum/tests/test_models.py new file mode 100644 index 000000000..4f587bc9e --- /dev/null +++ b/forum/tests/test_models.py @@ -0,0 +1,85 @@ +from django.test import TestCase +from django.contrib.auth.models import Group +from django.contrib.contenttypes.models import ContentType +from yaksh.models import User, Profile, Course +from forum.models import Post, Comment + + +class PostModelTestCases(TestCase): + def setUp(self): + self.user1 = User.objects.create( + username='bart', + password='bart', + email='bart@test.com' + ) + Profile.objects.create( + user=self.user1, + roll_number=1, + institute='IIT', + department='Chemical', + position='Student' + ) + + self.user2 = User.objects.create( + username='dart', + password='dart', + email='dart@test.com' + ) + Profile.objects.create( + user=self.user2, + roll_number=2, + institute='IIT', + department='Chemical', + position='Student' + ) + + self.user3 = User.objects.create( + username='user3', + password='user3', + email='user3@test.com' + ) + Profile.objects.create( + user=self.user3, + roll_number=3, + is_moderator=True, + department='Chemical', + position='Teacher' + ) + + self.course = Course.objects.create( + name='Python Course', + enrollment='Enroll Request', + creator=self.user3 + ) + course_ct = ContentType.objects.get_for_model(self.course) + self.post1 = Post.objects.create( + title='Post 1', + target_ct=course_ct, target_id=self.course.id, + creator=self.user1, + description='Post 1 description' + ) + self.comment1 = Comment.objects.create( + post_field=self.post1, + creator=self.user2, + description='Post 1 comment 1' + ) + self.comment2 = Comment.objects.create( + post_field=self.post1, + creator=self.user3, + description='Post 1 user3 comment 2' + ) + + def test_get_last_comment(self): + last_comment = self.post1.get_last_comment() + self.assertEquals(last_comment.description, 'Post 1 user3 comment 2') + + def test_get_comments_count(self): + count = self.post1.get_comments_count() + self.assertEquals(count, 2) + + def tearDown(self): + self.user1.delete() + self.user2.delete() + self.user3.delete() + self.course.delete() + self.post1.delete() diff --git a/forum/tests/test_views.py b/forum/tests/test_views.py new file mode 100644 index 000000000..93f73f057 --- /dev/null +++ b/forum/tests/test_views.py @@ -0,0 +1,476 @@ +from django.test import TestCase +from django.test import Client +from django.http import Http404 +from django.utils import timezone +from django.urls import reverse, resolve +from django.contrib.auth.models import Group, User +from django.contrib.contenttypes.models import ContentType + +from yaksh.models import Profile, Course +from forum.models import Post, Comment +from forum.forms import CommentForm +from forum.views import course_forum, post_comments + + +class TestPost(TestCase): + def setUp(self): + self.client = Client() + self.mod_group = Group.objects.create(name='moderator') + + self.student_plaintext_pass = 'student' + self.student = User.objects.create_user( + username='student', + password=self.student_plaintext_pass, + first_name='first_name', + last_name='last_name', + email='student@test.com' + ) + + Profile.objects.create( + user=self.student, + roll_number=10, + institute='IIT', + department='Chemical', + position='student', + timezone='UTC' + ) + + # moderator + self.user_plaintext_pass = 'demo' + self.user = User.objects.create_user( + username='demo_user', + password=self.user_plaintext_pass, + first_name='first_name', + last_name='last_name', + email='demo@test.com' + ) + + Profile.objects.create( + user=self.user, + roll_number=10, + institute='IIT', + department='Chemical', + position='Moderator', + timezone='UTC' + ) + + self.course = Course.objects.create( + name="Python Course", + enrollment="Enroll Request", creator=self.user + ) + + def test_csrf(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + response = self.client.get(url) + self.assertContains(response, 'csrfmiddlewaretoken') + + def test_view_course_forum_denies_anonymous_user(self): + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + response = self.client.get(url, follow=True) + self.assertEqual(response.status_code, 200) + redirection_url = '/exam/login/?next=/forum/course_forum/{0}/'.format( + str(self.course.id) + ) + self.assertRedirects(response, redirection_url) + + def test_view_course_forum(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + response = self.client.get(url, follow=True) + self.assertEquals(response.status_code, 200) + self.assertTemplateUsed(response, 'forum/course_forum.html') + + def test_view_course_forum_not_found_status_code(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': 99 + }) + response = self.client.get(url) + self.assertEquals(response.status_code, 404) + + def test_course_forum_url_resolves_course_forum_view(self): + view = resolve('/forum/course_forum/1/') + self.assertEqual(view.func, course_forum) + + def test_course_forum_contains_link_to_post_comments_page(self): + # create a post in setup + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + course_ct = ContentType.objects.get_for_model(self.course) + post = Post.objects.create( + title='post 1', + description='post 1 description', + target_ct=course_ct, target_id=self.course.id, + creator=self.student + ) + response = self.client.get(url) + post_comments_url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': post.uid + }) + self.assertContains(response, 'href="{0}'.format(post_comments_url)) + + def test_new_post_valid_post_data(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + data = { + "title": 'Post 1', + "description": 'Post 1 description', + } + response = self.client.post(url, data) + # This shouldn't be 302. Check where does it redirects. + course_ct = ContentType.objects.get_for_model(self.course) + result = Post.objects.filter(title='Post 1', + creator=self.student, + target_ct=course_ct, + target_id=self.course.id) + self.assertTrue(result.exists()) + + def test_new_post_invalid_post_data(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + data = {} + response = self.client.post(url, data) + self.assertEquals(response.status_code, 200) + + def test_new_post_invalid_post_data_empty_fields(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + data = { + "title": '', + "description": '', + } + response = self.client.post(url, data) + self.assertEquals(response.status_code, 200) + self.assertFalse(Post.objects.exists()) + + def test_open_created_post_denies_anonymous_user(self): + course_ct = ContentType.objects.get_for_model(self.course) + post = Post.objects.create( + title='post 1', + description='post 1 description', + target_ct=course_ct, target_id=self.course.id, + creator=self.student + ) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': post.uid + }) + response = self.client.get(url, follow=True) + self.assertEqual(response.status_code, 200) + redirection_url = '/exam/login/?next=/forum/{0}/post/{1}/'.format( + str(self.course.id), str(post.uid) + ) + self.assertRedirects(response, redirection_url) + + def test_new_post_invalid_post_data(self): + """ + Invalid post data should not redirect + The expected behavior is to show form again with validation errors + """ + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + data = {} + response = self.client.post(url, data) + form = response.context.get('form') + self.assertEquals(response.status_code, 200) + self.assertTrue(form.errors) + + def test_hide_post(self): + self.client.login( + username=self.user.username, + password=self.user_plaintext_pass + ) + self.course.students.add(self.user) + course_ct = ContentType.objects.get_for_model(self.course) + post = Post.objects.create( + title='post 1', + description='post 1 description', + target_ct=course_ct, target_id=self.course.id, + creator=self.student + ) + url = reverse('forum:hide_post', kwargs={ + 'course_id': self.course.id, + 'uuid': post.uid + }) + response = self.client.get(url, follow=True) + self.assertEqual(response.status_code, 200) + + def tearDown(self): + self.client.logout() + self.user.delete() + self.course.delete() + self.mod_group.delete() + + +class TestPostComment(TestCase): + def setUp(self): + self.client = Client() + self.mod_group = Group.objects.create(name='moderator') + + self.student_plaintext_pass = 'student' + self.student = User.objects.create_user( + username='student', + password=self.student_plaintext_pass, + first_name='first_name', + last_name='last_name', + email='student@test.com' + ) + + Profile.objects.create( + user=self.student, + roll_number=10, + institute='IIT', + department='Chemical', + position='student', + timezone='UTC' + ) + + # moderator + self.user_plaintext_pass = 'demo' + self.user = User.objects.create_user( + username='demo_user', + password=self.user_plaintext_pass, + first_name='first_name', + last_name='last_name', + email='demo@test.com' + ) + + Profile.objects.create( + user=self.user, + roll_number=10, + institute='IIT', + department='Chemical', + position='Moderator', + timezone='UTC' + ) + + self.course = Course.objects.create( + name="Python Course", + enrollment="Enroll Request", creator=self.user + ) + + course_ct = ContentType.objects.get_for_model(self.course) + self.post = Post.objects.create( + title='post 1', + description='post 1 description', + target_ct=course_ct, target_id=self.course.id, + creator=self.student + ) + + def test_csrf(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + response = self.client.get(url) + self.assertContains(response, 'csrfmiddlewaretoken') + + def test_post_comments_view_success_status_code(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + response = self.client.get(url) + self.assertEquals(response.status_code, 200) + + def test_post_comments_view_not_found_status_code(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': 99, + 'uuid': '90da38ad-06fa-451b-9e82-5035e839da90' + }) + response = self.client.get(url) + self.assertEquals(response.status_code, 404) + + def test_post_comments_url_resolves_post_comments_view(self): + view = resolve( + '/forum/1/post/90da38ad-06fa-451b-9e82-5035e839da89/' + ) + self.assertEquals(view.func, post_comments) + + def test_post_comments_view_contains_link_back_to_course_forum_view(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + comment_url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + course_forum_url = reverse('forum:course_forum', kwargs={ + 'course_id': self.course.id + }) + response = self.client.get(comment_url) + self.assertContains(response, 'href="{0}"'.format(course_forum_url)) + + def test_post_comments_valid_post_data(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + data = { + 'post_field': self.post, + 'description': 'post 1 comment', + 'creator': self.user, + } + response = self.client.post(url, data) + self.assertEquals(response.status_code, 302) + result = Comment.objects.filter(post_field__uid=self.post.uid) + self.assertTrue(result.exists()) + + def test_post_comments_invalid_post_data(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + data = {} + response = self.client.post(url, data) + self.assertEquals(response.status_code, 200) + + def test_post_comments_post_data_empty_fields(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + data = { + 'post_field': '', + 'description': '', + 'creator': '', + } + response = self.client.post(url, data) + self.assertEquals(response.status_code, 200) + self.assertFalse(Comment.objects.exists()) + + def test_contains_form(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + response = self.client.get(url) + form = response.context.get('form') + self.assertIsInstance(form, CommentForm) + + def post_comment_invalid_post_data(self): + self.client.login( + username=self.student.username, + password=self.student_plaintext_pass + ) + self.course.students.add(self.student) + url = reverse('forum:post_comments', kwargs={ + 'course_id': self.course.id, + 'uuid': self.post.uid + }) + data = {} + response = self.client.post(url, data) + form = response.context.get('form') + self.assertEquals(response.status_code, 200) + self.assertTrue(form.errors) + + def test_hide_post_comment(self): + self.client.login( + username=self.user.username, + password=self.user_plaintext_pass + ) + self.course.students.add(self.user) + comment = Comment.objects.create( + post_field=self.post, + description='post 1 comment', + creator=self.user + ) + url = reverse('forum:hide_comment', kwargs={ + 'course_id': self.course.id, + 'uuid': comment.uid + }) + response = self.client.get(url) + self.assertEquals(response.status_code, 302) + + def tearDown(self): + self.client.logout() + self.user.delete() + self.course.delete() + self.mod_group.delete() diff --git a/forum/views.py b/forum/views.py index 38a6d5975..a6bf03e9a 100644 --- a/forum/views.py +++ b/forum/views.py @@ -54,7 +54,7 @@ def course_forum(request, course_id): course_id=course.id, uuid=new_post.uid) else: form = PostForm() - return render(request, 'yaksh/course_forum.html', { + return render(request, 'forum/course_forum.html', { 'user': user, 'course': course, 'base_template': base_template, @@ -77,7 +77,7 @@ def lessons_forum(request, course_id): course = get_object_or_404(Course, id=course_id) course_ct = ContentType.objects.get_for_model(course) lesson_posts = course.get_lesson_posts() - return render(request, 'yaksh/lessons_forum.html', { + return render(request, 'forum/lessons_forum.html', { 'user': user, 'base_template': base_template, 'moderator': moderator, @@ -110,7 +110,7 @@ def post_comments(request, course_id, uuid): new_comment.save() messages.success(request, "Added comment successfully") return redirect(request.path_info) - return render(request, 'yaksh/post_comments.html', { + return render(request, 'forum/post_comments.html', { 'post': post, 'comments': comments, 'base_template': base_template, @@ -152,4 +152,4 @@ def hide_comment(request, course_id, uuid): comment.active = False comment.save() messages.success(request, "Post comment deleted successfully") - return redirect('forum:post_comments', course_id, post_uid) \ No newline at end of file + return redirect('forum:post_comments', course_id, post_uid) diff --git a/online_test/urls.py b/online_test/urls.py index 96b8bf14c..644690430 100644 --- a/online_test/urls.py +++ b/online_test/urls.py @@ -1,8 +1,10 @@ from django.conf.urls import include, url +from django.urls import path from django.conf import settings from django.conf.urls.static import static from django.contrib import admin from online_test import views + admin.autodiscover() urlpatterns = [ @@ -16,9 +18,9 @@ url(r'^exam/reset/', include('django.contrib.auth.urls')), url(r'^', include('social_django.urls', namespace='social')), url(r'^grades/', include(('grades.urls', 'grades'))), + url(r'^forum/', include(('forum.urls', 'forum'))), url(r'^api/', include('api.urls', namespace='api')), url(r'^stats/', include('stats.urls', namespace='stats')), url(r'^flatfiles/', include(('upload.urls', 'upload'))), - ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/yaksh/test_models.py b/yaksh/test_models.py index 019e2fc52..6fec5176d 100644 --- a/yaksh/test_models.py +++ b/yaksh/test_models.py @@ -2418,86 +2418,6 @@ def tearDown(self): self.file_upload.delete() -class PostModelTestCases(unittest.TestCase): - def setUp(self): - self.user1 = User.objects.create( - username='bart', - password='bart', - email='bart@test.com' - ) - Profile.objects.create( - user=self.user1, - roll_number=1, - institute='IIT', - department='Chemical', - position='Student' - ) - - self.user2 = User.objects.create( - username='dart', - password='dart', - email='dart@test.com' - ) - Profile.objects.create( - user=self.user2, - roll_number=2, - institute='IIT', - department='Chemical', - position='Student' - ) - - self.user3 = User.objects.create( - username='user3', - password='user3', - email='user3@test.com' - ) - Profile.objects.create( - user=self.user3, - roll_number=3, - is_moderator=True, - department='Chemical', - position='Teacher' - ) - - self.course = Course.objects.create( - name='Python Course', - enrollment='Enroll Request', - creator=self.user3 - ) - course_ct = ContentType.objects.get_for_model(self.course) - self.post1 = Post.objects.create( - title='Post 1', - target_ct=course_ct, target_id=self.course.id, - creator=self.user1, - description='Post 1 description' - ) - self.comment1 = Comment.objects.create( - post_field=self.post1, - creator=self.user2, - description='Post 1 comment 1' - ) - self.comment2 = Comment.objects.create( - post_field=self.post1, - creator=self.user3, - description='Post 1 user3 comment 2' - ) - - def test_get_last_comment(self): - last_comment = self.post1.get_last_comment() - self.assertEquals(last_comment.description, 'Post 1 user3 comment 2') - - def test_get_comments_count(self): - count = self.post1.get_comments_count() - self.assertEquals(count, 2) - - def tearDown(self): - self.user1.delete() - self.user2.delete() - self.user3.delete() - self.course.delete() - self.post1.delete() - - class QRcodeTestCase(unittest.TestCase): @classmethod def setUpClass(cls): diff --git a/yaksh/test_views.py b/yaksh/test_views.py index ef9863c73..acb8a9ec1 100644 --- a/yaksh/test_views.py +++ b/yaksh/test_views.py @@ -30,11 +30,10 @@ User, Profile, Question, Quiz, QuestionPaper, AnswerPaper, Answer, Course, AssignmentUpload, McqTestCase, IntegerTestCase, StringTestCase, FloatTestCase, FIXTURES_DIR_PATH, LearningModule, LearningUnit, Lesson, - LessonFile, CourseStatus, dict_to_yaml, Post, Comment, Topic, + LessonFile, CourseStatus, dict_to_yaml, Topic, TableOfContents, LessonQuizAnswer ) -from yaksh.views import add_as_moderator, course_forum, post_comments -from yaksh.forms import PostForm, CommentForm +from yaksh.views import add_as_moderator from yaksh.decorators import user_has_profile from online_test.celery_settings import app @@ -7116,470 +7115,6 @@ def test_show_lesson(self): self.assertEqual(response.context["msg"], err_msg) -class TestPost(TestCase): - def setUp(self): - self.client = Client() - self.mod_group = Group.objects.create(name='moderator') - - self.student_plaintext_pass = 'student' - self.student = User.objects.create_user( - username='student', - password=self.student_plaintext_pass, - first_name='first_name', - last_name='last_name', - email='student@test.com' - ) - - Profile.objects.create( - user=self.student, - roll_number=10, - institute='IIT', - department='Chemical', - position='student', - timezone='UTC' - ) - - # moderator - self.user_plaintext_pass = 'demo' - self.user = User.objects.create_user( - username='demo_user', - password=self.user_plaintext_pass, - first_name='first_name', - last_name='last_name', - email='demo@test.com' - ) - - Profile.objects.create( - user=self.user, - roll_number=10, - institute='IIT', - department='Chemical', - position='Moderator', - timezone='UTC' - ) - - self.course = Course.objects.create( - name="Python Course", - enrollment="Enroll Request", creator=self.user - ) - - def test_csrf(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - response = self.client.get(url) - self.assertContains(response, 'csrfmiddlewaretoken') - - def test_view_course_forum_denies_anonymous_user(self): - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - response = self.client.get(url, follow=True) - self.assertEqual(response.status_code, 200) - redirection_url = '/exam/login/?next=/exam/forum/course_forum/{0}/'.format( - str(self.course.id) - ) - self.assertRedirects(response, redirection_url) - - def test_view_course_forum(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - response = self.client.get(url, follow=True) - self.assertEquals(response.status_code, 200) - self.assertTemplateUsed(response, 'yaksh/course_forum.html') - - def test_view_course_forum_not_found_status_code(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': 99 - }) - response = self.client.get(url) - self.assertEquals(response.status_code, 404) - - def test_course_forum_url_resolves_course_forum_view(self): - view = resolve('/exam/forum/course_forum/1/') - self.assertEqual(view.func, course_forum) - - def test_course_forum_contains_link_to_post_comments_page(self): - # create a post in setup - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - course_ct = ContentType.objects.get_for_model(self.course) - post = Post.objects.create( - title='post 1', - description='post 1 description', - target_ct=course_ct, target_id=self.course.id, - creator=self.student - ) - response = self.client.get(url) - post_comments_url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': post.uid - }) - self.assertContains(response, 'href="{0}'.format(post_comments_url)) - - def test_new_post_valid_post_data(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - data = { - "title": 'Post 1', - "description": 'Post 1 description', - } - response = self.client.post(url, data) - # This shouldn't be 302. Check where does it redirects. - course_ct = ContentType.objects.get_for_model(self.course) - result = Post.objects.filter(title='Post 1', - creator=self.student, - target_ct=course_ct, - target_id=self.course.id) - self.assertTrue(result.exists()) - - def test_new_post_invalid_post_data(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - data = {} - response = self.client.post(url, data) - self.assertEquals(response.status_code, 200) - - def test_new_post_invalid_post_data_empty_fields(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - data = { - "title": '', - "description": '', - } - response = self.client.post(url, data) - self.assertEquals(response.status_code, 200) - self.assertFalse(Post.objects.exists()) - - def test_open_created_post_denies_anonymous_user(self): - course_ct = ContentType.objects.get_for_model(self.course) - post = Post.objects.create( - title='post 1', - description='post 1 description', - target_ct=course_ct, target_id=self.course.id, - creator=self.student - ) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': post.uid - }) - response = self.client.get(url, follow=True) - self.assertEqual(response.status_code, 200) - redirection_url = '/exam/login/?next=/exam/forum/{0}/post/{1}/'.format( - str(self.course.id), str(post.uid) - ) - self.assertRedirects(response, redirection_url) - - def test_new_post_invalid_post_data(self): - """ - Invalid post data should not redirect - The expected behavior is to show form again with validation errors - """ - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - data = {} - response = self.client.post(url, data) - form = response.context.get('form') - self.assertEquals(response.status_code, 200) - self.assertTrue(form.errors) - - def test_hide_post(self): - self.client.login( - username=self.user.username, - password=self.user_plaintext_pass - ) - self.course.students.add(self.user) - course_ct = ContentType.objects.get_for_model(self.course) - post = Post.objects.create( - title='post 1', - description='post 1 description', - target_ct=course_ct, target_id=self.course.id, - creator=self.student - ) - url = reverse('yaksh:hide_post', kwargs={ - 'course_id': self.course.id, - 'uuid': post.uid - }) - response = self.client.get(url, follow=True) - self.assertEqual(response.status_code, 200) - - def tearDown(self): - self.client.logout() - self.user.delete() - self.course.delete() - self.mod_group.delete() - - -class TestPostComment(TestCase): - def setUp(self): - self.client = Client() - self.mod_group = Group.objects.create(name='moderator') - - self.student_plaintext_pass = 'student' - self.student = User.objects.create_user( - username='student', - password=self.student_plaintext_pass, - first_name='first_name', - last_name='last_name', - email='student@test.com' - ) - - Profile.objects.create( - user=self.student, - roll_number=10, - institute='IIT', - department='Chemical', - position='student', - timezone='UTC' - ) - - # moderator - self.user_plaintext_pass = 'demo' - self.user = User.objects.create_user( - username='demo_user', - password=self.user_plaintext_pass, - first_name='first_name', - last_name='last_name', - email='demo@test.com' - ) - - Profile.objects.create( - user=self.user, - roll_number=10, - institute='IIT', - department='Chemical', - position='Moderator', - timezone='UTC' - ) - - self.course = Course.objects.create( - name="Python Course", - enrollment="Enroll Request", creator=self.user - ) - - course_ct = ContentType.objects.get_for_model(self.course) - self.post = Post.objects.create( - title='post 1', - description='post 1 description', - target_ct=course_ct, target_id=self.course.id, - creator=self.student - ) - - def test_csrf(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - response = self.client.get(url) - self.assertContains(response, 'csrfmiddlewaretoken') - - def test_post_comments_view_success_status_code(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - response = self.client.get(url) - self.assertEquals(response.status_code, 200) - - def test_post_comments_view_not_found_status_code(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': 99, - 'uuid': '90da38ad-06fa-451b-9e82-5035e839da90' - }) - response = self.client.get(url) - self.assertEquals(response.status_code, 404) - - def test_post_comments_url_resolves_post_comments_view(self): - view = resolve( - '/exam/forum/1/post/90da38ad-06fa-451b-9e82-5035e839da89/' - ) - self.assertEquals(view.func, post_comments) - - def test_post_comments_view_contains_link_back_to_course_forum_view(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - comment_url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - course_forum_url = reverse('yaksh:course_forum', kwargs={ - 'course_id': self.course.id - }) - response = self.client.get(comment_url) - self.assertContains(response, 'href="{0}"'.format(course_forum_url)) - - def test_post_comments_valid_post_data(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - data = { - 'post_field': self.post, - 'description': 'post 1 comment', - 'creator': self.user, - } - response = self.client.post(url, data) - self.assertEquals(response.status_code, 302) - result = Comment.objects.filter(post_field__uid=self.post.uid) - self.assertTrue(result.exists()) - - def test_post_comments_invalid_post_data(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - data = {} - response = self.client.post(url, data) - self.assertEquals(response.status_code, 200) - - def test_post_comments_post_data_empty_fields(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - data = { - 'post_field': '', - 'description': '', - 'creator': '', - } - response = self.client.post(url, data) - self.assertEquals(response.status_code, 200) - self.assertFalse(Comment.objects.exists()) - - def test_contains_form(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - response = self.client.get(url) - form = response.context.get('form') - self.assertIsInstance(form, CommentForm) - - def post_comment_invalid_post_data(self): - self.client.login( - username=self.student.username, - password=self.student_plaintext_pass - ) - self.course.students.add(self.student) - url = reverse('yaksh:post_comments', kwargs={ - 'course_id': self.course.id, - 'uuid': self.post.uid - }) - data = {} - response = self.client.post(url, data) - form = response.context.get('form') - self.assertEquals(response.status_code, 200) - self.assertTrue(form.errors) - - def test_hide_post_comment(self): - self.client.login( - username=self.user.username, - password=self.user_plaintext_pass - ) - self.course.students.add(self.user) - comment = Comment.objects.create( - post_field=self.post, - description='post 1 comment', - creator=self.user - ) - url = reverse('yaksh:hide_comment', kwargs={ - 'course_id': self.course.id, - 'uuid': comment.uid - }) - response = self.client.get(url) - self.assertEquals(response.status_code, 302) - - def tearDown(self): - self.client.logout() - self.user.delete() - self.course.delete() - self.mod_group.delete() - - class TestStartExam(TestCase): def setUp(self): self.client = Client() diff --git a/yaksh/urls.py b/yaksh/urls.py index f31e45059..61c0d8f41 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -3,277 +3,655 @@ from yaksh import views urlpatterns = [ - url(r'^$', views.index, name="index"), - url(r'^login/$', views.user_login, name='login'), - url(r'^logout/$', views.user_logout, name="logout"), - url(r'^update_email/$', views.update_email, name="update_email"), - url(r'^activate/(?P.+)$', views.activate_user, name="activate"), - url(r'^new_activation/$', views.new_activation, name='new_activation'), - url(r'^toggle_moderator/$', views.toggle_moderator_role, - name='toggle_moderator'), + url( + r'^$', + views.index, + name="index" + ), + url( + r'^login/$', + views.user_login, + name='login' + ), + url( + r'^logout/$', + views.user_logout, + name="logout" + ), + url( + r'^update_email/$', + views.update_email, + name="update_email" + ), + url( + r'^activate/(?P.+)$', + views.activate_user, + name="activate" + ), + url( + r'^new_activation/$', + views.new_activation, + name='new_activation' + ), + url( + r'^toggle_moderator/$', + views.toggle_moderator_role, + name='toggle_moderator' + ), url(r'^quizzes/$', views.quizlist_user, name='quizlist_user'), url(r'^results/$', views.results_user), - url(r'^start/(?P\d+)/(?P\d+)/' - '(?P\d+)/$', views.start, name="start_quiz"), - url(r'^start/(?P\d+)/(?P\d+)/' - '(?P\d+)/(?P\d+)/$', views.start, - name="start_quiz"), - url(r'^quit/(?P\d+)/(?P\d+)/' - '(?P\d+)/(?P\d+)/$', views.quit, - name="quit_quiz"), - url(r'^complete/$', views.complete, name="complete"), - url(r'^complete/(?P\d+)/(?P\d+)/' - '(?P\d+)/(?P\d+)/$', views.complete, - name="complete"), - url(r'^register/$', views.user_register, name="register"), - url(r'^(?P\d+)/check/$', views.check, name="check"), - url(r'^get_result/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.get_result), - url(r'^(?P\d+)/check/(?P\d+)/(?P\d+)/' + url( + r'^start/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', + views.start, + name="start_quiz" + ), + url( + r'^start/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', + views.start, + name="start_quiz" + ), + url( + r'^quit/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', + views.quit, + name="quit_quiz" + ), + url( + r'^complete/$', + views.complete, + name="complete" + ), + url( + r'^complete/(?P\d+)/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.check, name="check"), - url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/' + views.complete, + name="complete" + ), + url( + r'^register/$', + views.user_register, + name="register" + ), + url( + r'^(?P\d+)/check/$', + views.check, + name="check" + ), + url( + r'^get_result/(?P\d+)/(?P\d+)/(?P\d+)/$', + views.get_result + ), + url( + r'^(?P\d+)/check/(?P\d+)/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.skip, name="skip_question"), - url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/' + views.check, + name="check" + ), + url( + r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', + views.skip, + name="skip_question" + ), + url( + r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/' '(?P\d+)/(?P\d+)/(?P\d+)/$', - views.skip, name="skip_question"), - url(r'^enroll_request/(?P\d+)/$', views.enroll_request, - name='enroll_request'), - url(r'^self_enroll/(?P\d+)/$', views.self_enroll, - name='self_enroll'), - url(r'^view_answerpaper/(?P\d+)/(?P\d+)$', - views.view_answerpaper, name='view_answerpaper'), - url(r'^download/user_assignment/(?P\d+)/(?P\d+)/' + views.skip, + name="skip_question" + ), + url( + r'^enroll_request/(?P\d+)/$', + views.enroll_request, + name='enroll_request' + ), + url( + r'^self_enroll/(?P\d+)/$', + views.self_enroll, + name='self_enroll' + ), + url( + r'^view_answerpaper/(?P\d+)/(?P\d+)$', + views.view_answerpaper, + name='view_answerpaper' + ), + url( + r'^download/user_assignment/(?P\d+)/(?P\d+)/' '(?P\d+)/(?P\d+)$', - views.download_assignment_file, name="download_user_assignment"), - url(r'^show_lesson/(?P\d+)/(?P\d+)/' - '(?P\d+)/$', views.show_lesson, name='show_lesson'), - url(r'^quizzes/view_module/(?P\d+)/(?P\d+)/$', - views.view_module, name='view_module'), - url(r'^next_unit/(?P\d+)/(?P\d+)/' - '(?P\d+)/$', views.get_next_unit, name='next_unit'), - url(r'^next_unit/(?P\d+)/(?P\d+)/$', - views.get_next_unit, name='next_unit'), - url(r'^next_unit/(?P\d+)/(?P\d+)/' + views.download_assignment_file, + name="download_user_assignment" + ), + url( + r'^show_lesson/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', + views.show_lesson, + name='show_lesson' + ), + url( + r'^quizzes/view_module/(?P\d+)/(?P\d+)/$', + views.view_module, + name='view_module' + ), + url( + r'^next_unit/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', + views.get_next_unit, + name='next_unit' + ), + url( + r'^next_unit/(?P\d+)/(?P\d+)/$', + views.get_next_unit, + name='next_unit' + ), + url( + r'^next_unit/(?P\d+)/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.get_next_unit, name='next_unit'), - url(r'^course_modules/(?P\d+)/$', - views.course_modules, name='course_modules'), - url(r'^forum/course_forum/(?P\d+)/$', - views.course_forum, - name='course_forum'), - url(r'^forum/lessons_forum/(?P\d+)/$', - views.lessons_forum, name='lessons_forum'), - url(r'^forum/(?P\d+)/post/(?P[0-9a-f-]+)/$', - views.post_comments, - name='post_comments'), - url(r'^forum/(?P\d+)/post/(?P[0-9a-f-]+)/delete/', - views.hide_post, - name='hide_post'), - url(r'^forum/(?P\d+)/comment/(?P[0-9a-f-]+)/delete/', - views.hide_comment, - name='hide_comment'), - url(r'^manage/$', views.prof_manage, name='manage'), - url(r'^manage/addquestion/$', views.add_question, name="add_question"), - url(r'^manage/addquestion/(?P\d+)/$', views.add_question, - name="add_question"), - url(r'^manage/add_exercise/(?P\d+)/(?P\d+)/$', - views.add_exercise, name='add_exercise'), - url(r'^manage/add_exercise/(?P\d+)/(?P\d+)/(?P\d+)$', - views.add_exercise, name='edit_exercise'), - url(r'^manage/addquiz/(?P\d+)/(?P\d+)/$', - views.add_quiz, name='add_quiz'), - url(r'^manage/addquiz/(?P\d+)/(?P\d+)/(?P\d+)$', - views.add_quiz, name='edit_quiz'), - url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"), - url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/$', - views.grade_user, name="grade_user"), - url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/' + views.get_next_unit, + name='next_unit' + ), + url( + r'^course_modules/(?P\d+)/$', + views.course_modules, + name='course_modules' + ), + url( + r'^manage/$', + views.prof_manage, + name='manage' + ), + url( + r'^manage/addquestion/$', + views.add_question, + name="add_question" + ), + url( + r'^manage/addquestion/(?P\d+)/$', + views.add_question, + name="add_question" + ), + url( + r'^manage/add_exercise/(?P\d+)/(?P\d+)/$', + views.add_exercise, + name='add_exercise' + ), + url( + r'^manage/add_exercise/(?P\d+)/(?P\d+)/(?P\d+)$', + views.add_exercise, + name='edit_exercise' + ), + url( + r'^manage/addquiz/(?P\d+)/(?P\d+)/$', + views.add_quiz, + name='add_quiz' + ), + url( + r'^manage/addquiz/(?P\d+)/(?P\d+)/(?P\d+)$', + views.add_quiz, + name='edit_quiz' + ), + url( + r'^manage/gradeuser/$', + views.grade_user, + name="grade_user" + ), + url( + r'^manage/gradeuser/(?P\d+)/(?P\d+)/$', + views.grade_user, + name="grade_user" + ), + url( + r'^manage/gradeuser/(?P\d+)/(?P\d+)/' '(?P\d+)/$', - views.grade_user, name="grade_user"), - url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/' + views.grade_user, + name="grade_user" + ), + url( + r'^manage/gradeuser/(?P\d+)/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.grade_user, name="grade_user"), - url(r'^manage/questions/$', views.show_all_questions, - name="show_questions"), - url(r'^manage/monitor/$', views.monitor, name="monitor"), - url(r'^manage/monitor/(?P\d+)/(?P\d+)/$', - views.monitor, name="monitor"), - url(r'^manage/monitor/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.monitor, name="monitor"), - url(r'^manage/user_data/(?P\d+)/(?P\d+)/' + views.grade_user, + name="grade_user" + ), + url( + r'^manage/questions/$', + views.show_all_questions, + name="show_questions" + ), + url( + r'^manage/monitor/$', + views.monitor, + name="monitor" + ), + url( + r'^manage/monitor/(?P\d+)/(?P\d+)/$', + views.monitor, + name="monitor" + ), + url( + r'^manage/monitor/(?P\d+)/(?P\d+)/(?P\d+)/$', + views.monitor, + name="monitor" + ), + url( + r'^manage/user_data/(?P\d+)/(?P\d+)/' '(?P\d+)/$', - views.user_data, name="user_data"), - url(r'^manage/user_data/(?P\d+)/$', views.user_data), - url(r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/' + views.user_data, + name="user_data" + ), + url( + r'^manage/user_data/(?P\d+)/$', + views.user_data + ), + url( + r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/' '(?P\d+)/$', - views.design_questionpaper, name='designquestionpaper'), - url(r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/$', - views.design_questionpaper, name='designquestionpaper'), - url(r'^manage/statistics/question/(?P\d+)/' + views.design_questionpaper, + name='designquestionpaper' + ), + url( + r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/$', + views.design_questionpaper, + name='designquestionpaper' + ), + url( + r'^manage/statistics/question/(?P\d+)/' '(?P\d+)/$', - views.show_statistics, name="show_statistics"), - url(r'^manage/statistics/question/(?P\d+)/' + views.show_statistics, + name="show_statistics" + ), + url( + r'^manage/statistics/question/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.show_statistics, name="show_statistics"), - url(r'^manage/download_quiz_csv/(?P\d+)/(?P\d+)/$', - views.download_quiz_csv, name="download_quiz_csv"), - url(r'^manage/duplicate_course/(?P\d+)/$', - views.duplicate_course, name='duplicate_course'), - url(r'manage/courses/$', views.courses, name='courses'), - url(r'manage/add_course/$', views.add_course, name='add_course'), - url(r'manage/edit_course/(?P\d+)$', views.add_course, - name='edit_course'), - url(r'manage/course_detail/(?P\d+)/$', views.course_detail, - name='course_detail'), - - url(r'manage/enroll/(?P\d+)/$', views.enroll_reject_user, - name="enroll_reject_user"), - url(r'manage/enroll/(?P\d+)/(?P\d+)/$', - views.enroll_user, name="enroll_user"), - url(r'manage/reject/(?P\d+)/(?P\d+)/$', - views.reject_user, name="reject_user"), - url(r'manage/enrolled/reject/(?P\d+)/(?P\d+)/$', - views.reject_user, {'was_enrolled': True}, - name="reject_enrolled_user"), - url(r'manage/enrolled/reject/(?P\d+)/$', - views.enroll_reject_user, {'was_enrolled': True}, - name="reject_enrolled_users"), - url(r'manage/enroll/rejected/(?P\d+)/(?P\d+)/$', - views.enroll_user, {'was_rejected': True}, - name="enroll_rejected_user"), - url(r'manage/enroll/rejected/(?P\d+)/$', - views.enroll_reject_user, {'was_rejected': True}, - name="enroll_rejected_users"), - - url(r'manage/upload_users/(?P\d+)/$', views.upload_users, - name="upload_users"), - url(r'manage/send_mail/(?P\d+)/$', views.send_mail, - name="send_mail"), - - url(r'manage/toggle_status/(?P\d+)/$', - views.toggle_course_status, name="toggle_course_status"), - url(r'^questions/filter$', views.questions_filter, - name="questions_filter"), - url(r'^editprofile/$', views.edit_profile, name='edit_profile'), - url(r'^viewprofile/$', views.view_profile, name='view_profile'), - url(r'^generate_qrcode/(?P\d+)/(?P\d+)/' + views.show_statistics, + name="show_statistics" + ), + url( + r'^manage/download_quiz_csv/(?P\d+)/(?P\d+)/$', + views.download_quiz_csv, + name="download_quiz_csv" + ), + url( + r'^manage/duplicate_course/(?P\d+)/$', + views.duplicate_course, + name='duplicate_course' + ), + url( + r'manage/courses/$', + views.courses, + name='courses' + ), + url( + r'manage/add_course/$', + views.add_course, + name='add_course' + ), + url( + r'manage/edit_course/(?P\d+)$', + views.add_course, + name='edit_course' + ), + url( + r'manage/course_detail/(?P\d+)/$', views.course_detail, + name='course_detail' + ), + url( + r'manage/enroll/(?P\d+)/$', + views.enroll_reject_user, + name="enroll_reject_user" + ), + url( + r'manage/enroll/(?P\d+)/(?P\d+)/$', + views.enroll_user, + name="enroll_user" + ), + url( + r'manage/reject/(?P\d+)/(?P\d+)/$', + views.reject_user, + name="reject_user" + ), + url( + r'manage/enrolled/reject/(?P\d+)/(?P\d+)/$', + views.reject_user, + {'was_enrolled': True}, + name="reject_enrolled_user" + ), + url( + r'manage/enrolled/reject/(?P\d+)/$', + views.enroll_reject_user, + {'was_enrolled': True}, + name="reject_enrolled_users" + ), + url( + r'manage/enroll/rejected/(?P\d+)/(?P\d+)/$', + views.enroll_user, + {'was_rejected': True}, + name="enroll_rejected_user" + ), + url( + r'manage/enroll/rejected/(?P\d+)/$', + views.enroll_reject_user, + {'was_rejected': True}, + name="enroll_rejected_users" + ), + url( + r'manage/upload_users/(?P\d+)/$', + views.upload_users, + name="upload_users" + ), + url( + r'manage/send_mail/(?P\d+)/$', + views.send_mail, + name="send_mail" + ), + url( + r'manage/toggle_status/(?P\d+)/$', + views.toggle_course_status, + name="toggle_course_status" + ), + url( + r'^questions/filter$', + views.questions_filter, + name="questions_filter" + ), + url( + r'^editprofile/$', + views.edit_profile, + name='edit_profile' + ), + url( + r'^viewprofile/$', + views.view_profile, + name='view_profile' + ), + url( + r'^generate_qrcode/(?P\d+)/(?P\d+)/' r'(?P\d+)/$', - views.generate_qrcode, name='generate_qrcode'), - url(r'^upload_file/(?P.+)/$', views.upload_file, name='upload_file'), - url(r'^manage/searchteacher/(?P\d+)/$', views.search_teacher, - name="search_teacher"), - url(r'^manage/addteacher/(?P\d+)/$', views.add_teacher, - name='add_teacher'), - url(r'^manage/remove_teachers/(?P\d+)/$', views.remove_teachers, - name='remove_teacher'), - url(r'^manage/download_questions/$', views.show_all_questions, - name="download_questions"), - url(r'^manage/upload_questions/$', views.show_all_questions, - name="upload_questions"), - url(r'^manage/regrade/paper/question/(?P\d+)/' + views.generate_qrcode, + name='generate_qrcode' + ), + url( + r'^upload_file/(?P.+)/$', + views.upload_file, + name='upload_file' + ), + url( + r'^manage/searchteacher/(?P\d+)/$', + views.search_teacher, + name="search_teacher" + ), + url( + r'^manage/addteacher/(?P\d+)/$', + views.add_teacher, + name='add_teacher' + ), + url( + r'^manage/remove_teachers/(?P\d+)/$', + views.remove_teachers, + name='remove_teacher' + ), + url( + r'^manage/download_questions/$', + views.show_all_questions, + name="download_questions" + ), + url( + r'^manage/upload_questions/$', + views.show_all_questions, + name="upload_questions" + ), + url( + r'^manage/regrade/paper/question/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.regrade, name='regrade_by_quiz'), - url(r'^manage/regrade/user/(?P\d+)/(?P\d+)/' - '(?P\d+)/$', views.regrade, name='regrade_by_user'), - url(r'^manage/regrade/user/question/(?P\d+)/' + views.regrade, + name='regrade_by_quiz' + ), + url( + r'^manage/regrade/user/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', + views.regrade, + name='regrade_by_user' + ), + url( + r'^manage/regrade/user/question/(?P\d+)/' '(?P\d+)/(?P\d+)/' - '(?P\d+)/', views.regrade, name='regrade_by_question'), - url(r'^manage/(?Pgodmode|usermode)/(?P\d+)/' - '(?P\d+)/$', views.test_quiz, name="test_quiz"), - url(r'^manage/create_demo_course/$', views.create_demo_course, - name="create_demo_course"), - url(r'^manage/courses/download_course_csv/(?P\d+)/$', - views.download_course_csv, name="download_course_csv"), - url(r'^manage/download/user_assignment/(?P\d+)/' + '(?P\d+)/', + views.regrade, + name='regrade_by_question' + ), + url( + r'^manage/(?Pgodmode|usermode)/(?P\d+)/' + '(?P\d+)/$', + views.test_quiz, + name="test_quiz" + ), + url( + r'^manage/create_demo_course/$', + views.create_demo_course, + name="create_demo_course" + ), + url( + r'^manage/courses/download_course_csv/(?P\d+)/$', + views.download_course_csv, + name="download_course_csv" + ), + url( + r'^manage/download/user_assignment/(?P\d+)/' '(?P\d+)/(?P\d+)/(?P\d+)$', - views.download_assignment_file, name="download_user_assignment"), - url(r'^manage/download/quiz_assignments/(?P\d+)/' - '(?P\d+)$', views.download_assignment_file, - name="download_quiz_assignment"), - url(r'^manage/courses/download_yaml_template/', - views.download_yaml_template, name="download_yaml_template"), - url(r'^manage/download_sample_csv/', - views.download_sample_csv, name="download_sample_csv"), - url(r'^manage/courses/edit_lesson/(?P\d+)/(?P\d+)/$', - views.edit_lesson, name="edit_lesson"), - url(r'^manage/courses/edit_lesson/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.edit_lesson, name="edit_lesson"), - url(r'^manage/courses/designmodule/(?P\d+)/$', - views.design_module, name="design_module"), - url(r'^manage/courses/designmodule/(?P\d+)/' - '(?P\d+)/$', views.design_module, name="design_module"), - url(r'^manage/courses/add_module/(?P\d+)/$', - views.add_module, name="add_module"), - url(r'^manage/courses/add_module/(?P\d+)/(?P\d+)/$', - views.add_module, name="edit_module"), - url(r'^manage/courses/designcourse/(?P\d+)/$', - views.design_course, name="design_course"), - url(r'^manage/course_status/(?P\d+)/$', - views.course_status, name="course_status"), - url(r'^manage/preview_questionpaper/(?P\d+)/$', - views.preview_questionpaper, name="preview_questionpaper"), - url(r'^manage/get_user_status/(?P\d+)/(?P\d+)/$', - views.get_user_data, name="get_user_data"), - url(r'^manage/courses/download_course/(?P\d+)/$', - views.download_course, name="download_course"), - url(r'^download_course/(?P\d+)/$', - views.download_course, name="download_course"), - url(r'^manage/course/all/modules/(?P\d+)', - views.get_course_modules, name="get_course_modules"), - url(r'^manage/course/teachers/(?P\d+)', - views.course_teachers, name="course_teachers"), - url(r'^manage/download/course/progress/(?P\d+)', - views.download_course_progress, name="download_course_progress"), - url(r'^manage/question/download/(?P\d+)', - views.download_question, name="download_question"), - url(r'^manage/question/test/(?P\d+)', - views.test_question, name="test_question"), - url(r'^manage/question/delete/(?P\d+)', - views.delete_question, name="delete_question"), - url(r'^manage/search/questions', views.search_questions_by_tags, - name="search_questions_by_tags"), - path('view/notifications', views.view_notifications, - name="view_notifications"), - path('mark/notifications/', - views.mark_notification, name="mark_notification"), - path('mark/notifications', views.mark_notification, - name="mark_notification"), - url(r'^manage/micromanager/allow_special_attempt/(?P\d+)/' + views.download_assignment_file, + name="download_user_assignment" + ), + url( + r'^manage/download/quiz_assignments/(?P\d+)/' + '(?P\d+)$', + views.download_assignment_file, + name="download_quiz_assignment" + ), + url( + r'^manage/courses/download_yaml_template/', + views.download_yaml_template, + name="download_yaml_template" + ), + url( + r'^manage/download_sample_csv/', + views.download_sample_csv, + name="download_sample_csv" + ), + url( + r'^manage/courses/edit_lesson/(?P\d+)/(?P\d+)/$', + views.edit_lesson, + name="edit_lesson" + ), + url( + r'^manage/courses/edit_lesson/(?P\d+)/(?P\d+)/(?P\d+)/$', + views.edit_lesson, + name="edit_lesson" + ), + url( + r'^manage/courses/designmodule/(?P\d+)/$', + views.design_module, + name="design_module" + ), + url( + r'^manage/courses/designmodule/(?P\d+)/' + '(?P\d+)/$', + views.design_module, + name="design_module" + ), + url( + r'^manage/courses/add_module/(?P\d+)/$', + views.add_module, + name="add_module" + ), + url( + r'^manage/courses/add_module/(?P\d+)/(?P\d+)/$', + views.add_module, + name="edit_module" + ), + url( + r'^manage/courses/designcourse/(?P\d+)/$', + views.design_course, + name="design_course" + ), + url( + r'^manage/course_status/(?P\d+)/$', + views.course_status, + name="course_status" + ), + url( + r'^manage/preview_questionpaper/(?P\d+)/$', + views.preview_questionpaper, + name="preview_questionpaper" + ), + url( + r'^manage/get_user_status/(?P\d+)/(?P\d+)/$', + views.get_user_data, + name="get_user_data" + ), + url( + r'^manage/courses/download_course/(?P\d+)/$', + views.download_course, + name="download_course" + ), + url( + r'^download_course/(?P\d+)/$', + views.download_course, + name="download_course" + ), + url( + r'^manage/course/all/modules/(?P\d+)', + views.get_course_modules, + name="get_course_modules" + ), + url( + r'^manage/course/teachers/(?P\d+)', + views.course_teachers, + name="course_teachers" + ), + url( + r'^manage/download/course/progress/(?P\d+)', + views.download_course_progress, + name="download_course_progress" + ), + url( + r'^manage/question/download/(?P\d+)', + views.download_question, + name="download_question" + ), + url( + r'^manage/question/test/(?P\d+)', + views.test_question, + name="test_question" + ), + url( + r'^manage/question/delete/(?P\d+)', + views.delete_question, + name="delete_question" + ), + url( + r'^manage/search/questions', + views.search_questions_by_tags, + name="search_questions_by_tags" + ), + path( + 'view/notifications', + views.view_notifications, + name="view_notifications" + ), + path( + 'mark/notifications/', + views.mark_notification, + name="mark_notification" + ), + path( + 'mark/notifications', + views.mark_notification, + name="mark_notification" + ), + url( + r'^manage/micromanager/allow_special_attempt/(?P\d+)/' '(?P\d+)/(?P\d+)/$', - views.allow_special_attempt, name='allow_special_attempt'), - url(r'^micromanager/special_start/(?P\d+)/$', - views.special_start, name='special_start'), - url(r'^manage/micromanager/special_revoke/(?P\d+)/$', - views.revoke_special_attempt, name='revoke_special_attempt'), - url(r'^manage/extend_time/(?P\d+)/$', - views.extend_time, name='extend_time'), - path('manage/add/marker//', views.add_marker, - name='add_marker'), - path('manage/add/lesson/topic///', - views.add_topic, name='add_topic'), - path('manage/edit/lesson/topic////' - '/', views.add_topic, name='edit_topic'), - path('manage/add/lesson/quiz///', - views.add_marker_quiz, name='add_marker_quiz'), - path('manage/edit/lesson/quiz////' - '/', views.add_marker_quiz, - name='edit_marker_quiz'), - path('manage/remove/lesson/toc//', - views.delete_toc, name='delete_toc'), - path('get/marker/quiz//', views.get_marker_quiz, - name='get_marker_quiz'), - path('submit/marker/quiz//', - views.submit_marker_quiz, name='submit_marker_quiz'), - path('manage/lesson/stats//', - views.lesson_statistics, name='lesson_statistics'), - path('manage/lesson/stats///', - views.lesson_statistics, name='lesson_statistics'), - path('manage/download/sample/toc', - views.download_sample_toc, name='download_sample_toc'), - path('manage/upload_marks///', - views.upload_marks, name='upload_marks'), - path(r'manage/upload_download_course_md/', - views.upload_download_course_md, name="upload_download_course_md"), + views.allow_special_attempt, + name='allow_special_attempt' + ), + url( + r'^micromanager/special_start/(?P\d+)/$', + views.special_start, + name='special_start' + ), + url( + r'^manage/micromanager/special_revoke/(?P\d+)/$', + views.revoke_special_attempt, + name='revoke_special_attempt' + ), + url( + r'^manage/extend_time/(?P\d+)/$', + views.extend_time, + name='extend_time' + ), + path( + 'manage/add/marker//', + views.add_marker, + name='add_marker' + ), + path( + 'manage/add/lesson/topic///', + views.add_topic, + name='add_topic' + ), + path( + 'manage/edit/lesson/topic////' + '/', + views.add_topic, + name='edit_topic' + ), + path( + 'manage/add/lesson/quiz///', + views.add_marker_quiz, + name='add_marker_quiz' + ), + path( + 'manage/edit/lesson/quiz////' + '/', views.add_marker_quiz, + name='edit_marker_quiz' + ), + path( + 'manage/remove/lesson/toc//', + views.delete_toc, + name='delete_toc' + ), + path( + 'get/marker/quiz//', + views.get_marker_quiz, + name='get_marker_quiz' + ), + path( + 'submit/marker/quiz//', + views.submit_marker_quiz, + name='submit_marker_quiz' + ), + path( + 'manage/lesson/stats//', + views.lesson_statistics, + name='lesson_statistics' + ), + path( + 'manage/lesson/stats///', + views.lesson_statistics, + name='lesson_statistics' + ), + path( + 'manage/download/sample/toc', + views.download_sample_toc, + name='download_sample_toc' + ), + path( + 'manage/upload_marks///', + views.upload_marks, + name='upload_marks' + ), + path( + r'manage/upload_download_course_md/', + views.upload_download_course_md, + name="upload_download_course_md" + ), ] From 86b4471d960c9795a49243026ebd5674979d141b Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Fri, 9 Jul 2021 18:41:32 +0530 Subject: [PATCH 03/12] minor change in models and views --- forum/models.py | 2 +- forum/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forum/models.py b/forum/models.py index 46c8a2530..0bbdf08d3 100644 --- a/forum/models.py +++ b/forum/models.py @@ -57,7 +57,7 @@ def get_comments_count(self): class Comment(ForumBase): post_field = models.ForeignKey(Post, on_delete=models.CASCADE, - related_name='comment') + related_name='comments') def __str__(self): return 'Comment by {0}: {1}'.format(self.creator.username, diff --git a/forum/views.py b/forum/views.py index a6bf03e9a..fadaa266b 100644 --- a/forum/views.py +++ b/forum/views.py @@ -94,7 +94,7 @@ def post_comments(request, course_id, uuid): if is_moderator(user): base_template = 'manage.html' post = get_object_or_404(Post, uid=uuid) - comments = post.comment.filter(active=True) + comments = post.comments.filter(active=True) course = get_object_or_404(Course, id=course_id) if (not course.is_creator(user) and not course.is_teacher(user) and not course.is_student(user)): From a17c3d509a73f8a7e7dc96d97601731b8116f1a1 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Fri, 9 Jul 2021 18:42:28 +0530 Subject: [PATCH 04/12] Add Forum API - Only shows course related posts, not lesson related posts yet. --- forum/api/__init__.py | 0 forum/api/relations.py | 13 +++++++++++++ forum/api/serializers.py | 32 ++++++++++++++++++++++++++++++++ forum/api/urls.py | 8 ++++++++ forum/api/views.py | 19 +++++++++++++++++++ 5 files changed, 72 insertions(+) create mode 100644 forum/api/__init__.py create mode 100644 forum/api/relations.py create mode 100644 forum/api/serializers.py create mode 100644 forum/api/urls.py create mode 100644 forum/api/views.py diff --git a/forum/api/__init__.py b/forum/api/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/forum/api/relations.py b/forum/api/relations.py new file mode 100644 index 000000000..7f0535fe9 --- /dev/null +++ b/forum/api/relations.py @@ -0,0 +1,13 @@ +from rest_framework import serializers + +from yaksh.models import Course, Lesson + + +class PostObjectRelatedField(serializers.RelatedField): + def to_representation(self, value): + if isinstance(value, Course): + return 'Course: ' + value.name + elif isinstance(value, Lesson): + return 'Lesson: ' + value.name + raise Exception('Unexpected type of tagged object') + diff --git a/forum/api/serializers.py b/forum/api/serializers.py new file mode 100644 index 000000000..4c005e153 --- /dev/null +++ b/forum/api/serializers.py @@ -0,0 +1,32 @@ +from django.contrib.auth import get_user_model +from rest_framework import serializers + +from forum.models import Post, Comment +from .relations import PostObjectRelatedField + + +class UserSerializer(serializers.ModelSerializer): + class Meta: + model = get_user_model() + fields = ['is_superuser', 'username', 'first_name', 'last_name', + 'is_staff', 'is_active'] + + +class CommentSerializer(serializers.ModelSerializer): + creator = UserSerializer() + class Meta: + model = Comment + fields = ['id', 'creator', 'description', 'created_at', 'modified_at', + 'image', 'active', 'anonymous', 'post_field'] + + +class PostSerializer(serializers.ModelSerializer): + comments = CommentSerializer(many=True) + creator = UserSerializer() + target = PostObjectRelatedField(read_only=True) + + class Meta: + model = Post + fields = ['id', 'title', 'creator', 'description', 'created_at', + 'modified_at', 'image', 'active', 'anonymous', 'target_ct', + 'target_id', 'target', 'comments'] diff --git a/forum/api/urls.py b/forum/api/urls.py new file mode 100644 index 000000000..9ff612427 --- /dev/null +++ b/forum/api/urls.py @@ -0,0 +1,8 @@ +from django.urls import path +from .views import post_list + +app_name = 'forum_api' + +urlpatterns = [ + path('course_forum//', post_list), +] diff --git a/forum/api/views.py b/forum/api/views.py new file mode 100644 index 000000000..bd14d5590 --- /dev/null +++ b/forum/api/views.py @@ -0,0 +1,19 @@ +from django.contrib.contenttypes.models import ContentType + +from rest_framework.decorators import api_view +from rest_framework.response import Response + +from forum.models import Post +from yaksh.models import Course, Lesson +from .serializers import PostSerializer + + +@api_view(['GET']) +def post_list(request, course_id): + if request.method == 'GET': + course = Course.objects.get(id=course_id) + course_ct = ContentType.objects.get_for_model(course) + posts = Post.objects.filter(target_ct=course_ct, target_id=course.id, active=True) + serializer = PostSerializer(posts, many=True) + return Response(serializer.data) + From fd4c66275741369d200cdbb0eac869b866c84703 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 12 Jul 2021 18:24:35 +0530 Subject: [PATCH 05/12] view single post and its comments --- forum/api/relations.py | 4 ++++ forum/api/serializers.py | 16 +++++----------- forum/api/urls.py | 6 ++++-- forum/api/views.py | 38 +++++++++++++++++++++++++++++++++++--- 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/forum/api/relations.py b/forum/api/relations.py index 7f0535fe9..ada1d60aa 100644 --- a/forum/api/relations.py +++ b/forum/api/relations.py @@ -11,3 +11,7 @@ def to_representation(self, value): return 'Lesson: ' + value.name raise Exception('Unexpected type of tagged object') + +class UserRelatedSerializer(serializers.RelatedField): + def to_representation(self, value): + return value.username diff --git a/forum/api/serializers.py b/forum/api/serializers.py index 4c005e153..7fbc6cd57 100644 --- a/forum/api/serializers.py +++ b/forum/api/serializers.py @@ -2,18 +2,12 @@ from rest_framework import serializers from forum.models import Post, Comment -from .relations import PostObjectRelatedField - - -class UserSerializer(serializers.ModelSerializer): - class Meta: - model = get_user_model() - fields = ['is_superuser', 'username', 'first_name', 'last_name', - 'is_staff', 'is_active'] +from .relations import PostObjectRelatedField, UserRelatedSerializer class CommentSerializer(serializers.ModelSerializer): - creator = UserSerializer() + creator = UserRelatedSerializer(read_only=True) + class Meta: model = Comment fields = ['id', 'creator', 'description', 'created_at', 'modified_at', @@ -21,9 +15,9 @@ class Meta: class PostSerializer(serializers.ModelSerializer): - comments = CommentSerializer(many=True) - creator = UserSerializer() + creator = UserRelatedSerializer(read_only=True) target = PostObjectRelatedField(read_only=True) + comments = CommentSerializer(many=True) class Meta: model = Post diff --git a/forum/api/urls.py b/forum/api/urls.py index 9ff612427..fb22c0fad 100644 --- a/forum/api/urls.py +++ b/forum/api/urls.py @@ -1,8 +1,10 @@ from django.urls import path -from .views import post_list +from .views import course_post_list, course_post_detail, lesson_post_list app_name = 'forum_api' urlpatterns = [ - path('course_forum//', post_list), + path('course_forum//', course_post_list), + path('course_forum///', course_post_detail), + path('lesson_forum//', lesson_post_list), ] diff --git a/forum/api/views.py b/forum/api/views.py index bd14d5590..3103bf4c3 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -2,6 +2,7 @@ from rest_framework.decorators import api_view from rest_framework.response import Response +from rest_framework import status from forum.models import Post from yaksh.models import Course, Lesson @@ -9,11 +10,42 @@ @api_view(['GET']) -def post_list(request, course_id): - if request.method == 'GET': +def course_post_list(request, course_id): + try: course = Course.objects.get(id=course_id) + except Course.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + + if request.method == 'GET': course_ct = ContentType.objects.get_for_model(course) - posts = Post.objects.filter(target_ct=course_ct, target_id=course.id, active=True) + posts = Post.objects.filter(target_ct=course_ct, + target_id=course.id, + active=True) serializer = PostSerializer(posts, many=True) return Response(serializer.data) + +@api_view(['GET']) +def course_post_detail(request, course_id, post_id): + try: + post = Post.objects.get(id=post_id) + except Post.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + + if request.method == 'GET': + post_serializer = PostSerializer(post) + return Response(post_serializer.data) + + +@api_view(['GET']) +def lesson_post_list(request, course_id): + try: + course = Course.objects.get(id=course_id) + except Course.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + + if request.method == 'GET': + course_ct = ContentType.objects.get_for_model(course) + lesson_posts = course.get_lesson_posts() + serializer = PostSerializer(lesson_posts, many=True) + return Response(serializer.data) \ No newline at end of file From d2288f6ec20ef3098cd04fb777e67187882f5a59 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 19 Jul 2021 16:35:15 +0530 Subject: [PATCH 06/12] create posts via api --- forum/api/relations.py | 3 ++- forum/api/serializers.py | 24 +++++++++++------------- forum/api/urls.py | 4 ++-- forum/api/views.py | 34 +++++++++++++++++++--------------- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/forum/api/relations.py b/forum/api/relations.py index ada1d60aa..dd519160a 100644 --- a/forum/api/relations.py +++ b/forum/api/relations.py @@ -1,3 +1,4 @@ +from django.contrib.auth import get_user_model from rest_framework import serializers from yaksh.models import Course, Lesson @@ -14,4 +15,4 @@ def to_representation(self, value): class UserRelatedSerializer(serializers.RelatedField): def to_representation(self, value): - return value.username + return value.id \ No newline at end of file diff --git a/forum/api/serializers.py b/forum/api/serializers.py index 7fbc6cd57..7a661bb92 100644 --- a/forum/api/serializers.py +++ b/forum/api/serializers.py @@ -5,22 +5,20 @@ from .relations import PostObjectRelatedField, UserRelatedSerializer -class CommentSerializer(serializers.ModelSerializer): - creator = UserRelatedSerializer(read_only=True) - - class Meta: - model = Comment - fields = ['id', 'creator', 'description', 'created_at', 'modified_at', - 'image', 'active', 'anonymous', 'post_field'] - - class PostSerializer(serializers.ModelSerializer): - creator = UserRelatedSerializer(read_only=True) + target = PostObjectRelatedField(read_only=True) - comments = CommentSerializer(many=True) class Meta: model = Post fields = ['id', 'title', 'creator', 'description', 'created_at', - 'modified_at', 'image', 'active', 'anonymous', 'target_ct', - 'target_id', 'target', 'comments'] + 'modified_at', 'image', 'active', 'anonymous', + 'target_id', 'target'] + + + +class CommentSerializer(serializers.ModelSerializer): + + class Meta: + model = Comment + fields = '__all__' diff --git a/forum/api/urls.py b/forum/api/urls.py index fb22c0fad..b9a5e2e66 100644 --- a/forum/api/urls.py +++ b/forum/api/urls.py @@ -1,10 +1,10 @@ from django.urls import path -from .views import course_post_list, course_post_detail, lesson_post_list +from .views import course_post_list, PostComments, lesson_post_list app_name = 'forum_api' urlpatterns = [ path('course_forum//', course_post_list), - path('course_forum///', course_post_detail), + path('course_forum///', PostComments.as_view()), path('lesson_forum//', lesson_post_list), ] diff --git a/forum/api/views.py b/forum/api/views.py index 3103bf4c3..256338919 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -2,14 +2,14 @@ from rest_framework.decorators import api_view from rest_framework.response import Response -from rest_framework import status +from rest_framework import status, generics -from forum.models import Post +from forum.models import Post, Comment from yaksh.models import Course, Lesson -from .serializers import PostSerializer +from .serializers import PostSerializer, CommentSerializer -@api_view(['GET']) +@api_view(['GET', 'POST']) def course_post_list(request, course_id): try: course = Course.objects.get(id=course_id) @@ -24,17 +24,21 @@ def course_post_list(request, course_id): serializer = PostSerializer(posts, many=True) return Response(serializer.data) - -@api_view(['GET']) -def course_post_detail(request, course_id, post_id): - try: - post = Post.objects.get(id=post_id) - except Post.DoesNotExist: - return Response(status=status.HTTP_404_NOT_FOUND) - - if request.method == 'GET': - post_serializer = PostSerializer(post) - return Response(post_serializer.data) + elif request.method == 'POST': + data = request.data + serializer = PostSerializer(data=data) + if serializer.is_valid(): + course_id = serializer.validated_data.get("target_id") + course = Course.objects.get(id=course_id) + serializer.validated_data['target'] = course + serializer.save() + return Response(serializer.data, status=status.HTTP_201_CREATED) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + + +class PostComments(generics.ListCreateAPIView): + queryset = Comment.objects.all() + serializer_class = CommentSerializer @api_view(['GET']) From 6431f8c0006f8e7584ef29344c0de7d8c17d221b Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 20 Jul 2021 18:21:18 +0530 Subject: [PATCH 07/12] use generic views --- forum/api/serializers.py | 34 +++++++++++++++------ forum/api/urls.py | 12 +++++--- forum/api/views.py | 66 +++++++++++++++++++++------------------- 3 files changed, 67 insertions(+), 45 deletions(-) diff --git a/forum/api/serializers.py b/forum/api/serializers.py index 7a661bb92..f267e96fd 100644 --- a/forum/api/serializers.py +++ b/forum/api/serializers.py @@ -1,24 +1,38 @@ from django.contrib.auth import get_user_model +from django.contrib.contenttypes.models import ContentType + from rest_framework import serializers from forum.models import Post, Comment +from yaksh.models import Course, Lesson from .relations import PostObjectRelatedField, UserRelatedSerializer -class PostSerializer(serializers.ModelSerializer): +class CommentSerializer(serializers.ModelSerializer): + + class Meta: + model = Comment + fields = ['description', 'image', 'active', 'anonymous', 'creator', + 'post_field'] + +class PostSerializer(serializers.ModelSerializer): + comments = CommentSerializer(read_only=True, many=True) target = PostObjectRelatedField(read_only=True) class Meta: model = Post fields = ['id', 'title', 'creator', 'description', 'created_at', 'modified_at', 'image', 'active', 'anonymous', - 'target_id', 'target'] - - - -class CommentSerializer(serializers.ModelSerializer): - - class Meta: - model = Comment - fields = '__all__' + 'target_id', 'target', 'comments'] + + def create(self, validated_data): + target_id = validated_data.get('target_id') + post = Post(**validated_data) + if 'lesson' in self.context: + object = Lesson.objects.get(id=target_id) + else: + object = Course.objects.get(id=target_id) + post.target = object + post.save() + return post \ No newline at end of file diff --git a/forum/api/urls.py b/forum/api/urls.py index b9a5e2e66..ab2901952 100644 --- a/forum/api/urls.py +++ b/forum/api/urls.py @@ -1,10 +1,14 @@ -from django.urls import path -from .views import course_post_list, PostComments, lesson_post_list +from django.urls import path, include + +from .views import PostComments, CoursePostList, LessonPostList app_name = 'forum_api' + urlpatterns = [ - path('course_forum//', course_post_list), + path('course_forum//', CoursePostList.as_view()), + # path('course_forum///', CoursePostDetail.as_view()), path('course_forum///', PostComments.as_view()), - path('lesson_forum//', lesson_post_list), + # path('course_forum////', PostCommentDetail.as_view()), + path('lesson_forum///', LessonPostList.as_view()) ] diff --git a/forum/api/views.py b/forum/api/views.py index 256338919..b1fa260b5 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -2,54 +2,58 @@ from rest_framework.decorators import api_view from rest_framework.response import Response -from rest_framework import status, generics +from rest_framework import status, generics, viewsets from forum.models import Post, Comment from yaksh.models import Course, Lesson from .serializers import PostSerializer, CommentSerializer -@api_view(['GET', 'POST']) -def course_post_list(request, course_id): - try: - course = Course.objects.get(id=course_id) - except Course.DoesNotExist: - return Response(status=status.HTTP_404_NOT_FOUND) +class CoursePostList(generics.ListCreateAPIView): - if request.method == 'GET': + serializer_class = PostSerializer + + def get_queryset(self): + try: + course = Course.objects.get(id=self.kwargs['course_id']) + except Course.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) course_ct = ContentType.objects.get_for_model(course) posts = Post.objects.filter(target_ct=course_ct, target_id=course.id, active=True) - serializer = PostSerializer(posts, many=True) - return Response(serializer.data) - - elif request.method == 'POST': - data = request.data - serializer = PostSerializer(data=data) - if serializer.is_valid(): - course_id = serializer.validated_data.get("target_id") - course = Course.objects.get(id=course_id) - serializer.validated_data['target'] = course - serializer.save() - return Response(serializer.data, status=status.HTTP_201_CREATED) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + return posts class PostComments(generics.ListCreateAPIView): - queryset = Comment.objects.all() + serializer_class = CommentSerializer + def get_queryset(self): + try: + post = Post.objects.get(id=self.kwargs['post_id']) + except Post.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + comments = post.comments.filter(active=True) + return comments + + +class LessonPostList(generics.ListCreateAPIView): -@api_view(['GET']) -def lesson_post_list(request, course_id): - try: - course = Course.objects.get(id=course_id) - except Course.DoesNotExist: - return Response(status=status.HTTP_404_NOT_FOUND) + serializer_class = PostSerializer - if request.method == 'GET': + def get_queryset(self): + try: + course = Course.objects.get(id=self.kwargs['course_id']) + except Course.DoesNotExists: + return Response(status=status.HTTP_404_NOT_FOUND) course_ct = ContentType.objects.get_for_model(course) lesson_posts = course.get_lesson_posts() - serializer = PostSerializer(lesson_posts, many=True) - return Response(serializer.data) \ No newline at end of file + return lesson_posts + + def get_serializer_context(self): + context = super(LessonPostList, self).get_serializer_context() + context.update({ + 'lesson': 'lesson' + }) + return context \ No newline at end of file From c4734c38267a88c8a31035e87c42e74a58ea5466 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 20 Jul 2021 20:01:08 +0530 Subject: [PATCH 08/12] separate endpoints for course_posts and lesson_posts --- forum/api/serializers.py | 2 +- forum/api/urls.py | 36 +++++++++++++++++++---- forum/api/views.py | 62 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 92 insertions(+), 8 deletions(-) diff --git a/forum/api/serializers.py b/forum/api/serializers.py index f267e96fd..71ecf9192 100644 --- a/forum/api/serializers.py +++ b/forum/api/serializers.py @@ -12,7 +12,7 @@ class CommentSerializer(serializers.ModelSerializer): class Meta: model = Comment - fields = ['description', 'image', 'active', 'anonymous', 'creator', + fields = ['id', 'description', 'image', 'active', 'anonymous', 'creator', 'post_field'] diff --git a/forum/api/urls.py b/forum/api/urls.py index ab2901952..cb73ec081 100644 --- a/forum/api/urls.py +++ b/forum/api/urls.py @@ -1,14 +1,40 @@ from django.urls import path, include -from .views import PostComments, CoursePostList, LessonPostList +from .views import CoursePostList, CoursePostDetail, CoursePostComments, \ + CoursePostCommentDetail, LessonPostList, LessonPostDetail, \ + LessonPostComments, LessonPostCommentDetail app_name = 'forum_api' urlpatterns = [ path('course_forum//', CoursePostList.as_view()), - # path('course_forum///', CoursePostDetail.as_view()), - path('course_forum///', PostComments.as_view()), - # path('course_forum////', PostCommentDetail.as_view()), - path('lesson_forum///', LessonPostList.as_view()) + path( + 'course_forum///', + CoursePostDetail.as_view() + ), + path( + 'course_forum///comments/', + CoursePostComments.as_view() + ), + path( + 'course_forum///comments//', + CoursePostCommentDetail.as_view() + ), + path( + 'lesson_forum///', + LessonPostList.as_view() + ), + path( + 'lesson_forum////', + LessonPostDetail.as_view() + ), + path( + 'lesson_forum////comments/', + LessonPostComments.as_view() + ), + path( + 'lesson_forum////comments//', + LessonPostCommentDetail.as_view() + ), ] diff --git a/forum/api/views.py b/forum/api/views.py index b1fa260b5..a77fbddb5 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -25,7 +25,19 @@ def get_queryset(self): return posts -class PostComments(generics.ListCreateAPIView): +class CoursePostDetail(generics.RetrieveUpdateDestroyAPIView): + + serializer_class = PostSerializer + + def get_object(self): + try: + post = Post.objects.get(id=self.kwargs['post_id']) + except Post.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + return post + + +class CoursePostComments(generics.ListCreateAPIView): serializer_class = CommentSerializer @@ -38,6 +50,17 @@ def get_queryset(self): return comments +class CoursePostCommentDetail(generics.RetrieveUpdateDestroyAPIView): + + serializer_class = CommentSerializer + + def get_object(self): + try: + comment = Comment.objects.get(id=self.kwargs['comment_id']) + except Comment.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + return comment + class LessonPostList(generics.ListCreateAPIView): serializer_class = PostSerializer @@ -56,4 +79,39 @@ def get_serializer_context(self): context.update({ 'lesson': 'lesson' }) - return context \ No newline at end of file + return context + + +class LessonPostDetail(generics.RetrieveUpdateDestroyAPIView): + serializer_class = PostSerializer + + def get_object(self): + try: + post = Post.objects.get(id=self.kwargs['post_id']) + except Post.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + return post + + +class LessonPostComments(generics.ListCreateAPIView): + serializer_class = CommentSerializer + + def get_queryset(self): + try: + post = Post.objects.get(id=self.kwargs['post_id']) + except Post.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + comments = post.comments.filter(active=True) + return comments + + +class LessonPostCommentDetail(generics.RetrieveUpdateDestroyAPIView): + + serializer_class = CommentSerializer + + def get_object(self): + try: + comment = Comment.objects.get(id=self.kwargs['comment_id']) + except Comment.DoesNotExist: + return Response(status=status.HTTP_404_NOT_FOUND) + return comment From fd757fd048c99faecf05356ff268beb53560b46d Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 21 Jul 2021 18:51:14 +0530 Subject: [PATCH 09/12] Minor fix in forums --- yaksh/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yaksh/views.py b/yaksh/views.py index 936b6c6f2..ed0ef46d7 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -2848,13 +2848,13 @@ def show_lesson(request, lesson_id, module_id, course_id): raise Http404(f'Post does not exist for lesson {title}') else: form = CommentForm() - comments = post.comment.filter(active=True) + comments = post.comments.filter(active=True) context = {'lesson': learn_unit.lesson, 'user': user, 'course': course, 'state': "lesson", "all_modules": all_modules, 'learning_units': learning_units, "current_unit": learn_unit, 'learning_module': learn_module, 'toc': toc, 'contents_by_time': contents_by_time, 'track_id': track.id, - 'comments': comments, 'form': form, 'post': post} + 'comments': comments, 'form': form, 'post': post} return my_render_to_response(request, 'yaksh/show_video.html', context) From fb1f9fa372f83931c2dbbc21edc440322da153ed Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 21 Jul 2021 18:52:18 +0530 Subject: [PATCH 10/12] Lesson has only one post and many comments --- forum/api/serializers.py | 5 +---- forum/api/urls.py | 6 +----- forum/api/views.py | 34 +++++++++++++--------------------- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/forum/api/serializers.py b/forum/api/serializers.py index 71ecf9192..dab39c9ff 100644 --- a/forum/api/serializers.py +++ b/forum/api/serializers.py @@ -29,10 +29,7 @@ class Meta: def create(self, validated_data): target_id = validated_data.get('target_id') post = Post(**validated_data) - if 'lesson' in self.context: - object = Lesson.objects.get(id=target_id) - else: - object = Course.objects.get(id=target_id) + object = Course.objects.get(id=target_id) post.target = object post.save() return post \ No newline at end of file diff --git a/forum/api/urls.py b/forum/api/urls.py index cb73ec081..9f5c31b81 100644 --- a/forum/api/urls.py +++ b/forum/api/urls.py @@ -1,7 +1,7 @@ from django.urls import path, include from .views import CoursePostList, CoursePostDetail, CoursePostComments, \ - CoursePostCommentDetail, LessonPostList, LessonPostDetail, \ + CoursePostCommentDetail, LessonPostDetail, \ LessonPostComments, LessonPostCommentDetail app_name = 'forum_api' @@ -23,10 +23,6 @@ ), path( 'lesson_forum///', - LessonPostList.as_view() - ), - path( - 'lesson_forum////', LessonPostDetail.as_view() ), path( diff --git a/forum/api/views.py b/forum/api/views.py index a77fbddb5..cf5564249 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -61,35 +61,27 @@ def get_object(self): return Response(status=status.HTTP_404_NOT_FOUND) return comment -class LessonPostList(generics.ListCreateAPIView): - - serializer_class = PostSerializer - - def get_queryset(self): - try: - course = Course.objects.get(id=self.kwargs['course_id']) - except Course.DoesNotExists: - return Response(status=status.HTTP_404_NOT_FOUND) - course_ct = ContentType.objects.get_for_model(course) - lesson_posts = course.get_lesson_posts() - return lesson_posts - - def get_serializer_context(self): - context = super(LessonPostList, self).get_serializer_context() - context.update({ - 'lesson': 'lesson' - }) - return context class LessonPostDetail(generics.RetrieveUpdateDestroyAPIView): serializer_class = PostSerializer def get_object(self): + lesson_id = self.kwargs['lesson_id'] + lesson = Lesson.objects.get(id=lesson_id) + lesson_ct = ContentType.objects.get_for_model(lesson) try: - post = Post.objects.get(id=self.kwargs['post_id']) + post = Post.objects.get( + target_ct=lesson_ct, target_id=lesson_id, + active=True, title=lesson.name + ) except Post.DoesNotExist: - return Response(status=status.HTTP_404_NOT_FOUND) + post = Post.objects.create( + target_ct=lesson_ct, target_id=lesson_id, + active=True, title=lesson.name, creator=self.request.user, + description=f'Discussion on {lesson.name} lesson', + ) + return post From 81437adcc32660fb76c759d5370c1a4080f620d4 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Thu, 22 Jul 2021 16:50:03 +0530 Subject: [PATCH 11/12] Adding permissions to views --- forum/api/permissions.py | 12 +++++++++ forum/api/relations.py | 5 ---- forum/api/serializers.py | 2 +- forum/api/views.py | 57 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 forum/api/permissions.py diff --git a/forum/api/permissions.py b/forum/api/permissions.py new file mode 100644 index 000000000..dd1a198bd --- /dev/null +++ b/forum/api/permissions.py @@ -0,0 +1,12 @@ +from rest_framework import permissions + + +class IsAuthorOrReadOnly(permissions.BasePermission): + + def has_object_permission(self, request, view, obj): + # Read-only permissions are allowed for any request + if request.method in permissions.SAFE_METHODS: + return True + + # write permissions are only allowed to the author of a post + return obj.creator == request.user \ No newline at end of file diff --git a/forum/api/relations.py b/forum/api/relations.py index dd519160a..0a759a77a 100644 --- a/forum/api/relations.py +++ b/forum/api/relations.py @@ -11,8 +11,3 @@ def to_representation(self, value): elif isinstance(value, Lesson): return 'Lesson: ' + value.name raise Exception('Unexpected type of tagged object') - - -class UserRelatedSerializer(serializers.RelatedField): - def to_representation(self, value): - return value.id \ No newline at end of file diff --git a/forum/api/serializers.py b/forum/api/serializers.py index dab39c9ff..95a651689 100644 --- a/forum/api/serializers.py +++ b/forum/api/serializers.py @@ -5,7 +5,7 @@ from forum.models import Post, Comment from yaksh.models import Course, Lesson -from .relations import PostObjectRelatedField, UserRelatedSerializer +from .relations import PostObjectRelatedField class CommentSerializer(serializers.ModelSerializer): diff --git a/forum/api/views.py b/forum/api/views.py index cf5564249..03af9cca4 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -2,16 +2,20 @@ from rest_framework.decorators import api_view from rest_framework.response import Response -from rest_framework import status, generics, viewsets +from rest_framework import status, generics +from rest_framework.permissions import IsAuthenticated from forum.models import Post, Comment from yaksh.models import Course, Lesson from .serializers import PostSerializer, CommentSerializer +from .permissions import IsAuthorOrReadOnly class CoursePostList(generics.ListCreateAPIView): serializer_class = PostSerializer + # permissions for only course registered students + permission_classes = [IsAuthenticated] def get_queryset(self): try: @@ -36,10 +40,24 @@ def get_object(self): return Response(status=status.HTTP_404_NOT_FOUND) return post + def get_permissions(self): + # permissions for only course registered students + permission_classes = [] + if self.request.method == 'GET': + permission_classes = [IsAuthenticated] + elif self.request.method == 'PUT' \ + or self.request.method == 'DELETE' \ + or self.request.method == 'PATCH': + permission_classes = [IsAuthenticated, IsAuthorOrReadOnly] + + return [permission() for permission in permission_classes] + class CoursePostComments(generics.ListCreateAPIView): serializer_class = CommentSerializer + # permissions for only course registered students + permission_classes = [IsAuthenticated] def get_queryset(self): try: @@ -61,6 +79,17 @@ def get_object(self): return Response(status=status.HTTP_404_NOT_FOUND) return comment + def get_permissions(self): + # permissions for only course registered students + permission_classes = [] + if self.request.method == 'GET': + permission_classes = [IsAuthenticated] + elif self.request.method == 'PUT' \ + or self.request.method == 'DELETE' \ + or self.request.method == 'PATCH': + permission_classes = [IsAuthenticated, IsAuthorOrReadOnly] + + return [permission() for permission in permission_classes] class LessonPostDetail(generics.RetrieveUpdateDestroyAPIView): @@ -84,9 +113,23 @@ def get_object(self): return post + def get_permissions(self): + # permissions for only course registered students + permission_classes = [] + if self.request.method == 'GET': + permission_classes = [IsAuthenticated] + elif self.request.method == 'PUT' \ + or self.request.method == 'DELETE' \ + or self.request.method == 'PATCH': + permission_classes = [IsAuthenticated, IsAuthorOrReadOnly] + + return [permission() for permission in permission_classes] + class LessonPostComments(generics.ListCreateAPIView): serializer_class = CommentSerializer + # permissions for only course registered students + permission_classes = [IsAuthenticated] def get_queryset(self): try: @@ -107,3 +150,15 @@ def get_object(self): except Comment.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) return comment + + def get_permissions(self): + # permissions for only course registered students + permission_classes = [] + if self.request.method == 'GET': + permission_classes = [IsAuthenticated] + elif self.request.method == 'PUT' \ + or self.request.method == 'DELETE' \ + or self.request.method == 'PATCH': + permission_classes = [IsAuthenticated, IsAuthorOrReadOnly] + + return [permission() for permission in permission_classes] From 0980010610e82195ca57bd6cd6cb423231112340 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 4 Aug 2021 17:21:22 +0530 Subject: [PATCH 12/12] Forum API tests --- forum/api/permissions.py | 4 +- forum/api/tests.py | 253 +++++++++++++++++++++++++++++++++++++++ forum/api/urls.py | 20 ++-- forum/api/views.py | 16 ++- 4 files changed, 276 insertions(+), 17 deletions(-) create mode 100644 forum/api/tests.py diff --git a/forum/api/permissions.py b/forum/api/permissions.py index dd1a198bd..799cd5aa9 100644 --- a/forum/api/permissions.py +++ b/forum/api/permissions.py @@ -1,5 +1,7 @@ from rest_framework import permissions +from yaksh.models import Course + class IsAuthorOrReadOnly(permissions.BasePermission): @@ -9,4 +11,4 @@ def has_object_permission(self, request, view, obj): return True # write permissions are only allowed to the author of a post - return obj.creator == request.user \ No newline at end of file + return obj.creator == request.user diff --git a/forum/api/tests.py b/forum/api/tests.py new file mode 100644 index 000000000..fe85fe35a --- /dev/null +++ b/forum/api/tests.py @@ -0,0 +1,253 @@ +from django.contrib.auth.models import Group, User +from django.contrib.contenttypes.models import ContentType + +from rest_framework.test import APITestCase +from rest_framework.reverse import reverse +from rest_framework import status + + +from yaksh.models import Course +from forum.models import Post, Comment + + +class TestPost(APITestCase): + def setUp(self): + self.mod_group = Group.objects.create(name='moderator') + self.student_pass = 'student' + self.student = User.objects.create_user( + username='student', + password=self.student_pass, + first_name='Tony', + last_name='Stark', + email='tony@starkenterprises.com' + ) + + self.mod_user_pass = 'demo' + self.mod_user = User.objects.create_user( + username='mod_user', + password=self.mod_user_pass, + first_name='first_name', + last_name='last_name', + email='mod_user@test.com' + ) + + self.course = Course.objects.create( + name='Python Course', + enrollment='Enroll Request', + creator=self.mod_user + ) + + course_ct = ContentType.objects.get_for_model(self.course) + + self.post = Post.objects.create( + title="Post1", + description="Post 1 description", + target_ct=course_ct, target_id=self.course.id, + creator=self.student + ) + + def test_view_course_forum_anonymously(self): + url = reverse('forum_api:course_post_list', kwargs={ + 'course_id': self.course.id + }) + response = self.client.get(url) + self.assertEqual(status.HTTP_401_UNAUTHORIZED, response.status_code) + + def test_view_course_forum(self): + self.client.login(username=self.student.username, password=self.student_pass) + url = reverse('forum_api:course_post_list', kwargs={ + 'course_id': self.course.id + }) + response = self.client.get(url) + self.assertEqual(status.HTTP_200_OK, response.status_code) + + def test_new_post_valid_post_data(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_list', kwargs={ + 'course_id': self.course.id + }) + data = { + "title": "Post 1", + "description": "Post 1 description", + "creator": self.student.id, + "target_id": self.course.id + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_201_CREATED, response.status_code) + + def test_new_post_invalid_post_data(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_list', kwargs={ + 'course_id': self.course.id + }) + data = { + "title": "Post 1", + "description": "Post 1 description", + "target_id": self.course.id + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + + def test_new_post_invalid_post_data_empty_fields(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_list', kwargs={ + 'course_id': self.course.id + }) + data = { + "title": "", + "description": "", + "creator": "", + "target_id": "" + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + + def test_hide_post(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_detail', kwargs={ + 'course_id': self.course.id, + 'post_id': self.post.id + }) + data = { + "title": "Post1", + "description": "Post 1 description", + "target_id": self.course.id, + "creator": self.student.id, + "active": False + } + response = self.client.put(url, data) + self.assertEqual(status.HTTP_200_OK, response.status_code) + + + def tearDown(self): + self.mod_user.delete() + self.student.delete() + self.course.delete() + self.mod_group.delete() + self.post.delete() + + +class TestPostComment(APITestCase): + def setUp(self): + self.mod_group = Group.objects.create(name='moderator') + self.student_pass = 'student' + self.student = User.objects.create_user( + username='student', + password=self.student_pass, + first_name='Tony', + last_name='Stark', + email='tony@starkenterprises.com' + ) + + self.mod_user_pass = 'demo' + self.mod_user = User.objects.create_user( + username='mod_user', + password=self.mod_user_pass, + first_name='first_name', + last_name='last_name', + email='mod_user@test.com' + ) + + self.course = Course.objects.create( + name='Python Course', + enrollment='Enroll Request', + creator=self.mod_user + ) + + course_ct = ContentType.objects.get_for_model(self.course) + + self.post = Post.objects.create( + title="Post1", + description="Post 1 description", + target_ct=course_ct, target_id=self.course.id, + creator=self.student + ) + + self.comment = Comment.objects.create( + post_field=self.post, + description='post 1 comment', + creator=self.student + ) + + def test_post_comments_view_success_status_code(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_comments', kwargs={ + 'course_id': self.course.id, + 'post_id': self.post.id + }) + response = self.client.get(url) + self.assertEqual(status.HTTP_200_OK, response.status_code) + + def test_post_comment_valid_post_data(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_comments', kwargs={ + 'course_id': self.course.id, + 'post_id': self.post.id + }) + data = { + 'post_field': self.post.id, + 'description': 'post 1 comment', + 'creator': self.student.id + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_201_CREATED, response.status_code) + + def test_post_comment_invalid_post_data(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_comments', kwargs={ + 'course_id': self.course.id, + 'post_id': self.post.id + }) + data = { + 'post_field': self.post.id, + 'description': 'post 1 comment', + 'creator': "" + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + + def test_post_comments_post_data_empty_fields(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_comments', kwargs={ + 'course_id': self.course.id, + 'post_id': self.post.id + }) + data = { + 'post_field': "", + 'description': "", + 'creator': "" + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + + def test_hide_post_comment(self): + self.client.login(username=self.student.username, password=self.student_pass) + self.course.students.add(self.student) + url = reverse('forum_api:course_post_comment_detail', kwargs={ + 'course_id': self.course.id, + 'post_id': self.post.id, + 'comment_id': self.comment.id + }) + data = { + 'post_field': self.post.id, + 'description': 'post 1 comment', + 'creator': self.student.id, + 'active': False + } + response = self.client.put(url, data) + self.assertEqual(status.HTTP_200_OK, response.status_code) + + def tearDown(self): + self.mod_user.delete() + self.student.delete() + self.course.delete() + self.mod_group.delete() + self.post.delete() diff --git a/forum/api/urls.py b/forum/api/urls.py index 9f5c31b81..d74bee77c 100644 --- a/forum/api/urls.py +++ b/forum/api/urls.py @@ -8,29 +8,35 @@ urlpatterns = [ - path('course_forum//', CoursePostList.as_view()), + path('course_forum//', CoursePostList.as_view(), name='course_post_list'), path( 'course_forum///', - CoursePostDetail.as_view() + CoursePostDetail.as_view(), + name='course_post_detail' ), path( 'course_forum///comments/', - CoursePostComments.as_view() + CoursePostComments.as_view(), + name='course_post_comments' ), path( 'course_forum///comments//', - CoursePostCommentDetail.as_view() + CoursePostCommentDetail.as_view(), + name='course_post_comment_detail' ), path( 'lesson_forum///', - LessonPostDetail.as_view() + LessonPostDetail.as_view(), + name='lesson_post_detail' ), path( 'lesson_forum////comments/', - LessonPostComments.as_view() + LessonPostComments.as_view(), + name='lesson_post_comments' ), path( 'lesson_forum////comments//', - LessonPostCommentDetail.as_view() + LessonPostCommentDetail.as_view(), + name='lesson_post_comment_detail' ), ] diff --git a/forum/api/views.py b/forum/api/views.py index 03af9cca4..5d86e0641 100644 --- a/forum/api/views.py +++ b/forum/api/views.py @@ -14,14 +14,18 @@ class CoursePostList(generics.ListCreateAPIView): serializer_class = PostSerializer - # permissions for only course registered students permission_classes = [IsAuthenticated] - def get_queryset(self): + def get_course(self, course_id): try: - course = Course.objects.get(id=self.kwargs['course_id']) + course = Course.objects.get(id=course_id) except Course.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) + return course + + def get_queryset(self): + course_id = self.kwargs['course_id'] + course = self.get_course(course_id) course_ct = ContentType.objects.get_for_model(course) posts = Post.objects.filter(target_ct=course_ct, target_id=course.id, @@ -41,7 +45,6 @@ def get_object(self): return post def get_permissions(self): - # permissions for only course registered students permission_classes = [] if self.request.method == 'GET': permission_classes = [IsAuthenticated] @@ -56,7 +59,6 @@ def get_permissions(self): class CoursePostComments(generics.ListCreateAPIView): serializer_class = CommentSerializer - # permissions for only course registered students permission_classes = [IsAuthenticated] def get_queryset(self): @@ -80,7 +82,6 @@ def get_object(self): return comment def get_permissions(self): - # permissions for only course registered students permission_classes = [] if self.request.method == 'GET': permission_classes = [IsAuthenticated] @@ -114,7 +115,6 @@ def get_object(self): return post def get_permissions(self): - # permissions for only course registered students permission_classes = [] if self.request.method == 'GET': permission_classes = [IsAuthenticated] @@ -128,7 +128,6 @@ def get_permissions(self): class LessonPostComments(generics.ListCreateAPIView): serializer_class = CommentSerializer - # permissions for only course registered students permission_classes = [IsAuthenticated] def get_queryset(self): @@ -152,7 +151,6 @@ def get_object(self): return comment def get_permissions(self): - # permissions for only course registered students permission_classes = [] if self.request.method == 'GET': permission_classes = [IsAuthenticated]