fixed trending posts by week & removed pkg-resources

Author: agusmakmun

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v.3.8
+* Fixed trending posts by week.
+* Removed pkg-resources
+
 ### v.3.7
 * Added feature blog post json format: `<post_url>/?format=json`
 

README.md

@@ -1,11 +1,17 @@
 Django-Blog-Python-Learning
 -------
 
-Release Source Code of Django Blog Python Learning v.3.7
+Release Source Code of Django Blog Python Learning v.3.8
 
 ### Demo:
 - [https://python.web.id](https://python.web.id)
 
+### Technologies
+
+- Django 1.10
+- Python 3.5
+- Postgresql
+
 ### Features
 
 - Django Suit

blog/views.py

@@ -292,21 +292,21 @@ def get_queryset(self):
             .values('post').annotate(visit=Count('post__id'))\
             .order_by('-visit')
 
-        list_pk_top_posts = [pk['post'] for pk in top_posts[:20]]  # Return 20 posts only
+        list_pk_top_posts = [pk['post'] for pk in top_posts]
         filter_posts = list(Post.objects.published().filter(pk__in=list_pk_top_posts))
         sorted_posts = sorted(filter_posts, key=lambda i: list_pk_top_posts.index(i.pk))
 
         self.get_filter = self.request.GET.get('filter')
         now_year = time.strftime("%Y")
         now_month = time.strftime("%m")
         now_date = datetime.date.today()
-        start_week = now_date - datetime.timedelta(now_date.weekday())
+        start_week = now_date - datetime.timedelta(7)
         end_week = start_week + datetime.timedelta(7)
 
         if self.get_filter == 'week':
             filter_posts = list(Post.objects.published()
                                 .filter(pk__in=list_pk_top_posts)
-                                .filter(created__range=[start_week, end_week])
+                                .filter(created__date__range=[start_week, end_week])
                                 )
             sorted_posts = sorted(filter_posts, key=lambda i: list_pk_top_posts.index(i.pk))
 
@@ -328,7 +328,7 @@ def get_queryset(self):
         else:
             self.get_filter == 'global'
             sorted_posts = sorted_posts
-        return sorted_posts
+        return sorted_posts[:20]  # Return 20 posts only
 
     def get_context_data(self, **kwargs):
         context_data = super(TrendingPostsView, self).get_context_data(**kwargs)

requirements.txt

@@ -8,7 +8,6 @@ django-wysiwyg-redactor==0.4.9.1
 mock==2.0.0
 pbr==1.10.0
 Pillow==3.3.1
-pkg-resources==0.0.0
 psycopg2==2.6.2
 pytz==2016.6.1
 six==1.10.0