discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

community-stat-fixes
All checks were successful
Deploy on push / deploy (push) Successful in 1m4s
Details

Browse Source
This commit is contained in:
Untone 2024-10-21 16:57:03 +03:00
parent a4e48eb3f4
commit 724f901bbd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
orm/community.py
View File

@ -3,7 +3,6 @@ import time
from sqlalchemy import ARRAY, Column, ForeignKey, Integer, String, distinct, func from sqlalchemy import ARRAY, Column, ForeignKey, Integer, String, distinct, func
from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import relationship
from orm.author import Author from orm.author import Author
from orm.shout import Shout from orm.shout import Shout
@ -59,11 +58,9 @@ class CommunityStats:
@property @property
def shouts(self): def shouts(self):
from orm.shout import ShoutCommunity
return ( return (
self.community.session.query(func.count(ShoutCommunity.shout_id)) self.community.session.query(func.count(Shout.id))
.filter(ShoutCommunity.community_id == self.community.id) .filter(Shout.community == self.community.id)
.scalar() .scalar()
) )
@ -77,12 +74,12 @@ class CommunityStats:
@property @property
def authors(self): def authors(self):
# author has a shout with community id and featured_at is not null # author has a shout with community id and its featured_at is not null
return ( return (
self.community.session.query(func.count(distinct(Author.id))) self.community.session.query(func.count(distinct(Author.id)))
.join(Shout) .join(Shout)
.filter( .filter(
Shout.community_id == self.community.id, Shout.featured_at.is_not(None), Author.id.in_(Shout.authors) Shout.community == self.community.id, Shout.featured_at.is_not(None), Author.id.in_(Shout.authors)
) )
.scalar() .scalar()
) )