From 5497ef4b0b6416a49716a2908ba73c5d524f64c1 Mon Sep 17 00:00:00 2001 From: Nikolai Date: Mon, 7 Jun 2021 16:29:16 -0700 Subject: [PATCH] membership.create() checks for joinable and player limit; factory creates joinable lexicons by default --- amanuensis/backend/membership.py | 22 ++++++++++++++++++++++ tests/conftest.py | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/amanuensis/backend/membership.py b/amanuensis/backend/membership.py index 7440353..3161a89 100644 --- a/amanuensis/backend/membership.py +++ b/amanuensis/backend/membership.py @@ -5,6 +5,7 @@ Membership query interface from sqlalchemy import select, func from amanuensis.db import DbContext, Membership +from amanuensis.db.models import Lexicon from amanuensis.errors import ArgumentError @@ -36,6 +37,27 @@ def create( ): raise ArgumentError("User is already a member of lexicon") + # get reference to lexicon for next few checks + lex: Lexicon = db( + select(Lexicon) + .where(Lexicon.id == lexicon_id) + ).scalar_one_or_none() + + # Verify lexicon is joinable; current no Lexicons are joinable so this is commented out + if not lex.joinable: + raise ArgumentError("Can't join: Lexicon is not joinable") + + # Verify lexicon is not full + if lex.player_limit: + if ( + db( + select(func.count()) + .where(Membership.lexicon_id == lexicon_id) + ).scalar() + >= lex.player_limit + ): + raise ArgumentError("Can't join: Lexicon is full") + new_membership = Membership( user_id=user_id, lexicon_id=lexicon_id, diff --git a/tests/conftest.py b/tests/conftest.py index a93b93c..0cd436f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -49,7 +49,9 @@ def make_lexicon(db: DbContext): } state["nonce"] += 1 updated_kwargs = {**default_kwargs, **kwargs} - return lexiq.create(db, **updated_kwargs) + lex = lexiq.create(db, **updated_kwargs) + lex.joinable = True + return lex return lexicon_factory