Jaculabilis
/
amanuensis
1
1
Fork 0
Code Issues 19 Pull Requests Projects 1 Releases Activity

Compare commits

base: Jaculabilis:030ba05ab6e6372f10354adc8e284503b96131a5
Branches Tags
Jaculabilis:develop
Jaculabilis:tvb/editor
Jaculabilis:tvb/content-rule
Jaculabilis:nvb/create-route
Jaculabilis:master
Jaculabilis:v0.0.1
...
compare: Jaculabilis:07b1f12e9693c7ef030e7a2cb845df2b5849d734
Branches Tags
Jaculabilis:tvb/editor
Jaculabilis:tvb/content-rule
Jaculabilis:develop
Jaculabilis:nvb/create-route
Jaculabilis:master
Jaculabilis:v0.0.1

2 Commits
030ba05ab6 ... 07b1f12e96

Author SHA1 Message Date
Nikolai 07b1f12e96 merge commit 2021-06-07 16:48:00 -07:00
Nikolai c2103d8861 membership.create() checks for joinable and player limit; factory creates joinable lexicons by default 2021-06-07 16:45:45 -07:00
1 changed files with 3 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
amanuensis/backend/membership.py
View File

@ -42,8 +42,7 @@ def create(
# get reference to lexicon for next few checks # get reference to lexicon for next few checks
lex: Lexicon = db( lex: Lexicon = db(
select(Lexicon) select(Lexicon).where(Lexicon.id == lexicon_id)
.where(Lexicon.id == lexicon_id)
).scalar_one_or_none() ).scalar_one_or_none()
# Verify lexicon is joinable; current no Lexicons are joinable so this is commented out # Verify lexicon is joinable; current no Lexicons are joinable so this is commented out
@ -53,11 +52,8 @@ def create(
# Verify lexicon is not full # Verify lexicon is not full
if lex.player_limit: if lex.player_limit:
if ( if (
db( db(select(func.count()).where(Membership.lexicon_id == lexicon_id)).scalar()
select(func.count()) >= lex.player_limit
.where(Membership.lexicon_id == lexicon_id)
).scalar()
>= lex.player_limit
): ):
raise ArgumentError("Can't join: Lexicon is full") raise ArgumentError("Can't join: Lexicon is full")