Skip to content
Open
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
4 changes: 4 additions & 0 deletions backend/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class User(db.Model):

Relationships:
stats (UserStats): One-to-one relationship with UserStats.
role (UserRole): One-to-one relationship with UserRole.
"""

__tablename__ = "users"
Expand All @@ -38,6 +39,9 @@ class User(db.Model):
stats = db.relationship(
"UserStats", backref="user", uselist=False, cascade="all, delete-orphan"
)
role = db.relationship(
"UserRole", backref="user", uselist=False, cascade="all, delete-orphan"
)

def __init__(self, email, password, username):
"""
Expand Down
20 changes: 20 additions & 0 deletions backend/models/user_role.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from backend.extensions import db


class UserRole(db.Model):
"""
Represents a user's role in the system.

Attributes:
user_id (str): The unique identifier for the user's role. 1-to-1 relationship with User.
role (str): The user's role (e.g., "User", "Admin", "Moderator").
created_at (datetime): The timestamp when the role was created.
"""

__tablename__ = "user_roles"

user_id = db.Column(
db.String(36), db.ForeignKey("users.id", ondelete="CASCADE"), primary_key=True
)
role = db.Column(db.String(50), default="User", nullable=False)
created_at = db.Column(db.DateTime, server_default=db.func.now(), nullable=False)
10 changes: 7 additions & 3 deletions backend/routes/auth_routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import logging
from backend.extensions import db

from flask import Blueprint, jsonify, request
from werkzeug.security import generate_password_hash

from backend.extensions import db
from backend.models.user import User
from backend.models.user_role import UserRole
from backend.models.user_stats import UserStats
from werkzeug.security import generate_password_hash

# Auth Blueprint
auth_bp = Blueprint("auth", __name__)
Expand Down Expand Up @@ -41,10 +44,11 @@ def register():

hashed_password = generate_password_hash(password, method="pbkdf2:sha256")

# Create new user and user stats
# Create new user, user stats, and user role
try:
new_user = User(email=email, password=hashed_password, username=username)
new_user.stats = UserStats()
new_user.role = UserRole(user_id=new_user.id, role="User")
except Exception as e:
db.session.rollback()
logger.error("Error creating new user: %s", e)
Expand Down
35 changes: 35 additions & 0 deletions backend/tests/test_auth_register.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
from backend.models.user import User
from backend.models.user_role import UserRole


def test_register_success(client, test_data):
"""
Test successful registration of a new user.
"""
res = client.post("/register", json=test_data["valid_user"])

assert res.status_code == 201
Expand All @@ -7,6 +14,9 @@ def test_register_success(client, test_data):


def test_register_weak_password(client, test_data):
"""
Test registration with a weak password.
"""
res = client.post("/register", json=test_data["weak_password"])

assert res.status_code == 400
Expand All @@ -15,16 +25,41 @@ def test_register_weak_password(client, test_data):


def test_register_missing_fields(client, test_data):
"""
Test registration with missing fields.
"""
res = client.post("/register", json=test_data["missing_fields"])

assert res.status_code == 400


def test_register_duplicate_username(client, test_data):
"""
Test registration with existing username
"""
client.post("/register", json=test_data["valid_user"])

res = client.post(
"/register", json={**test_data["valid_user"], "email": "another@example.com"}
)

assert res.status_code == 409


def test_register_user_role(client, app, test_data):
"""
Test registration and User role assignment.
"""
res = client.post("/register", json=test_data["valid_user"])
assert res.status_code == 201

with app.app_context():
user = User.query.filter_by(
username=test_data["valid_user"]["username"]
).first()
assert user is not None

# Query the UserRole table using the User ID
user_role = UserRole.query.filter_by(user_id=user.id).first()
assert user_role is not None
assert user_role.role == "User"