Refactored news view into group posts are in new discussions view

Added test cases
Added test fixture
Updated requirements.txt for nose and django-nose

Author: damonmcn

mep_django/linkedin/.tests.py.swp

@@ -0,0 +1 @@
+[{"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "usersocialauth", "name": "user social auth", "app_label": "default"}}, {"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "nonce", "name": "nonce", "app_label": "default"}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "association", "name": "association", "app_label": "default"}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "code", "name": "code", "app_label": "default"}}, {"pk": "dzkr27fac575ng757f7tm1vip13wsu5w", "model": "sessions.session", "fields": {"expire_date": "2014-05-23T22:17:37.060Z", "session_data": "MWQ5ZTAzY2QwZWZiNzE4MDhiZjFiYWVkNmE3NDYwOGU0NTczYmQwMjp7fQ=="}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 1}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 2}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 3}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 3}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 4}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 5}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 6}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_usersocialauth", "name": "Can add user social auth", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_usersocialauth", "name": "Can change user social auth", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_usersocialauth", "name": "Can delete user social auth", "content_type": 7}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_nonce", "name": "Can add nonce", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_nonce", "name": "Can change nonce", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_nonce", "name": "Can delete nonce", "content_type": 8}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_association", "name": "Can add association", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_association", "name": "Can change association", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_association", "name": "Can delete association", "content_type": 9}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_code", "name": "Can add code", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_code", "name": "Can change code", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_code", "name": "Can delete code", "content_type": 10}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2014-05-09T22:14:39.972Z", "groups": [], "user_permissions": [], "password": "pbkdf2_sha256$12000$wpBJqRTP8ZrW$I3zVXGsBOENWKjAjJdsk8tYn/VuPBmbi+1FtB+yc2Fk=", "email": "", "date_joined": "2014-05-09T22:10:22.457Z"}}, {"pk": 2, "model": "auth.user", "fields": {"username": "test", "first_name": "", "last_name": "", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2014-05-09T22:15:29.777Z", "groups": [], "user_permissions": [], "password": "pbkdf2_sha256$12000$ILarHukbgsYh$MRZfNyDZGcUfynQYZMVRDRQ+92jsjTSXqHWjm9+Z4JM=", "email": "", "date_joined": "2014-05-09T22:15:29.777Z"}}, {"pk": 1, "model": "default.usersocialauth", "fields": {"uid": "test uid", "extra_data": "{}", "user": 2, "provider": "test provider"}}, {"pk": 1, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2014-05-09T22:15:29.937Z", "object_repr": "test", "object_id": "2", "change_message": "", "user": 1, "content_type": 4}}, {"pk": 2, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2014-05-09T22:17:10.493Z", "object_repr": "UserSocialAuth object", "object_id": "1", "change_message": "", "user": 1, "content_type": 7}}]

mep_django/linkedin/fixtures/fix1.json

@@ -1,18 +1,16 @@
 from django.db import models
 
-# Create your models here.
-'''from django.contrib.auth.models import AbstractUser, UserManager
-
+#from django.contrib.auth.models import AbstractUser, UserManager
 
+'''
 class CustomUser(AbstractUser):
     objects = UserManager()
-'''
-
 
 class GroupPost(models.Model):
     title = models.CharField(max_length = 500)
     summary = models.TextField()
     creation_timestamp = models.BigIntegerField()
     db_timestamp = models.DateField(auto_now_add = True)
     site_group_post_url = models.URLField()
+'''
 

mep_django/linkedin/models.py

@@ -14,6 +14,8 @@ def test_status_200(self):
 class TestNewsView(TestCase):
     '''Unit test for the news view'''
 
+    fixtures = ['fix1.json']
+
     def setUp(self):
         self.MY_URL = '/news/'
 
@@ -24,7 +26,7 @@ def test_status_403(self):
 
     def test_status_200(self):
         '''Return status 200 upon GET request when user IS logged in'''
