Unpublish Project Feature (#459)

* Init * Unpublish project form (#452) * Lay out structure * Make progress * Style menu * Style checkboxes & buttons * Add api call * Make mobile-friendly * Last styling changes * Address styling comments * Remove for non-staff & non-moderators * Add violations backend code (#447) * Add violations backend system * Fix typo * Add new migrations * Basic * Use array * Fix issuesgit status * Swap fetch parameter * Add responses * Add new violation ui for violation notifications * Fix models Co-authored-by: Aditya Jain <[email protected]> * Unpublished Project Modal (#446) * set up modal * style changes * change to label and mobile styles * tiny fix of class style * scrolling * tiny style fix * clean up unused things * overflow scroll bar adjustments * Small style * remove important Co-authored-by: Aditya Jain <[email protected]> * Integrate Co-authored-by: Grace Zhang <[email protected]> Co-authored-by: Andrew Lester <[email protected]> Co-authored-by: Zora Zhang <[email protected]>
unstructuredstudio · May 10, 2022 · f73bf35 · f73bf35
1 parent e3e3bbf
commit f73bf35
Show file tree

Hide file tree

Showing 32 changed files with 1,181 additions and 221 deletions.
diff --git a/zubhub_backend/compose/web/dev/start b/zubhub_backend/compose/web/dev/start
@@ -18,6 +18,7 @@ python /zubhub_backend/zubhub/manage.py createcachetable
 
 python /zubhub_backend/zubhub/manage.py populate_countries
 python /zubhub_backend/zubhub/manage.py populate_categories
+python /zubhub_backend/zubhub/manage.py populate_violation_reasons
 python /zubhub_backend/zubhub/manage.py populate_initial_creator_tags
 
 exec /usr/local/bin/gunicorn zubhub.wsgi --reload --threads=3 --timeout 155 --bind 0.0.0.0:8000 \

diff --git a/zubhub_backend/zubhub/creators/migrations/0009_alter_setting_contact.py b/zubhub_backend/zubhub/creators/migrations/0009_alter_setting_contact.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2022-04-30 01:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('creators', '0008_auto_20220222_0254'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='setting',
+            name='contact',
+            field=models.PositiveSmallIntegerField(blank=True, choices=[(1, 'WHATSAPP'), (2, 'EMAIL'), (3, 'SMS'), (4, 'WEB')], default=3, null=True),
+        ),
+    ]
diff --git a/zubhub_backend/zubhub/creators/utils.py b/zubhub_backend/zubhub/creators/utils.py
@@ -241,6 +241,7 @@ def activity_notification(activities, **kwargs):
     if len(phone_contexts) > 0 and ctx_values:
         send_mass_text.delay(template_name=template_name, ctxs=phone_contexts)
 
+
 def perform_creator_search(user, query_string):
     from creators.models import CreatorTag
     """
@@ -254,28 +255,28 @@ def perform_creator_search(user, query_string):
     rank = SearchRank(F('search_vector'), query)
     result_creators = None
 
-
     # fetch all creators whose creatortag(s) matches the search query
     result_tags = CreatorTag.objects.filter(
         search_vector=query).prefetch_related("creators")
 
     for tag in result_tags:
-        result_creators = tag.creators.filter(is_active=True).annotate(rank=rank).order_by('-rank')
+        result_creators = tag.creators.filter(is_active=True).annotate(
+            rank=rank).order_by('-rank')
     ############################################################
 
     # fetch all creators that matches the search term
     if result_creators:
-        result_creators.union(get_user_model().objects.annotate(rank=rank).filter(
-            search_vector=query, is_active=True ).order_by('-rank'))
+        result_creators.union(get_user_model().objects.annotate(
+            rank=rank).filter(search_vector=query,
+                              is_active=True).order_by('-rank'))
     else:
         result_creators = get_user_model().objects.annotate(rank=rank).filter(
-            search_vector=query,is_active=True ).order_by('-rank')
+            search_vector=query, is_active=True).order_by('-rank')
     ##############################################################
 
     return result_creators
 
 
-
 def custom_set_creatortags_queryset(creator, creatortags):
     """
     Handle the process of assigning a queryset of creatortags to creator.tags
@@ -298,22 +299,26 @@ def custom_set_creatortags_queryset(creator, creatortags):
 
         tag = CreatorTag.objects.filter(name="staff").first()
         if creatortags.filter(name=tag.name).exists():
-            creator.tags.set(enforce_creator__creator_tags_constraints(creator, tag))
+            creator.tags.set(
+                enforce_creator__creator_tags_constraints(creator, tag))
             creatortags = creatortags.exclude(name=tag.name)
 
         tag = CreatorTag.objects.filter(name="moderator").first()
         if creatortags.filter(name=tag.name).exists():
-            creator.tags.set(enforce_creator__creator_tags_constraints(creator, tag))
+            creator.tags.set(
+                enforce_creator__creator_tags_constraints(creator, tag))
             creatortags = creatortags.exclude(name=tag.name)
 
         tag = CreatorTag.objects.filter(name="group").first()
         if creatortags.filter(name=tag.name).exists():
-            creator.tags.set(enforce_creator__creator_tags_constraints(creator, tag))
+            creator.tags.set(
+                enforce_creator__creator_tags_constraints(creator, tag))
             creatortags = creatortags.exclude(name=tag.name)
 
         tag = CreatorTag.objects.filter(name="creator").first()
         if creatortags.filter(name=tag.name).exists():
-            creator.tags.set(enforce_creator__creator_tags_constraints(creator, tag))
+            creator.tags.set(
+                enforce_creator__creator_tags_constraints(creator, tag))
             creatortags = creatortags.exclude(name=tag.name)
 
 
@@ -336,25 +341,29 @@ def enforce_creator__creator_tags_constraints(creator, tag):
 
         if tag.name == "creator":
             """ If tag is 'creator', ensure that 'staff', 'moderator' and 'group' tags are not in the user's tags list """
-            diff = CreatorTag.objects.filter(name__in=["creator", "staff", "group", "moderator"])
+            diff = CreatorTag.objects.filter(
+                name__in=["creator", "staff", "group", "moderator"])
             tags_to_set = creator.tags.difference(diff)
             return tags_to_set.union(diff.filter(name=tag.name))
-            
+
         elif tag.name == "staff":
             """ If tag is 'staff', ensure that 'creator' and 'group' tags are not in the user's tags list """
-            diff = CreatorTag.objects.filter(name__in=["creator", "staff", "group"])
+            diff = CreatorTag.objects.filter(
+                name__in=["creator", "staff", "group"])
             tags_to_set = creator.tags.difference(diff)
             return tags_to_set.union(diff.filter(name=tag.name))
 
         elif tag.name == "moderator":
             """ If tag is 'moderator', ensure that 'creator' and 'group' tags are not in the user's tags list """
-            diff = CreatorTag.objects.filter(name__in=["creator", "group", "moderator"])
+            diff = CreatorTag.objects.filter(
+                name__in=["creator", "group", "moderator"])
             tags_to_set = creator.tags.difference(diff)
             return tags_to_set.union(diff.filter(name=tag.name))
 
         elif tag.name == "group":
             """ If tag is 'group', ensure that 'staff', 'creator' and 'moderator' tags are not in the user's tags list """
-            diff = CreatorTag.objects.filter(name__in=["creator", "staff", "group", "moderator"])
+            diff = CreatorTag.objects.filter(
+                name__in=["creator", "staff", "group", "moderator"])
             tags_to_set = creator.tags.difference(diff)
             return tags_to_set.union(diff.filter(name=tag.name))
 
@@ -368,16 +377,14 @@ def enforce_creator__creator_tags_constraints(creator, tag):
         return creator.tags.all()
 
 
-
+ALL_SETTINGS = {Setting.WHATSAPP, Setting.EMAIL, Setting.SMS, Setting.WEB}
 enabled_notification_settings: Dict[Notification.Type, Set[int]] = {
     Notification.Type.BOOKMARK: {Setting.WEB},
     Notification.Type.CLAP: {Setting.WEB},
-    Notification.Type.COMMENT:
-    {Setting.WHATSAPP, Setting.EMAIL, Setting.SMS, Setting.WEB},
-    Notification.Type.FOLLOW:
-    {Setting.WHATSAPP, Setting.EMAIL, Setting.SMS, Setting.WEB},
-    Notification.Type.FOLLOWING_PROJECT:
-    {Setting.WHATSAPP, Setting.EMAIL, Setting.SMS, Setting.WEB},
+    Notification.Type.COMMENT: ALL_SETTINGS,
+    Notification.Type.FOLLOW: ALL_SETTINGS,
+    Notification.Type.FOLLOWING_PROJECT: ALL_SETTINGS,
+    Notification.Type.PROJECT_VIOLATION: ALL_SETTINGS
 }
 
 

diff --git a/zubhub_backend/zubhub/notifications/migrations/0010_alter_notification_type.py b/zubhub_backend/zubhub/notifications/migrations/0010_alter_notification_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2022-04-30 01:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0009_alter_notification_sources'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notification',
+            name='type',
+            field=models.PositiveSmallIntegerField(choices=[(1, 'Bookmark'), (2, 'Clap'), (3, 'Comment'), (4, 'Follow'), (5, 'Following Project'), (6, 'Project Violation')]),
+        ),
+    ]
diff --git a/zubhub_backend/zubhub/notifications/models.py b/zubhub_backend/zubhub/notifications/models.py
@@ -6,21 +6,28 @@
 
 
 class Notification(models.Model):
