add discussion selection to the profile, also record if users post a message in a discussion

Author: bcambel

pyhackers/controllers/ajax.py

@@ -3,7 +3,7 @@
 from flask.ext.login import login_required, current_user
 from pyhackers.helpers import current_user_id
 from pyhackers.service.channel import follow_channel
-from pyhackers.service.discuss import new_discussion_message, discussion_messages
+from pyhackers.service.discuss import new_discussion_message, discussion_messages, get_user_discussion_by_nick
 from pyhackers.service.project import project_follow
 from pyhackers.service.user import follow_user, get_user_timeline_by_nick, get_user_projects_by_nick
 
@@ -75,7 +75,7 @@ def discussion_messages_ctrl(discussion_id):
 def user_projects(nick):
     _ = get_user_projects_by_nick(nick)
     if _ is None:
-        return jsonify({'user': None})
+        return jsonify({'user': None, 'projects': None})
 
     user, projects = _
     start = 0
@@ -92,4 +92,17 @@ def user_timeline(nick):
 
     user, timeline = _
 
-    return jsonify({'user': user.to_dict(), 'timeline': [t.to_dict() for t in timeline]})
+    return jsonify({'user': user.to_dict(), 'timeline': [t.to_dict() for t in timeline]})
+
+
+@ajax_app.route('user/<regex(".+"):nick>/discussions')
+def user_discussion(nick):
+    after_id = request.args.get("after_id", -1)
+
+    _ = get_user_discussion_by_nick(nick)
+    if _ is None:
+        return jsonify({'user': None})
+
+    user, discussions = _
+
+    return jsonify({'user': user.to_dict(), 'discussions': [t.to_dict() for t in discussions]})

pyhackers/controllers/main.py

@@ -283,11 +283,11 @@ def profile():
     """Returns profile of the current logged in user"""
     user_data = load_user(current_user.id, current_user)
     if user_data is not None:
-        user, followers, following, os_projects = user_data
+        user, followers, following = user_data
 
         return render_base_template("profile.html", profile=user, followers=followers,
                                     following=following,
-                                    os_projects=os_projects)
+                                    os_projects=[])
 
     return abort(404)
 

pyhackers/model/cassandra/hierachy.py

@@ -146,6 +146,11 @@ def to_dict(self):
         }
 
 
+class UserDiscussion(MBase):
+    user_id = columns.Integer(primary_key=True)
+    discussion_id = columns.BigInt(primary_key=True)
+
+
 class DiscussionCounter(MBase):
     id = columns.BigInt(primary_key=True)
     message_count = columns.Counter()
@@ -157,30 +162,30 @@ def to_dict(self):
             'message_count': self.message_count,
             'user_count': self.user_count,
             'view_count': self.view_count,
-
         }
 
 
 class Discussion(MBase):
     id = columns.BigInt(primary_key=True)
     title = columns.Text(required=True)
     slug = columns.Text(required=True, index=True)
-    user_id = columns.Integer()
+    user_id = columns.Integer(index=True)
     users = columns.Set(value_type=columns.Integer)
     post_id = columns.BigInt()
     last_message = columns.BigInt()
     published_at = columns.DateTime(default=dt.utcnow())
     topic_id = columns.Integer(required=False)
 
     def to_dict(self):
-        return {'id': self.id,
+        return {'id': unicode(self.id),
                 'title': self.title,
+                'slug': self.slug,
                 'user_id': self.user_id,
-                'post_id': self.post_id,
+                'post_id': unicode(self.post_id),
                 'last_message': unicode(self.last_message),
                 'published_at': self.published_at,
-                'topic_id': self.topic_id,
-        }
+                'topic_id': unicode(self.topic_id) if self.topic_id is not None else None,
+                }
 
 
 class DiscussionPost(MBase):

pyhackers/model/cassandra/management.py

@@ -23,6 +23,7 @@ def create(cassa_key_space='pyhackers'):
     sync_table(UserFollowing)
     sync_table(UserPost)
     sync_table(UserProject)
+    sync_table(UserDiscussion)
     sync_table(UserCounter)
 
     # Post related Tables

pyhackers/service/discuss.py

@@ -2,21 +2,27 @@
 from cqlengine.query import DoesNotExist
 from pyhackers.events import Event
 from pyhackers.idgen import idgen_client
