archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fix T62049: Wrong sorting of comment replies

Browse Source
This commit is contained in:
Tobias Johansson
2019-03-11 10:32:40 +01:00
parent fbcd4c9250
commit 12d8a282aa
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pillar/api/nodes/comments.py
View File

@@ -79,7 +79,9 @@ class CommentTreeBuilder:
self.nbr_of_Comments: int = 0 self.nbr_of_Comments: int = 0
def build(self) -> CommentTreeDO: def build(self) -> CommentTreeDO:
enriched_comments = self.child_comments(self.node_id) enriched_comments = self.child_comments(self.node_id,
sort={'properties.rating_positive': pymongo.DESCENDING,
'_created': pymongo.DESCENDING})
project_id = self.get_project_id() project_id = self.get_project_id()
return CommentTreeDO( return CommentTreeDO(
node_id=self.node_id, node_id=self.node_id,
@@ -88,14 +90,15 @@ class CommentTreeBuilder:
comments=enriched_comments comments=enriched_comments
) )
def child_comments(self, node_id: bson.ObjectId) -> typing.List[CommentDO]: def child_comments(self, node_id: bson.ObjectId, sort: dict) -> typing.List[CommentDO]:
raw_comments = self.mongodb_comments(node_id) raw_comments = self.mongodb_comments(node_id, sort)
return [self.enrich(comment) for comment in raw_comments] return [self.enrich(comment) for comment in raw_comments]
def enrich(self, mongo_comment: dict) -> CommentDO: def enrich(self, mongo_comment: dict) -> CommentDO:
self.nbr_of_Comments += 1 self.nbr_of_Comments += 1
comment = to_comment_data_object(mongo_comment) comment = to_comment_data_object(mongo_comment)
comment.replies = self.child_comments(mongo_comment['_id']) comment.replies = self.child_comments(mongo_comment['_id'],
sort={'_created': pymongo.ASCENDING})
return comment return comment
def get_project_id(self): def get_project_id(self):
@@ -104,7 +107,7 @@ class CommentTreeBuilder:
return result['project'] return result['project']
@classmethod @classmethod
def mongodb_comments(cls, node_id: bson.ObjectId) -> typing.Iterator: def mongodb_comments(cls, node_id: bson.ObjectId, sort: dict) -> typing.Iterator:
nodes_coll = current_app.db('nodes') nodes_coll = current_app.db('nodes')
return nodes_coll.aggregate([ return nodes_coll.aggregate([
{'$match': {'node_type': 'comment', {'$match': {'node_type': 'comment',
@@ -116,8 +119,7 @@ class CommentTreeBuilder:
"foreignField": "_id", "foreignField": "_id",
"as": "user"}}, "as": "user"}},
{'$unwind': {'path': "$user"}}, {'$unwind': {'path': "$user"}},
{'$sort': {'properties.rating_positive': pymongo.DESCENDING, {'$sort': sort},
'_created': pymongo.DESCENDING}},
]) ])