Skip to content

Commit a70e1c6

Browse files
committed
Fix sqlalchemy queries
Previously, when setting up the linting, I changed some of the comparisons in the sqlalchemy filters from things like `filter(m.Person.opt_out == False)` to `filter(not m.Person.opt_out)` which just doenst work. This commit changes these to things like `filter(m.Person.opt_out.is_(False))` Signed-off-by: Ryan Lerch <[email protected]>
1 parent ebe8127 commit a70e1c6

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tahrir/views.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def _get_user_badge_info(request, user):
8080

8181
# Get rank. (same code found in leaderboard view function)
8282
rank = user.rank or 0
83-
user_count = request.db.session.query(m.Person).filter(not m.Person.opt_out).count()
83+
user_count = request.db.session.query(m.Person).filter(m.Person.opt_out.is_(False)).count()
8484

8585
try:
8686
percentile = (
@@ -393,7 +393,7 @@ def index(request):
393393
latest_awards = (
394394
request.db.get_all_assertions()
395395
.join(m.Person)
396-
.filter(not m.Person.opt_out)
396+
.filter(m.Person.opt_out.is_(False))
397397
.order_by(sa.desc(m.Assertion.issued_on))
398398
.limit(n)
399399
.all()
@@ -494,13 +494,13 @@ def leaderboard(request):
494494
m.Person.rank,
495495
m.Person.created_on,
496496
)
497-
.filter(not m.Person.opt_out)
497+
.filter(m.Person.opt_out.is_(False))
498498
)
499499

500-
leaderboard = query.filter(m.Person.rank is not None).all()
500+
leaderboard = query.filter(m.Person.rank.isnot(None)).all()
501501
# Get total user count.
502502
user_count = len(leaderboard)
503-
leaderboard.extend(query.filter(m.Person.rank is None).all())
503+
leaderboard.extend(query.filter(m.Person.rank.is_(None)).all())
504504

505505
user_to_rank = request.db._make_leaderboard()
506506

@@ -554,13 +554,13 @@ def leaderboard_json(request):
554554
m.Person.rank,
555555
m.Person.created_on,
556556
)
557-
.filter(not m.Person.opt_out)
557+
.filter(m.Person.opt_out.is_(False))
558558
)
559559

560-
leaderboard = query.filter(m.Person.rank is not None).all()
560+
leaderboard = query.filter(m.Person.rank.isnot(None)).all()
561561
# Get total user count.
562562
# user_count = len(leaderboard)
563-
leaderboard.extend(query.filter(m.Person.rank is None).all())
563+
leaderboard.extend(query.filter(m.Person.rank.is_(None)).all())
564564

565565
user_to_rank = request.db._make_leaderboard()
566566

@@ -626,7 +626,7 @@ def explore(request):
626626
(m.Person.nickname.like("%" + search_query + "%"))
627627
| (m.Person.bio.like("%" + search_query + "%"))
628628
)
629-
& (not m.Person.opt_out)
629+
& (m.Person.opt_out.is_(False))
630630
)
631631
.all()
632632
)
@@ -655,10 +655,10 @@ def explore(request):
655655
# Get some random persons (for discovery).
656656
try:
657657
random_persons = random.sample(
658-
request.db.get_all_persons().filter(not m.Person.opt_out).all(), 5
658+
request.db.get_all_persons().filter(m.Person.opt_out.is_(False)).all(), 5
659659
)
660660
except ValueError: # the sample is probably larger than the population
661-
random_persons = request.db.get_all_persons().filter(not m.Person.opt_out).all()
661+
random_persons = request.db.get_all_persons().filter(m.Person.opt_out.is_(False)).all()
662662

663663
return dict(
664664
auth_principals=request.effective_principals,
@@ -1217,7 +1217,7 @@ def diff(request):
12171217
# Get rank. (same code found in leaderboard view function)
12181218
user_a_rank = user_a.rank
12191219
user_b_rank = user_b.rank
1220-
user_count = request.db.session.query(m.Person).filter(not m.Person.opt_out).count()
1220+
user_count = request.db.session.query(m.Person).filter(m.Person.opt_out.is_(False)).count()
12211221

12221222
try:
12231223
user_a_percentile = (float(user_a_rank) / float(user_count)) * 100

0 commit comments

Comments
 (0)