LBRYCommunity/comment-server
1
0
Fork 0
Code Issues 18 Pull requests 1 Projects Releases Packages Wiki Activity

Replace database methods with peewee ORM #39

Merged
osilkin98 merged 26 commits from orm-rewrite into master 2020-04-03 23:40:43 +02:00
Conversation 0 Commits 26 Files changed 18 +9 -32
1 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 644e5e8477 - Show all commits

41
src/database/ddl.py
View file

@ -130,25 +130,9 @@ def clean(thing: dict) -> dict:
def get_comment(comment_id: str) -> dict: def get_comment(comment_id: str) -> dict:
try: return (comment_list(expressions=(Comment.comment_id == comment_id), page_size=1)
comment: Comment = Comment.get_by_id(comment_id) .get('items')
except DoesNotExist as e: .pop())
raise ValueError from e
else:
as_dict = model_to_dict(comment)
if comment.channel:
as_dict.update({
'channel_id': comment.channel_id,
'channel_name': comment.channel.name,
'signature': comment.signature,
'signing_ts': comment.signing_ts,
'channel_url': comment.channel.channel_url
})
if comment.parent:
as_dict.update({
'parent_id': comment.parent_id
})
return clean(as_dict)
def get_comment_ids(claim_id: str = None, parent_id: str = None, def get_comment_ids(claim_id: str = None, parent_id: str = None,
@ -173,19 +157,12 @@ def get_comments_by_id(comment_ids: typing.Union[list, tuple]) -> dict:
def get_channel_from_comment_id(comment_id: str) -> dict: def get_channel_from_comment_id(comment_id: str) -> dict:
try: results = comment_list(
comment = Comment.get_by_id(comment_id) expressions=(Comment.comment_id == comment_id),
except DoesNotExist as e: select_fields=['channel_name', 'channel_id', 'channel_url'],
raise ValueError from e page_size=1
else: )
channel = comment.channel return results['items'].pop()
if not channel:
raise ValueError('The provided comment does not belong to a channel.')
return {
'channel_name': channel.name,
'channel_id': channel.claim_id,
'channel_url': 'lbry://' + channel.name + '#' + channel.claim_id
}
if __name__ == '__main__': if __name__ == '__main__':