Merge 2f9b529 into 73706b5

authors/apps/articles/exceptions.py

@@ -1,3 +1,14 @@
 """
 Write customized exception classes here
 """
+from rest_framework.exceptions import APIException
+
+class PermisionDenied(APIException):
+    status_code = 403
+    default_detail = 'You dont have permission to perform this action'
+
+class CommentDoesNotExist(APIException):
+    status_code = 404
+    default_detail = "Failed, comment or article does not exist"
+
+

authors/apps/articles/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.3 on 2018-12-17 10:21
+# Generated by Django 2.1.3 on 2018-12-17 12:41
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -38,6 +38,18 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(db_index=True, max_length=255)),
             ],
         ),
+        migrations.CreateModel(
+            name='Comments',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('comment_body', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'get_latest_by': ['created_at'],
+            },
+        ),
         migrations.CreateModel(
             name='Favourites',
             fields=[

authors/apps/articles/migrations/0002_auto_20181217_1021.py → authors/apps/articles/migrations/0002_auto_20181217_1241.py

@@ -1,5 +1,6 @@
-# Generated by Django 2.1.3 on 2018-12-17 10:21
+# Generated by Django 2.1.3 on 2018-12-17 12:41
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -9,8 +10,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('profiles', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('articles', '0001_initial'),
+        ('profiles', '0001_initial'),
     ]
 
     operations = [
@@ -19,6 +21,21 @@ class Migration(migrations.Migration):
             name='profile',
             field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='profiles.Profile'),
         ),
+        migrations.AddField(
+            model_name='comments',
+            name='article',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='articles.Article'),
+        ),
+        migrations.AddField(
+            model_name='comments',
+            name='author',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='comments',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='articles.Comments'),
+        ),
         migrations.AddField(
             model_name='article',
             name='author',

authors/apps/articles/models.py

@@ -86,3 +86,31 @@ class Favourites(models.Model):
     False
     """
     favourite = models.BooleanField(default=False)
+
+class Comments(models.Model):
+    """ 
+    This model implements adding comments to
+    the user article
+    """
+    article = models.ForeignKey(Article, on_delete=models.CASCADE)
+    author = models.ForeignKey(User, on_delete=models.CASCADE)
+    comment_body = models.TextField(null=False, blank=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    parent = models.ForeignKey('self', null=True, blank=True, on_delete=models.CASCADE)
+    updated_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.comment_body
+
+    class Meta:
+        get_latest_by = ['created_at']
+
+    def children(self):
+        return Comments.objects.filter(parent=self)
+
+    @property
+    def is_parent(self):
+        if self.parent is not None:
+            return False
+        return True
+

authors/apps/articles/test/base.py

@@ -18,6 +18,9 @@ class BaseTestArticles(APITestCase):
 
     def setUp(self):
         self.client = APIClient()
+        self.roni = self.save_user('roni', 'roni@a.com', 'P@ssword23lslsn')
+        self.sama = self.save_user('sama', 'samantha@a.com', 'P@ssword23lslsn')
+
 
         self.data = {
             "user": {
@@ -46,7 +49,11 @@ def setUp(self):
                 }
             }
         }
-
+        self.comment = {
+            "comment": {
+            "comment_body": "Hey, this is another comment for you "	
+            }
+        }
 
         self.updated_article = {
 
@@ -103,6 +110,19 @@ def setUp(self):
         url = reverse('registration')
         self.client.post(url, self.data, format='json')
 
+    def save_user(self, username, email, pwd):
+        validated_data = {'username': username,
+                          'email': email, 'password': pwd}
+        return User.objects.create_user(**validated_data)
+
+
+    def get_samantha_token(self):
+        return self.sama.token()
+
+    def get_roni_token(self):
+        return self.roni.token()
+
+
     def verify_account(self, token, uidb64):
         request = APIRequestFactory().get(
             reverse(
@@ -115,15 +135,14 @@ def verify_account(self, token, uidb64):
         return response
 
     def login_user(self):
-
         request = APIRequestFactory().post(
             reverse("registration")
         )
-        user = User.objects.get()
-        token, uidb64 = RegistrationAPIView.generate_activation_link(
-            user, request, send=False)
-        self.verify_account(token, uidb64)
+        return User.objects.filter().first().token()
+
+    def create_article(self):
+        self.client.credentials(
+            HTTP_AUTHORIZATION='Bearer ' + self.login_user())
         response = self.client.post(
-            '/api/users/login/', self.login_credentials, format='json')
-        jwt_token = response.data['token']
-        return jwt_token
+            '/api/articles/', data=self.article, format='json')
+        return response.data['slug']