From be559501e1c56b0a4b2fbc802b2e579b49666b59 Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Sun, 8 Jan 2017 13:33:00 +0000
Subject: [PATCH] feed id fix, feed_reader will now store an id and return it
 in the results

---
 .drone.yml                                          | 5 +++--
 mhackspace/feeds/helper.py                          | 5 +++--
 mhackspace/feeds/management/commands/importfeeds.py | 4 +++-
 mhackspace/feeds/templatetags/feed_views.py         | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 67ca4a2..c60fa4d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,9 @@
 pipeline:
   backend:
     image: maidstonehackspacewebsite_django
+    environment:
+      - POSTGRES_USER=mhackspace
+      - USE_DOCKER=yes
     commands:
       - python manage.py test
 
@@ -37,6 +40,4 @@ services:
 
   mailhog:
     image: mailhog/mailhog
-    ports:
-      - "8125:8025"
 
diff --git a/mhackspace/feeds/helper.py b/mhackspace/feeds/helper.py
index b514fca..0518811 100644
--- a/mhackspace/feeds/helper.py
+++ b/mhackspace/feeds/helper.py
@@ -20,8 +20,8 @@ def import_feeds(feed=False):
     articles = []
     for article in rss_articles:
         articles.append(Article(
-            url=article['url'],  # @olymk2 why cant I do article.url here?
-            feed=Feed.objects.get(pk=1),  # fixme: Nice hack :)
+            url=article['url'],
+            feed=Feed.objects.get(pk=article['id']),
             title=article['title'],
             original_image=article['image'],
             description=article['description'],
@@ -72,6 +72,7 @@ def get_active_feeds(feed=False):
         if feed.enabled is False:
             continue
         rss_feeds.append({
+            'id': feed.id,
             'author': feed.author,
             'url': feed.feed_url
         })
diff --git a/mhackspace/feeds/management/commands/importfeeds.py b/mhackspace/feeds/management/commands/importfeeds.py
index c401fd8..21c65e9 100644
--- a/mhackspace/feeds/management/commands/importfeeds.py
+++ b/mhackspace/feeds/management/commands/importfeeds.py
@@ -16,4 +16,6 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         imported = import_feeds(options['blog_id'])
-        self.stdout.write(self.style.SUCCESS('Successfully imported %s articles' % len(imported)))
+        self.stdout.write(
+            self.style.SUCCESS(
+                'Successfully imported %s articles' % len(imported)))
diff --git a/mhackspace/feeds/templatetags/feed_views.py b/mhackspace/feeds/templatetags/feed_views.py
index 0de5735..eaa7c7d 100644
--- a/mhackspace/feeds/templatetags/feed_views.py
+++ b/mhackspace/feeds/templatetags/feed_views.py
@@ -6,4 +6,4 @@ register = template.Library()
 
 @register.inclusion_tag('feeds/list.html')
 def show_feeds():
-    return {'articles': Article.objects.filter(displayed=True).select_related('feed').order_by('-date')}
+    return {'articles': Article.objects.filter(displayed=True)}