+
     class Type(models.IntegerChoices):
         BOOKMARK = 1
         CLAP = 2
         COMMENT = 3
         FOLLOW = 4
         FOLLOWING_PROJECT = 5
+        PROJECT_VIOLATION = 6
 
-    id = models.UUIDField(
-        primary_key=True, default=uuid.uuid4, editable=False, unique=True)
-    type = models.PositiveSmallIntegerField(
-        choices=Type.choices,
-    )
-    recipient = models.ForeignKey(
-        Creator, on_delete=models.CASCADE, null=True, related_name="notification_recipient", blank=True)
-    sources = models.ManyToManyField(Creator, related_name='notification_source', blank=True)
+    id = models.UUIDField(primary_key=True,
+                          default=uuid.uuid4,
+                          editable=False,
+                          unique=True)
+    type = models.PositiveSmallIntegerField(choices=Type.choices, )
+    recipient = models.ForeignKey(Creator,
+                                  on_delete=models.CASCADE,
+                                  null=True,
+                                  related_name="notification_recipient",
+                                  blank=True)
+    sources = models.ManyToManyField(Creator,
+                                     related_name='notification_source',
+                                     blank=True)
     message = models.CharField(max_length=255, blank=True, null=True)
     link = models.CharField(max_length=1000, blank=True, null=True)
     viewed = models.BooleanField(default=False)

