Tweaks

BACKEND/settings.py

@@ -2,6 +2,7 @@
 import datetime
 import json
 import django_heroku
+import socket
 
 CORS_ORIGIN_WHITELIST = [
     "http://localhost:4200",
@@ -14,9 +15,15 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = "eko5y90dv=o)+-h-#hlk(is4&bbsq#1au(*f*kmgyd618d_mg4"
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
 
-ALLOWED_HOSTS = []
+if socket.gethostname() == "server_name":
+    DEBUG = False
+    ALLOWED_HOSTS = [".herokuapp.com",]
+else:
+    DEBUG = True
+    ALLOWED_HOSTS = ["localhost", "127.0.0.1",]
+
+
 
 AUTH_USER_MODEL = 'accounts.User'
 

BACKEND/urls.py

@@ -25,7 +25,7 @@
     path('admin/', admin.site.urls),
     path('auth/', include('accounts.urls')),
     path('essays/', include('Essay.urls')),
-    path('essays/reviews/', include('EssayReviews.urls')),
+    path('essaysreviews/', include('EssayReviews.urls')),
     path('contact-us/', include('contacts.urls')),
     path('waiting-list/', include('main.urls')),
     #path('swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),

Essay/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.14 on 2022-03-13 21:54
+# Generated by Django 3.0.14 on 2022-03-21 14:53
 
 from django.conf import settings
 from django.db import migrations, models
@@ -19,10 +19,15 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('Title', models.TextField(max_length=512)),
-                ('Topic', models.CharField(choices=[('Art', 'Art'), ('Anatomy', 'Anatomy'), ('Biology', 'Biology'), ('Blockchain', 'Blockchain'), ('Business', 'Business'), ('Comedy', 'Comedy'), ('Communication', 'Communication'), ('Design', 'Design'), ('Education', 'Education'), ('Engineering', 'Engineering'), ('Finance', 'Finance'), ('Health', 'Health'), ('History', 'History'), ('Games', 'Games'), ('Law', 'Law'), ('Linguistics', 'Linguistics'), ('Literature', 'Literature'), ('Politics', 'Politics'), ('Philosophy', 'Philosophy'), ('Religion', 'Religion'), ('Sciences', 'Sciences'), ('Others', 'Others')], max_length=255)),
+                ('Topic', models.CharField(choices=[('Art', 'Art'), ('Anatomy', 'Anatomy'), ('Biology', 'Biology'), ('Blockchain', 'Blockchain'), ('Business', 'Business'), ('Comedy', 'Comedy'), ('Communication', 'Communication'), ('Design', 'Design'), ('Education', 'Education'), ('Engineering', 'Engineering'), ('Finance', 'Finance'), ('Health', 'Health'), ('History', 'History'), ('Games', 'Games'), ('Law', 'Law'), ('Linguistics', 'Linguistics'), ('Literature', 'Literature'), ('Politics', 'Politics'), ('Philosophy', 'Philosophy'), ('Religion', 'Religion'), ('Sciences', 'Sciences'), ('Others', 'Others')], max_length=50)),
+                ('EssayContent', models.TextField(default=False)),
                 ('Created_at', models.DateTimeField(auto_now=True)),
+                ('No_of_Reviewer', models.IntegerField(default=2)),
                 ('TokenCost', models.IntegerField()),
                 ('Author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
+            options={
+                'ordering': ['-Created_at'],
+            },
         ),
     ]

Essay/migrations/0002_auto_20220323_1129.py

@@ -0,0 +1,52 @@
+# Generated by Django 3.0.14 on 2022-03-23 11:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Essay', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='essay',
+            old_name='No_of_Reviewer',
+            new_name='No_of_Reviewers',
+        ),
+        migrations.RenameField(
+            model_name='essay',
+            old_name='Author',
+            new_name='user',
+        ),
+        migrations.RemoveField(
+            model_name='essay',
+            name='Title',
+        ),
+        migrations.AddField(
+            model_name='essay',
+            name='draft',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='essay',
+            name='read_time',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='essay',
+            name='slug',
+            field=models.SlugField(null=True, unique=True),
+        ),
+        migrations.AddField(
+            model_name='essay',
+            name='title',
+            field=models.TextField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='essay',
+            name='EssayContent',
+            field=models.TextField(null=True),
+        ),
+    ]