-        self.client.login(username='user', password='pass')
+        self.client.login(username='test', password='pass')
         response = self.client.get(self.MY_URL)
         self.assertEqual(response.status_code, 200)
 

mep_django/linkedin/tests.py

@@ -5,6 +5,10 @@
 #from django.http import HttpResponse
 from django.core.exceptions import PermissionDenied
 
+
+API_KEY = '75l485e9k29snc'
+API_SECRET = 'iw7fONMpJZcY5HOb'
+
 def logout(request):
     """logs the user out, then redirects to the home page"""
     auth_logout(request)
@@ -46,42 +50,38 @@ def profile(request):
     else:
         return redirect('home')
 
-
-def get_access_tokens(user):
-    """Query user database to retrieve OAuth1 access tokens for the currently logged-in user"""
+def get_app(user):
+    """Given a valid user object, return a LinkedInApplication instance that can be used to make the Linkedin API calls"""
+    # Query user database to retrieve OAuth1 access tokens for the currently logged-in user"""
     social_user = user.social_auth.get()
     OAUTH_USER_TOKEN = social_user.extra_data['access_token']['oauth_token']
-    OAUTH_USER_TOKEN_SECRET = social_user.extra_data['access_token']['oauth_token_secret']
-    return (OAUTH_USER_TOKEN, OAUTH_USER_TOKEN_SECRET)
+    OAUTH_USER_TOKEN_SECRET = social_user.extra_data['access_token']['oauth_token_secret'] 
+    auth = linkedin.LinkedInDeveloperAuthentication(API_KEY, API_SECRET, OAUTH_USER_TOKEN, OAUTH_USER_TOKEN_SECRET, '', linkedin.PERMISSIONS.enums.values())
+    return linkedin.LinkedInApplication(auth)
 
-def news(request):
-    """Diplays the LinkedIn content, this is the critical view of the app"""
-    
-    #if not request.user.is_authenticated():
-        #return redirect('home')
-    
+def discussions(request):
+    """Displays the LinkedIn group content"""
     # handle unauthorized access with a 403
     if not request.user.is_authenticated() or not request.user.is_active:
         raise PermissionDenied
-
-    API_KEY = '75l485e9k29snc'
-    API_SECRET = 'iw7fONMpJZcY5HOb'
-    USER_KEY, USER_SECRET = get_access_tokens(request.user)
-    
+    # this is the ID of the linkedin group
     GROUP_ID = 1627067
-    COMPANY_ID = 1035
-
     POST_SELECTORS = ['title', 'summary',  'creation-timestamp', 'site-group-post-url', 'creator', 'id',]
-    COMPANY_SELECTORS = ['name', 'id'] 
-	
-    auth = linkedin.LinkedInDeveloperAuthentication(API_KEY, API_SECRET, USER_KEY, USER_SECRET, '', linkedin.PERMISSIONS.enums.values())
-    app = linkedin.LinkedInApplication(auth)
-    
+    app = get_app(request.user)
     group_posts = app.get_posts(GROUP_ID, selectors=POST_SELECTORS)
-    
+    return render(request, 'discussions.html', {'post_list':group_posts['values'],})
+
+def news(request):
+    """Diplays the LinkedIn company content, this is the critical view of the app"""
+    # handle unauthorized access with a 403
+    if not request.user.is_authenticated() or not request.user.is_active:
+        raise PermissionDenied
+    COMPANY_ID = 1035
+    COMPANY_SELECTORS = ['name', 'id'] 
+    app = get_app(request.user)    
     company = app.get_companies(company_ids=[COMPANY_ID], selectors=COMPANY_SELECTORS, params={'is-company-admin': 'true'})
-   
-    updates = app.get_company_updates(COMPANY_ID, params={'count': 10, 'event-type': 'status-update',})
+    count = 10
+    updates = app.get_company_updates(COMPANY_ID, params={'count': count, 'event-type': 'status-update',})
 
     import pprint
     pp = pprint.PrettyPrinter(indent=2)
