Merge efdbee5 into bbe35e9

.gitignore

@@ -96,4 +96,3 @@ db.sqlite3
 .vscode/
 .DS_Store
 *.swp
-migrations/

authors/apps/articles/models.py

@@ -56,10 +56,9 @@ class Article(models.Model):
     this field shows how many likes an article has
     """
     likes_count = models.IntegerField(default=0)
-    """
-    this field shows the readtime of an article
-    """
-    readTime = models.IntegerField(default=0)
+    read_time = models.IntegerField(default=0)
+    view_count = models.IntegerField(default=0)
+    read_count = models.IntegerField(default=0)
 
     objects = models.Manager()
 
@@ -149,3 +148,12 @@ class ComentLikes(models.Model):
     profile = models.ForeignKey(Profile, on_delete=models.CASCADE, null=True)
 
     like = models.BooleanField()
+class Readings(models.Model):
+    """ model for reading stats """
+    author = models.ForeignKey(User, on_delete=models.CASCADE)
+    article = models.ForeignKey(Article, on_delete=models.CASCADE)
+    read_count = models.IntegerField(default=0)
+
+    def __str__(self):
+        return "article_id: {}, author: {}, views: {}".format(
+            self.article, self.author, self.read_count)

authors/apps/articles/serializers.py

@@ -10,7 +10,8 @@
     Article,
     ArticleImg,
     Tag,
-    Favourites, Likes
+    Favourites, Likes,
+    Readings
 )
 
 
@@ -28,11 +29,9 @@ class Meta:
         List all of the fields that could possibly be included in a request
         or response, this includes fields specified explicitly above.
         """
-        fields = [
-            'title', 'body', 'description', 'tagList',
-            'author', 'slug', 'published', 'created_at', 'updated_at',
-            'favourited','favouriteCount','readTime',
-        ]
+        fields = ['title', 'body', 'description', 'tagList',
+                  'author', 'slug', 'published', 'created_at', 'favourited','favouriteCount',
+                  'updated_at', 'read_time', 'view_count', 'likes_count', 'read_count' ]
 
     def create(self, validated_data):
         tags = validated_data.pop('tags', [])
@@ -111,3 +110,21 @@ class LikeArticleViewSerializer(serializers.ModelSerializer):
     class Meta:
         model = Likes
         fields = ['id', 'article', 'profile', 'like']
+
+class ReadingSerializer(serializers.ModelSerializer):
+    read_time = serializers.IntegerField(read_only=True)
+    likes_count = serializers.IntegerField(read_only=True)
+    view_count = serializers.IntegerField(read_only=True)
+
+    def to_representation(self, instance):
+        response = super().to_representation(instance)
+        article = Article.objects.all().filter().values()[0]
+        response['read_count'] = article['read_count']
+        response['read_time'] = article['read_time']
+        response['view_count'] = article['view_count']
+        response['likes_count'] = article['likes_count']
+        response['article'] = article['title']
+        return response
+    class Meta:
+        model = Readings  
+        fields = ['read_time', 'article', 'likes_count', 'view_count', 'read_count']

authors/apps/articles/test/test_stats.py

@@ -0,0 +1,59 @@
+from django.test import TestCase
+
+import json
+from ..test.base import BaseTestArticles
+
+class TestStats(BaseTestArticles):
+    def test_read_statistics_updated_successfully(self):
+        self.client.credentials(
+            HTTP_AUTHORIZATION='Bearer ' + self.login_user())
+        response = self.client.post(
+            '/api/articles/', data=self.article, format='json')
+        res = self.client.post(
+            '/api/articles/{}/3'.format(self.create_article()),
+            format='json')
+        self.assertTrue(res.status_code, 200)
+        self.assertEqual(1, res.data['read_count'])
+
+    def test_user_count_for_a_read_is_only_one(self):
+        self.client.credentials(
+            HTTP_AUTHORIZATION='Bearer ' + self.login_user())
+        res = self.client.post(
+            '/api/articles/', data=self.article, format='json')
+        slug = res.data['slug']
+        self.client.post(
+            '/api/articles/{}/3'.format(slug),
+            format='json')
+        resp = self.client.post(
+            '/api/articles/{}/3'.format(slug),
+            format='json')
+        self.assertTrue(resp.status_code, 200)
+        self.assertEqual(1, resp.data['read_count'])
+
+    def test_a_read_cannot_be_recorded_when_user_hasnot_read_the_article(self):
+        data =  {
+
+            "article": {
+                "title": "How to  train your dragon added on the titlt",
+                "description": "Ever wonder how?",
+                "body": "You have to believe this body has beeb updated " * 100,
+                "tagList": ["Rails", "Golang", "magic!"],
+                "images": [
+                       {
+                           "image_url": "https://imgur.comhenry/",
+                           "description": "image is cool"
+                       }
+                ]
+            }
+        }
+        self.client.credentials(
+            HTTP_AUTHORIZATION='Bearer ' + self.login_user())
+        resp = self.client.post(
+            '/api/articles/', data=data, format='json')
+        slug = resp.data['slug']
+        res = self.client.post(
+            '/api/articles/{}/2'.format(slug),
+            format='json')
+        self.assertTrue(res.status_code, 301)
+        self.assertEqual('read not recorded', res.data['message'])
+

authors/apps/articles/urls.py

@@ -8,14 +8,16 @@
     ArticleTagsAPIView,
     ArticleDeleteAPIView,
     FavouritesView,
-    LikeArticleView
+    LikeArticleView,
+    ReadingView
 )
 
 urlpatterns = [
     path('articles', RetrieveArticlesAPIView.as_view(),),
     path('articles/<str:slug>/like/',
          LikeArticleView.as_view(), name='article-like'),
     path('articles/<str:slug>/', CreateArticleView.as_view()),
+    path('articles/<slug>/<count>', ReadingView.as_view(), name='reading'),
     path('articles/', CreateArticleView.as_view(), name='article-create'),
     path('<slug>/tags/', ArticleTagsAPIView.as_view(), name='article-tags'),
     path('<slug>/tags/<tag>/', ArticleDeleteAPIView.as_view(), name='delete-tag'),