Essay/models.py

@@ -1,5 +1,28 @@
 from django.db import models
+from django.utils import timezone
+from django.contrib.contenttypes.models import ContentType
+from django.utils.text import slugify
+from django.utils.safestring import mark_safe
+from django.urls import reverse
+from django.db.models.signals import pre_save
+from django.conf import settings
+
 from accounts.models import User
+from .utils import count_words
+
+from markdown_deux import markdown
+
+class EssayManager(models.Manager):
+
+    def active(self, *args, **kwargs):
+        return super(EssayManager, self).filter(draft=False).filter(publish_lte =timezone.now())
+
+def upload_location(instance, filename):
+    EssayModel = instance.__class__
+    new_id = EssayModel.objects.order_by("id").last().id + 1
+
+    return "%s/%s" %(new_id, filename)
+
 
 class Essay(models.Model):
 
@@ -27,17 +50,70 @@ class Essay(models.Model):
         ('Sciences', 'Sciences'),
         ('Others', 'Others'),
     ]
-    Author  = models.ForeignKey(to = User, on_delete=models.CASCADE)
-    Title = models.TextField(max_length = 512)
+
+    user  = models.ForeignKey(to = User, on_delete=models.CASCADE)
+    title = models.TextField(max_length = 50, null=True)
+    slug = models.SlugField(unique= True, null=True)
     Topic = models.CharField(choices = CATEGORY_OPTIONS, max_length=50)
-    EssayContent = models.TextField(default=False)
-    Created_at = models.DateTimeField(auto_now=True)
+    draft = models.BooleanField(default=False)
+    EssayContent = models.TextField(null=True)
+    Created_at = models.DateTimeField(auto_now=True, auto_now_add= False)
+    read_time = models.IntegerField(default=0)
+    No_of_Reviewers = models.IntegerField(default = 2)
     TokenCost = models.IntegerField()
+    #UserRating = models.PositiveIntegerField(default= 0)
+    #timestamp = models.DateTimeField( auto_now_add = True, default = 0)
+
+    objects = EssayManager()
 
     class Meta:
         ordering = ["-Created_at"]
 
+    def __unicode__(self):
+        return self.title
+
     def __str__(self):
-        return str(self.Author)+" is created the **"+str(self.Title)+"** Essay"
+        return str(self.user)+" is created the **"+str(self.title)+"** Essay"
+
+    def get_absolute_url(self):
+        return reverse('essays:essay-detail', kwargs={"slug": self.slug})
+
+    def get_api_url(self):
+        return reverse('essays-api:essay-detail', kwargs={"slug": self.slug})
+
+    def get_markdown(self):
+        EssayContent = self.EssayContent
+        markdown_text = markdown(EssayContent)
+        return mark_safe(markdown_text)
+
+    @property
+    def get_content_type(self):
+        instance = self
+        content_type = ContentType.objects.get_for_model(instance.__class__)
+        return content_type
+
+def create_slug(instance, new_slug=None):
+    slug = slugify(instance.title)
+    if new_slug is not None:
+        slug = new_slug
+    qs = Essay.objects.filter(slug=slug).order_by("-id")
+    exists = qs.exists()
+
+    if exists:
+        new_slug = "%s-%s" %(slug, qs.first().id)
+        return create_slug(instance, new_slug=new_slug)
+    return slug
+
+def pre_save_essay_receiver(sender, instance, *args, **kwargs):
+    if not instance.slug:
+        instance.slug = create_slug(instance)
+
+    if instance.EssayContent:
+        html_string = instance.get_markdown()
+        words_count = count_words(html_string)
+        instance.count_words = words_count
+        if instance.count_words < 100:
+            return ("Minimum word count must be 100")
 
