Documents and patch activity refactoring

Author: kwn

activities/activities.py

@@ -3,6 +3,7 @@
 from documents import Activity
 from pymongo import DESCENDING
 from flask_cors import cross_origin
+from mongoalchemy.util import FieldNotFoundException
 from mongoalchemy.exceptions import BadValueException, BadResultException
 
 USER_ID = 12
@@ -37,10 +38,10 @@ def list_activities():
 @cross_origin()
 def patch_activity(activity_id):
     try:
-        activity = session.query(Activity).filter(Activity.mongo_id == activity_id, Activity.user_id == USER_ID).one()
-    except (BadValueException, BadResultException):
-        abort(404)
+        # TODO introduce validation or json schema
+        query = session.query(Activity).filter(Activity.mongo_id == activity_id, Activity.user_id == USER_ID)
+        query.set(**request.json).execute()
 
-    activity.clicked = True
-
-    return jsonify(activity.to_dict())
+        return jsonify(query.one().to_dict())
+    except (FieldNotFoundException, BadValueException):
+        abort(400)

activities/documents.py

@@ -7,23 +7,23 @@ class Activity(Document):
     config_polymorphic = 'type'
     config_polymorphic_collection = True
 
-    type = StringField(on_update='ignore')
+    type = StringField(on_update='ignore', )
     created_at = DateTimeField(on_update='ignore')
-    clicked = BoolField()
+    clicked = BoolField(required=True)
     user_id = IntField(on_update='ignore')
 
 
 class Like(Activity):
     config_polymorphic_identity = 'like'
 
-    performed_by = StringField()
-    performer_avatar = StringField()
-    post_id = IntField()
-    post_image = StringField()
+    performed_by = StringField(on_update='ignore')
+    performer_avatar = StringField(on_update='ignore')
+    post_id = IntField(on_update='ignore')
+    post_image = StringField(on_update='ignore')
 
     def to_dict(self):
         return {
-            'id': self.mongo_id.__str__(),
+            'id': str(self.mongo_id),
             'type': self.type,
             'performed_by': self.performed_by,
             'performer_avatar': self.performer_avatar,
@@ -37,14 +37,14 @@ def to_dict(self):
 class Comment(Activity):
     config_polymorphic_identity = 'comment'
 
-    performed_by = StringField()
-    performer_avatar = StringField()
-    post_id = IntField()
-    post_image = StringField()
+    performed_by = StringField(on_update='ignore')
+    performer_avatar = StringField(on_update='ignore')
+    post_id = IntField(on_update='ignore')
+    post_image = StringField(on_update='ignore')
 
     def to_dict(self):
         return {
-            'id': self.mongo_id.__str__(),
+            'id': str(self.mongo_id),
             'type': self.type,
             'performed_by': self.performed_by,
             'performer_avatar': self.performer_avatar,
@@ -58,14 +58,14 @@ def to_dict(self):
 class Repost(Activity):
     config_polymorphic_identity = 'repost'
 
-    performed_by = StringField()
-    performer_avatar = StringField()
-    post_id = IntField()
-    post_image = StringField()
+    performed_by = StringField(on_update='ignore')
+    performer_avatar = StringField(on_update='ignore')
+    post_id = IntField(on_update='ignore')
+    post_image = StringField(on_update='ignore')
 
     def to_dict(self):
         return {
-            'id': self.mongo_id.__str__(),
+            'id': str(self.mongo_id),
             'type': self.type,
             'performed_by': self.performed_by,
             'performer_avatar': self.performer_avatar,
@@ -79,12 +79,12 @@ def to_dict(self):
 class Follow(Activity):
     config_polymorphic_identity = 'follow'
 
-    performed_by = StringField()
-    performer_avatar = StringField()
+    performed_by = StringField(on_update='ignore')
+    performer_avatar = StringField(on_update='ignore')
 
     def to_dict(self):
         return {
-            'id': self.mongo_id.__str__(),
+            'id': str(self.mongo_id),
             'type': self.type,
             'performed_by': self.performed_by,
             'performer_avatar': self.performer_avatar,
@@ -96,14 +96,14 @@ def to_dict(self):
 class Mention(Activity):
     config_polymorphic_identity = 'mention'
 
-    performed_by = StringField()
-    performer_avatar = StringField()
-    post_id = IntField()
-    post_image = StringField()
+    performed_by = StringField(on_update='ignore')
+    performer_avatar = StringField(on_update='ignore')
+    post_id = IntField(on_update='ignore')
+    post_image = StringField(on_update='ignore')
 
     def to_dict(self):
         return {
-            'id': self.mongo_id.__str__(),
+            'id': str(self.mongo_id),
             'type': self.type,
             'performed_by': self.performed_by,
             'performer_avatar': self.performer_avatar,
@@ -117,10 +117,10 @@ def to_dict(self):
 class Badge(Activity):
     config_polymorphic_identity = 'badge'
 
-    badge_name = StringField()
-    badge_image = StringField()
-    post_id = IntField()
-    post_image = StringField()
+    badge_name = StringField(on_update='ignore')
+    badge_image = StringField(on_update='ignore')
+    post_id = IntField(on_update='ignore')
+    post_image = StringField(on_update='ignore')
 
     def to_dict(self):
         return {