diff --git a/zubhub_backend/zubhub/projects/admin.py b/zubhub_backend/zubhub/projects/admin.py
@@ -2,8 +2,8 @@
 from treebeard.admin import TreeAdmin
 from treebeard.forms import movenodeform_factory
 from django.conf import settings
-from .models import (Project, Comment, Image, StaffPick, 
-                    Category, Tag, PublishingRule)
+from .models import (Project, Comment, Image, StaffPick, Category, Tag,
+                     PublishingRule, Violation, ViolationReason)
 from .utils import project_changed, send_staff_pick_notification
 from projects.tasks import delete_file_task
 from creators.utils import activity_notification
@@ -24,20 +24,22 @@ class InlineProjectComments(admin.StackedInline):
 class InlineProject(admin.StackedInline):
     model = Project.staff_picks.through
 
+
 class ImageAdmin(admin.ModelAdmin):
     search_fields = ["project__title", "image_url"]
     list_display = ["image_url"]
     exclude = ["id"]
-    list_per_page = 50 ## paginate when more than 50 items
-        
+    list_per_page = 50  ## paginate when more than 50 items
+
 
 class CommentAdmin(TreeAdmin):
     list_display = ["creator", "text", "created_on", "publish"]
-
-    search_fields = ["project__tite",
-                     "creator__username", "text", "created_on"]
+
+    search_fields = [
+        "project__tite", "creator__username", "text", "created_on"
+    ]
     list_filter = ["created_on"]
-    list_per_page = 50 ## paginate when more than 50 items
+    list_per_page = 50  ## paginate when more than 50 items
 
     form = movenodeform_factory(Comment)
 
@@ -51,18 +53,24 @@ def get_readonly_fields(self, request, obj=None):
 
 
 class ProjectAdmin(admin.ModelAdmin):
-    list_display = ["title", "creator", "views_count", "likes_count",
-                    "comments_count", "created_on", "publish"]
-
-    search_fields = ["title", 'creator__username', 'creator__email',
-                     "created_on"]
+    list_display = [
+        "title", "creator", "views_count", "likes_count", "comments_count",
+        "created_on", "publish"
+    ]
+
+    search_fields = [
+        "title", 'creator__username', 'creator__email', "created_on"
+    ]
     list_filter = ['created_on']
     inlines = [InlineProjectImages, InlineProjectComments]
     exclude = ["search_vector"]