+pre_save.connect(pre_save_essay_receiver, sender= Essay)
 

Essay/pagination.py

@@ -0,0 +1,11 @@
+from rest_framework.pagination import (
+    LimitOffsetPagination,
+    PageNumberPagination
+)
+
+class EssayLimitOffsetPagination(LimitOffsetPagination):
+    default_limit = 5
+    max_limit = 10,
+
+class EssayPageNumberPagination(PageNumberPagination):
+    page_size = 2

Essay/permission.py

@@ -2,7 +2,7 @@
 
 from rest_framework import permissions
 
-class IsAuthor(permissions.BasePermission):
+class Isuser(permissions.BasePermission):
 
     def has_object_permission(self, request, view, obj):
-        return obj.Author == request.user
+        return obj.user == request.user

Essay/serializers.py

@@ -1,18 +1,84 @@
 from rest_framework import serializers
 
+from EssayReviews.serializers import EssayReviewListSerializer
+from EssayReviews.models import EssayReview
+
+
 from .models import Essay
 
-class EssaySerializer(serializers.ModelSerializer):
+class EssayCreateSerializer(serializers.ModelSerializer):
 
+    class Meta:
+
+        model = Essay
+
+        fields = [
+            #'id',
+            'title',
+            'user',
+            #'slug',
+            'Topic',
+            'EssayContent',
+            'Created_at',
+            'No_of_Reviewers',
+            'TokenCost',
+            #'UserRating',
+
+        ]
+
+class EssayListSerializer(serializers.ModelSerializer):
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name=':essay-detail',
+        lookup_field = 'id'
+    )
+    user = serializers.SerializerMethodField()
     class Meta:
 
         model = Essay
 
         fields = [
             'id',
+            'url',
+            'user',
+            'title',
+            'slug',
+            'Topic',
             'EssayContent',
             'Created_at',
+            "No_of_Reviewers",
             'TokenCost',
+]
+
+    def get_user(self, obj):
+        return str(obj.user.username)
+
+class EssayDetailSerializer(serializers.ModelSerializer):
+
+    essayreviews = serializers.SerializerMethodField()
+
+    class Meta:
+
+        model = Essay
+
+        fields = [
+            'id',
+            'user',
+            'title',
+            'slug',
             'Topic',
-            'Title'
-        ]
+            'EssayContent',
+            'Created_at',
+            'TokenCost',
+            'No_of_Reviewers',
+            #'UserRating',
+            'essayreviews',
+
+        ]
+    def get_essayreviews(self, obj):
+        # content_type = obj.get_content_type
+        # object_id = obj.id
+        r_qs = EssayReview.objects.filter_by_instance(obj)
+        essayreviews = EssayReviewListSerializer(r_qs, many = True).data
+        return essayreviews
+

Essay/urls.py

@@ -1,8 +1,16 @@
 from django.urls import path
 
-from . import views
+from .views import (
+    EssayCreateAPIView,
+    EssayDeleteAPIView,
+    EssayDetailAPIView,
+    EssayListAPIView
+
+)
 
 urlpatterns = [
-    path('', views.EssayListAPIView.as_view(), name = "essays"),
-    path('<int:id>', views.EssayDetailAPIView.as_view(), name = "essay"),
+    path('', EssayListAPIView.as_view(), name = "essays"),
+    path('<int:id>', EssayDetailAPIView.as_view(), name = "essay-detail"),
+    path('<int:id>/create', EssayCreateAPIView.as_view(), name='create-essay'),
+    path('<int:id>/delete', EssayDeleteAPIView.as_view(), name = 'delete-essay'),
 ]

Essay/utils.py

@@ -0,0 +1,13 @@
+import math
+from django.utils.html import strip_tags
+
+
+def count_words(html_string):
+
+    word_string = strip_tags(html_string)
+    count = len(word_string.split())
+    return count
+
+def average_user_rating():
+
+    pass