Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class Account(Base):

account_id = Column("account_id", Integer, primary_key=True, autoincrement=True)
username = Column("username", Text, unique=True, nullable=False)
account_password = Column("account_password", Text, nullable=False)
email = Column("email", Text)
account_role = Column("account_role", Text, nullable=False)
created_at = Column("created_at", TIMESTAMP)
Expand Down
2 changes: 2 additions & 0 deletions migrations/V4__add_password_in_accounts.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE accounts
ADD COLUMN account_password TEXT NOT NULL;
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dev = [
]

[tool.ruff]
line-length = 140
line-length = 320

[tool.ruff.lint]
select = ["E", "F", "W", "I", "B", "UP", "Q", "T"]
17 changes: 8 additions & 9 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ def truncate_all_tables(connection):

@pytest.fixture(scope="function")
def db_session():
connection = engine.connect()
truncate_all_tables(connection)
session = SessionLocal(bind=connection)

try:
yield session
finally:
session.close()
connection.close()
with engine.begin() as connection:
truncate_all_tables(connection)
session = SessionLocal(bind=connection)

try:
yield session
finally:
session.close()
12 changes: 8 additions & 4 deletions tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@


def test_create_account(db_session):
account = Account(username="pytest_user_account", email="test_account@example.com", account_role="user")
account = Account(username="pytest_user_account", account_password="123456789", email="test_account@example.com", account_role="user")
db_session.add(account)
db_session.commit()
result = db_session.query(Account).filter_by(username="pytest_user_account").first()
assert result is not None
assert result.account_password is not None
assert result.account_role == "user"

def test_create_article(db_session):
author = Account(username="pytest_author_article", email="author_article@test.com", account_role="author")
author = Account(username="pytest_author_article", account_password="123456789", email="author_article@test.com", account_role="author")
db_session.add(author)
db_session.commit()
article = Article(writer_id=author.account_id, title="Titre article", content="Contenu article")
Expand All @@ -19,10 +20,11 @@ def test_create_article(db_session):
result = db_session.query(Article).filter_by(title="Titre article").first()
assert result is not None
assert result.writer.username == "pytest_author_article"
assert result.writer.account_password is not None

def test_create_feedback(db_session):
author = Account(username="pytest_author_feedback", email="author_feedback@test.com", account_role="author")
user = Account(username="pytest_user_feedback", email="user_feedback@test.com", account_role="user")
author = Account(username="pytest_author_feedback", account_password="123456789", email="author_feedback@test.com", account_role="author")
user = Account(username="pytest_user_feedback", account_password="123456789", email="user_feedback@test.com", account_role="user")
db_session.add_all([author, user])
db_session.commit()
article = Article(writer_id=author.account_id, title="Titre feedback", content="Contenu feedback")
Expand All @@ -34,4 +36,6 @@ def test_create_feedback(db_session):
result = db_session.query(Feedback).filter_by(message="Bravo !").first()
assert result is not None
assert result.commenter.username == "pytest_user_feedback"
assert result.commenter.account_password is not None
assert result.article.title == "Titre feedback"
assert result.article.writer.account_password is not None