-    list_per_page = 50 ## paginate when more than 50 items
+    list_per_page = 50  ## paginate when more than 50 items
 
     def get_readonly_fields(self, request, obj=None):
-        return ["id", "slug", "views_count", "likes_count", "comments_count", "created_on"]
+        return [
+            "id", "slug", "views_count", "likes_count", "comments_count",
+            "created_on"
+        ]
 
     def save_model(self, request, obj, form, change):
         if change:
@@ -72,10 +80,12 @@ def save_model(self, request, obj, form, change):
 
         if change:
             new = Project.objects.get(pk=obj.pk)
-            if old.video.find("cloudinary.com") > -1 and old.video != new.video:
+            if old.video.find(
+                    "cloudinary.com") > -1 and old.video != new.video:
                 delete_file_task.delay(old.video)
-            elif old.video.startswith("{0}://{1}".format(settings.DEFAULT_MEDIA_SERVER_PROTOCOL,
-                                                         settings.DEFAULT_MEDIA_SERVER_DOMAIN)) and old.video != new.video:
+            elif old.video.startswith("{0}://{1}".format(
+                    settings.DEFAULT_MEDIA_SERVER_PROTOCOL, settings.
+                    DEFAULT_MEDIA_SERVER_DOMAIN)) and old.video != new.video:
                 delete_file_task.delay(old.video)
             if project_changed(old, new):
                 info = {
@@ -85,8 +95,6 @@ def save_model(self, request, obj, form, change):
                 activity_notification(["edited_project"], **info)
 
 
-
-
 def projects_count(obj):
     if obj:
         return obj.projects.count()
@@ -136,7 +144,19 @@ class tagAdmin(admin.ModelAdmin):
     search_fields = ["name"]
     readonly_fields = ["slug"]
     exclude = ["id", "search_vector"]
-    list_per_page = 50 ## paginate when more than 50 items
+    list_per_page = 50  ## paginate when more than 50 items
+
+
+class ViolationReasonsAdmin(admin.ModelAdmin):
+    search_fields = ['description']
+    exclude = ["id"]
+    list_per_page = 50
+
+
+class ViolationAdmin(admin.ModelAdmin):
+    search_fields = ["name"]
+    exclude = ["id"]
+    list_per_page = 50
 
 
 admin.site.register(Project, ProjectAdmin)
@@ -145,3 +165,5 @@ class tagAdmin(admin.ModelAdmin):
 admin.site.register(Category, categoryAdmin)
 admin.site.register(Tag, tagAdmin)
 admin.site.register(StaffPick, StaffPickAdmin)
+admin.site.register(ViolationReason, ViolationReasonsAdmin)
+admin.site.register(Violation, ViolationAdmin)
diff --git a/zubhub_backend/zubhub/projects/management/commands/populate_violation_reasons.py b/zubhub_backend/zubhub/projects/management/commands/populate_violation_reasons.py
@@ -0,0 +1,25 @@
+from projects.models import ViolationReason
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Populate ViolationReason table with violation reasons'
+
+    def handle(self, *args, **kwargs):
+        if ViolationReason.objects.all().count() < 1:
+            with open(
+                    "./zubhub/projects/management/commands/violation_reasons.txt",
+                    "r") as violation_reasons:
+                violation_reasons = violation_reasons.readlines()
+                for violation_reason in violation_reasons:
+                    self.stdout.write(violation_reason)
+                    ViolationReason.objects.create(
+                        description=violation_reason.split("\n")[0])
+            self.stdout.write(
+                self.style.SUCCESS(
+                    'The ViolationReason table has been successfully populated!'
+                ))
+        else:
+            self.stdout.write(
+                self.style.NOTICE(
+                    'The ViolationReason table is already populated'))
diff --git a/zubhub_backend/zubhub/projects/management/commands/violation_reasons.txt b/zubhub_backend/zubhub/projects/management/commands/violation_reasons.txt
@@ -0,0 +1,7 @@
+Promotes bigotry, discrimination, hatred, or violence against any individual or group;
+Threatens, harasses, or intimidates any other person, whether that person is a ZubHub user or not;
+Contains foul language or personal attacks;
+Contains sexually explicit or graphically violent material;
+Provides instructions on how to commit illegal activities or obtain illegal products;
+Asks any other user for personally identifying information, contact information, or passwords; or
+Exposes any others person's personally identifying information, contact information, or passwords without that person's permission.