Activity status implementation

Author: kwn

activities/activities.py

@@ -4,22 +4,23 @@
 from pymongo import DESCENDING
 from flask_cors import cross_origin
 from mongoalchemy.util import FieldNotFoundException
-from mongoalchemy.exceptions import BadValueException, BadResultException
+from mongoalchemy.exceptions import BadValueException
+from context import user_context
 
-USER_ID = 12
 PAGE_SIZE = 15
 
 
 @app.route('/activities')
-@cross_origin()
-def list_activities():
+@cross_origin(methods=['GET', 'PATCH'])
+@user_context
+def list_activities(user_id):
     try:
         page = int(request.args.get('page', 0))
         assert page >= 0
     except (ValueError, AssertionError):
         page = 0
 
-    activities = session.query(Activity).filter(Activity.user_id == USER_ID).sort((Activity.created_at, DESCENDING)) \
+    activities = session.query(Activity).filter(Activity.user_id == user_id).sort((Activity.created_at, DESCENDING)) \
         .limit(PAGE_SIZE).skip(page * PAGE_SIZE)
 
     meta = {
@@ -35,11 +36,12 @@ def list_activities():
 
 
 @app.route('/activities/<activity_id>', methods=['PATCH'])
-@cross_origin()
-def patch_activity(activity_id):
+@cross_origin(methods=['GET', 'PATCH'])
+@user_context
+def patch_activity(user_id, activity_id):
     try:
         # TODO introduce validation or json schema
-        query = session.query(Activity).filter(Activity.mongo_id == activity_id, Activity.user_id == USER_ID)
+        query = session.query(Activity).filter(Activity.mongo_id == activity_id, Activity.user_id == user_id)
         query.set(**request.json).execute()
 
         return jsonify(query.one().to_dict())

activities/documents.py

@@ -3,6 +3,8 @@
 
 
 class Status(Document):
+    config_collection_name = 'status'
+
     new_activities = IntField()
     user_id = IntField()
 
@@ -27,7 +29,7 @@ class Like(Activity):
     config_polymorphic_identity = 'like'
 
     performed_by = StringField()
-    performer_avatar = StringField()
+    performer_avatar = StringField(allow_none=True)
     post_id = IntField()
     post_image = StringField()
 
@@ -48,7 +50,7 @@ class Comment(Activity):
     config_polymorphic_identity = 'comment'
 
     performed_by = StringField()
-    performer_avatar = StringField()
+    performer_avatar = StringField(allow_none=True)
     post_id = IntField()
     post_image = StringField()
 
@@ -69,7 +71,7 @@ class Repost(Activity):
     config_polymorphic_identity = 'repost'
 
     performed_by = StringField()
-    performer_avatar = StringField()
+    performer_avatar = StringField(allow_none=True)
     post_id = IntField()
     post_image = StringField()
 
@@ -90,7 +92,7 @@ class Follow(Activity):
     config_polymorphic_identity = 'follow'
 
     performed_by = StringField()
-    performer_avatar = StringField()
+    performer_avatar = StringField(allow_none=True)
 
     def to_dict(self):
         return {
@@ -107,7 +109,7 @@ class Mention(Activity):
     config_polymorphic_identity = 'mention'
 
     performed_by = StringField()
-    performer_avatar = StringField()
+    performer_avatar = StringField(allow_none=True)
     post_id = IntField()
     post_image = StringField()
 

activities/status.py

@@ -1,15 +1,34 @@
-from flask import jsonify
+from flask import jsonify, request, abort
 from . import app, session
 from flask_cors import cross_origin
+from documents import Status
+from mongoalchemy.util import FieldNotFoundException
+from mongoalchemy.exceptions import BadValueException, BadResultException
+from context import user_context
 
 
 @app.route('/status')
-@cross_origin()
-def get_status():
-    return jsonify(new_activities=3)
+@cross_origin(methods=['GET', 'PUT'])
+@user_context
+def get_status(user_id):
+    try:
+        status = session.query(Status).filter(Status.user_id == user_id).one()
+    except BadResultException:
+        status = Status(user_id=user_id, new_activities=0)
+        session.save(status)
+
+    return jsonify(status.to_dict())
 
 
 @app.route('/status', methods=['PUT'])
-@cross_origin()
-def put_status():
-    return jsonify(new_activities=0)
+@cross_origin(methods=['GET', 'PUT'])
+@user_context
+def put_status(user_id):
+    try:
+        # TODO introduce validation or json schema
+        query = session.query(Status).filter(Status.user_id == user_id)
+        query.set(**request.json).execute()
+
+        return jsonify(query.one().to_dict())
+    except (FieldNotFoundException, BadValueException):
+        abort(400)

db-data-copy.py

@@ -48,18 +48,29 @@ def get_legacy_activities(dbcursor):
     return dbcursor.fetchall()
 
 
-def get_collection(dbconf):
+def get_legacy_statuses(dbcursor):
+    query = """
+    SELECT
+      id AS user_id,
+      unread_activities AS new_activities
+    FROM users
+    """
+    dbcursor.execute(query)
+    return dbcursor.fetchall()
+
+
+def get_collection(dbconf, name):
     client = MongoClient(dbconf.get('hostname'), dbconf.get('port'))
     db = client[dbconf.get('database')]
-    db.drop_collection('activity')
-    db.create_collection('activity')
-    return db.activity
+    db.drop_collection(name)
+    db.create_collection(name)
+    return db[name]
 
 
 config = load_configuration()
 cursor = get_cursor(config.get('mysql', {}))
 legacy_activities = get_legacy_activities(cursor)
-collection = get_collection(config.get('mongo', {}))
+activities_collection = get_collection(config.get('mongo', {}), 'activity')
 bar = progressbar.ProgressBar()
 
 for row in bar(legacy_activities):
@@ -82,6 +93,22 @@ def get_collection(dbconf):
 
     activity['clicked'] = True if row['clicked'] == 1 else False
 
-    collection.insert_one(activity)
+    activities_collection.insert_one(activity)
+
+activities_collection.create_index('user_id')
+
+legacy_statuses = get_legacy_statuses(cursor)
+statuses_collection = get_collection(config.get('mongo', {}), 'status')
+bar = progressbar.ProgressBar()
+
+for row in bar(legacy_statuses):
+    status = {
+        'user_id': row['user_id'],
+        'new_activities': row['new_activities']
+    }
+
+    statuses_collection.insert_one(status)
+
+statuses_collection.create_index('user_id', unique=True)
 
 print 'Migration successful'