diff --git a/src/db/crud.py b/src/db/crud.py index ddd0412..a695b20 100644 --- a/src/db/crud.py +++ b/src/db/crud.py @@ -106,7 +106,7 @@ def create_tag(db: Session, tag: str): def is_active_user(db: Session, email: str) -> bool: email = email.lower() - return len(email) and db.query(models.User).filter(models.User.email == email).count() > 0 + return len(email) and db.query(models.User).filter(models.User.email == email, models.User.is_active == True).first() is not None def is_user_in_group(db: Session, group_name: str, email: str) -> models.Group: if email == ALLOW_ANY_EMAIL: return True @@ -129,11 +129,11 @@ def get_user_groups(db: Session, email: str): # --------------- INIT User-Groups -def create_or_get_user(db: Session, author_id: str): +def create_or_get_user(db: Session, author_id: str, is_active: bool = models.User.is_active.default.arg) -> models.User: if type(author_id) == str: author_id = author_id.lower() db_user = db.query(models.User).filter(models.User.email == author_id).first() if not db_user: - db_user = models.User(email=author_id) + db_user = models.User(email=author_id, is_active=is_active) db.add(db_user) db.commit() db.refresh(db_user) @@ -175,14 +175,18 @@ def upsert_user_groups(db: Session): logger.debug(f"Found {len(user_groups)} users.") db.query(models.association_table_user_groups).delete() + # set all users to inactive + db.query(models.User).update({models.User.is_active: False}) for user_email, groups in user_groups.items(): user_email = user_email.lower() assert '@' in user_email, f'Invalid user email {user_email}' logger.info(f"email='{user_email[0:3]}...{user_email[-8:]}', {groups=}") db_user = db.query(models.User).filter(models.User.email == user_email).first() if db_user is None: - db_user = models.User(email=user_email) + db_user = models.User(email=user_email, is_active=True) db.add(db_user) + else: + db_user.is_active = True if not groups: continue # avoid hanging in for x in None: for group in groups: db_group = create_or_get_group(db, group) diff --git a/src/db/models.py b/src/db/models.py index 29f0a05..2718687 100644 --- a/src/db/models.py +++ b/src/db/models.py @@ -65,7 +65,7 @@ class User(Base): __tablename__ = "users" email = Column(String, primary_key=True, index=True) - is_active = Column(Boolean, default=True) + is_active = Column(Boolean, default=False) archives = relationship("Archive", back_populates="author") groups = relationship("Group", back_populates="users", secondary=association_table_user_groups) diff --git a/src/tests/db/test_crud.py b/src/tests/db/test_crud.py index edd9abf..7b50447 100644 --- a/src/tests/db/test_crud.py +++ b/src/tests/db/test_crud.py @@ -342,15 +342,22 @@ def test_create_or_get_user(test_data, db_session): assert db_session.query(models.User).count() == 4 + # already exists assert (u1 := crud.create_or_get_user(db_session, "rick@example.com")) is not None assert u1.email == "rick@example.com" assert u1.is_active == True - assert (u2 := crud.create_or_get_user(db_session, "beth@example.com")) is not None + # new active + assert (u2 := crud.create_or_get_user(db_session, "beth@example.com", is_active=True)) is not None assert u2.email == "beth@example.com" assert u2.is_active == True - assert db_session.query(models.User).count() == 5 + # new not active + assert (u3 := crud.create_or_get_user(db_session, "not-active@example.com")) is not None + assert u3.email == "not-active@example.com" + assert u3.is_active == False + + assert db_session.query(models.User).count() == 6 def test_get_group(test_data, db_session):