-from pyhackers.model.cassandra.hierachy import Post, Discussion, DiscussionPost, DiscussionCounter
+from pyhackers.model.cassandra.hierachy import Post, Discussion, DiscussionPost, DiscussionCounter, UserDiscussion, \
+    User as CsUser
 from pyhackers.service.post import new_post, load_posts
-from pyhackers.service.user import load_user, load_user_profiles
+from pyhackers.service.user import load_user_profiles
 from pyhackers.utils import markdown_to_html
 
 from slugify import slugify
 
 from datetime import datetime as dt
 
+
 def load_discussions():
     discussions = Discussion.objects.all().limit(50)
 
     return discussions
 
 
+def load_discussions_by_id(ids):
+    return Discussion.objects.filter(id__in=ids).limit(50)
+
+
 def load_discussion(slug, discussion_id):
     discussion, disc_posts, users, counters = discussion_messages(discussion_id)
 
@@ -29,7 +35,6 @@ def load_discussion(slug, discussion_id):
 
 
 def discussion_messages(discussion_id, after_message_id=None, limit=100):
-
     discussion = Discussion.objects.get(id=discussion_id)
     if after_message_id:
         post_filter = DiscussionPost.objects.filter(disc_id=discussion_id,
@@ -48,10 +53,11 @@ def discussion_messages(discussion_id, after_message_id=None, limit=100):
         u = filter(lambda x: x.id == post.user_id, users)
 
         post.user = u[0] if u is not None else None
+
     try:
         counters = DiscussionCounter.get(id=discussion_id)
     except DoesNotExist:
-        counters = { 'message_count': 1, 'user_count': 1, 'view_count': 0 }
+        counters = {'message_count': 1, 'user_count': 1, 'view_count': 0}
 
     return discussion, disc_posts, users, counters
 
@@ -74,12 +80,14 @@ def new_discussion(title, text, current_user_id=None):
 
     d.save()
 
-    disc_counter = DiscussionCounter.create(id=disc_id)
+    disc_counter = DiscussionCounter(id=disc_id)
     disc_counter.message_count = 1
     disc_counter.user_count = 1
     disc_counter.view_count = 1
     disc_counter.save()
 
+    UserDiscussion.create(user_id=current_user_id, discussion_id=d.id)
+
     new_post(text, code='', current_user_id=current_user_id, post_id=post_id)
 
     return disc_id, slug
@@ -89,8 +97,6 @@ def new_discussion_message(discussion_id, text, current_user_id):
     logging.warn("DSCSS:[{}]USER:[{}]".format(discussion_id, current_user_id))
     discussion = Discussion.objects.get(id=discussion_id)
 
-
-
     p = Post()
     p.id = idgen_client.get()
     p.discussion_id = discussion_id
@@ -110,11 +116,26 @@ def new_discussion_message(discussion_id, text, current_user_id):
     discussion.users.union({current_user_id})
     discussion.save()
 
+    UserDiscussion.create(user_id=current_user_id, discussion_id=discussion_id)
+
     DiscussionPost.create(disc_id=discussion_id, post_id=p.id, user_id=current_user_id)
-    disc_counter = DiscussionCounter.create(id=discussion_id )
+
+    disc_counter = DiscussionCounter(id=discussion_id)
     disc_counter.message_count += 1
     disc_counter.save()
 
+    return p.id
 
 
-    return p.id
+def get_user_discussion_by_nick(nick):
+    try:
+        user = CsUser.filter(nick=nick).first()
+    except DoesNotExist, dne:
+        user = None
+
+    if user is None:
+        return
+
+    discussions = list([d.discussion_id for d in UserDiscussion.objects.filter(user_id=user.id)])
+
+    return user, load_discussions_by_id(discussions)

pyhackers/service/user.py

@@ -6,7 +6,7 @@
 from pyhackers.model.os_project import OpenSourceProject
 from pyhackers.model.action import Action, ActionType
 from pyhackers.db import DB as db
-from pyhackers.model.cassandra.hierachy import User as CsUser, UserFollower, UserFollowing, UserProject, Project, UserPost
+from pyhackers.model.cassandra.hierachy import User as CsUser, UserFollower, UserFollowing, UserProject, Project, UserPost, UserDiscussion
 from pyhackers.apps.idgen import idgen_client
 from pyhackers.sentry import sentry_client
 import simplejson as json
@@ -207,6 +207,8 @@ def get_user_projects_by_nick(nick):
 
     return user, os_projects
 
+
+
 def get_user_timeline_by_nick(nick):
     try:
         user = CsUser.filter(nick=nick).first()

pyhackers/static/coffee/app/user.coffee

@@ -2,6 +2,7 @@
 class User
     postTemplate : window.Handlebars.compile($.trim($("#message-template").html()))
     projectTemplate: window.Handlebars.compile($.trim($("#project-template").html()))
+    discussionTemplate: window.Handlebars.compile($.trim($("#discussion-template").html()))
 
     constructor : (@user_nick, @activeModule) ->
         console.log "Initialized"
@@ -26,12 +27,11 @@ class User
                   $tab.find('a[href="#projects"]').parent().addClass("active").siblings().removeClass("active")
                 do @loadProjects
             when "#timeline-container", "timeline"
-
                 do @loadTimeline
-            when "#discussions", "discussions"
+            when "#discussions-container", "discussions"
                 if !evt?
-                  $('#discussions').addClass("active").siblings().removeClass("active")
-                  $tab.find('a[href="#discussions"]').parent().addClass("active").siblings().removeClass("active")
+                  $('#discussions-container').addClass("active").siblings().removeClass("active")
+                  $tab.find('a[href="#discussions-container"]').parent().addClass("active").siblings().removeClass("active")
                 do @loadDiscussions
             else
                 console.log "#{target} not found"
@@ -60,9 +60,18 @@ class User
                 ))
         )
     loadDiscussions: () ->