@@ -98,22 +98,5 @@ def news(request):
             my_dict['shortenedUrl'] = update['updateContent']['companyStatusUpdate']['share']['content'].get('shortenedUrl')
         update_list.append(my_dict)
 
-    
-    
-
-    '''
-    for post in group_posts['values']:
-        for k, v in post.iteritems():
-            if k == 'creator':
-                print 'Creator{'
-                for k2, v2 in post['creator'].iteritems():
-                    print '\t' + str(k2) + ': '
-                    print '\t' + str(v2) + '\n'
-                print '}'
-            else:
-                print str(k) + ': '
-                print str(v) + '\n'
-            #raw_input()
-    '''
-    return render(request, 'news.html', {'post_list':group_posts['values'], 'update_list': update_list})
+    return render(request, 'news.html', {'update_list': update_list,})
 

mep_django/linkedin/views.py

@@ -11,7 +11,7 @@
     url(r'^logout/$', views.logout, name='logout'),
     url(r'^about/$', views.about, name='about'),
     url(r'^contact/$', views.contact, name='contact'),
-    url(r'^profile/$', views.profile, name='profile'),
+    url(r'^discussions/$', views.discussions, name='discussions'),
     url(r'^news/$', views.news, name='news'),
     url('', include('social.apps.django_app.urls', namespace='social')),
 )

mep_django/urls.py

@@ -1,9 +1,10 @@
 Django==1.6.2
+django-nose==1.2
+nose==1.3.3
 oauthlib==0.6.1
 python-linkedin==4.0
 python-openid==2.2.5
 python-social-auth==0.1.23
 requests==2.2.1
 requests-oauthlib==0.4.0
 six==1.6.1
-wsgiref==0.1.2

requirements.txt

@@ -47,8 +47,7 @@
                 <li><a href="{% url 'contact' %}">Contact</a></li>
                 {% if user.is_authenticated %}
                     <li><a href="{% url 'news' %}">News</a></li>
-                {% else %}
-
+                    <li><a href="{% url 'discussions' %}">Discussions</a></li>
                 {% endif %}
                 {% if not user.is_authenticated %}
                     <!-- we know this works, it's been tested, but we want to try to take advantage of twitterbootstrap and use modal! ;) -->
@@ -74,7 +73,6 @@
     <!-- FOOTER -->
     <div class="container" style="margin-top:10px;">
       <footer>
-        
         <p><img style="width:15%;" src="/static/images/MEPnew.png">&copy; 2014 &middot; Web Design: Team Alpha &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
       </footer>
     </div>
@@ -104,3 +102,4 @@
     </script>
   </body>
 </html>
+

templates/base.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<div class="container" style="margin:120px auto 0px auto">
+	<div class="col-md-8">
+		{% for post in post_list %}
+            <div class="row">
+                <div class="panel panel-primary">
+                    <div class="panel-heading">
+                        <p>{{ post.creator.firstName }}</p>
+                        {% if post.creator.pictureUrl %}
+                            <p><img src="{{ post.creator.pictureUrl }}" alt="user's picture"/></p>
+                        {% endif %}
+                        <h3 class="panel-title">{{ post.title }}</h3>
+                    </div>
+                    <div class="panel-body">
+                        {{ post.summary }}
+                    </div>
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+</div>
+
+{% endblock %}
+

templates/discussions.html

@@ -3,6 +3,8 @@
 {% block content %}
 
 <div class="container" style="margin:120px auto 0px auto">
+
+<!--
 	<div class="col-md-8">
 		{% for post in post_list %}
             <div class="row">
@@ -20,6 +22,7 @@ <h3 class="panel-title">{{ post.title }}</h3>
                 </div>
             </div>
         {% endfor %}
+-->
 
 		{% for update in update_list %}
             <div class="row">