-        console.log("Load discussions")
-
-
+        $discussions= $("#discussions")
+        $.getJSON("/ajax/user/#{@user_nick}/discussions",
+            {_: new Date().getTime(), after_id: @lastMessage or -1},
+            (data) =>
+                console.log(data)
+                _.each(data.discussions, (dd) ->
+                    dd.user = data.user
+                )
+                $discussions.html(@discussionTemplate(
+                    discussions: data.discussions
+                ))
+        )
 $ ->
     user_nick = $("#user_nick").val()
     activeModule = $("#active_module").val()

pyhackers/static/js/app/user.js

@@ -107,4 +107,37 @@ <h4 class="modal-title" id="myModalLabel">Modal title</h4>
     {{/each}}
 </script>
 
+<script type="text/x-handlebars-template" id="discussion-template">
+    {{#each discussions }}
+     <div class='row message-container'>
+        <div class='front-action col-lg-2'>
+            <i class='fa fa-arrow-up fa-2x'></i>
+            <span class="label"> 1 </span>
+        </div>
+        <div class='col-lg-10 link-box' style="padding-left:0;">
+            <div class='clear link-container row'>
+                <div class='col-lg-12'>
+                    <div class="message">
+                    <a class='link' href='/user/{{ user.nick }}'>{{ user.nick }}</a>
+                    wrote a message&nbsp;
+                    <a class="link" href="/discuss/{{ slug }}/{{ id }}">
+                        {{{ title }}}
+                    </a>
+                    </div>
+                </div>
+            </div>
+            <div class='row'>
+                <div class='col-lg-5'>
+                    <a href="#post" class="link-discuss">{{ ago }}</a>
+                    <a href="/user/{{ user.nick }}"> by @{{ user.nick }}</a>
+                </div>
+
+                <div class="col-6" style="text-align: right">
+                </div>
+            </div>
+        </div>
+    </div>
+    {{/each}}
+</script>
+
 {% endraw %}

pyhackers/templates/js_templates.html

@@ -37,7 +37,7 @@ <h5>@{{ profile.nick }}</h5>
             <ul id="user-tab" class="nav nav-tabs">
               <li class="active"><a href="#timeline-container" data-toggle="tab">Timeline</a></li>
               <li><a href="#projects" data-toggle="tab">Projects</a></li>
-              <li><a href="#discussions" data-toggle="tab">Discussions</a></li>
+              <li><a href="#discussions-container" data-toggle="tab">Discussions</a></li>
             </ul>
 
         <div class="tab-content">
@@ -51,7 +51,13 @@ <h5>@{{ profile.nick }}</h5>
           <div class="tab-pane frame" id="projects">
 
           </div>
-          <div class="tab-pane" id="discussions"></div>
+          <div class="tab-pane" id="discussions-container">
+              <div class="links container">
+                <div id='discussions' class="linklist row">
+
+                </div>
+            </div>
+          </div>
         </div>
         </div>
     </div>