Fix on auth password

src/crud/users.py

@@ -5,56 +5,82 @@ from sqlalchemy.orm import Session
 from fastapi import HTTPException, status
 
 from src import models
-from src.auth import get_password_hash # Assuming this is in your auth file
-
-def get_user_by_id(db: Session, user_id: int) -> models.User | None:
-    """Fetches a user by their primary key ID."""
-    return db.query(models.User).filter(models.User.id == user_id).first()
+from src.crud import hash_password  # Import from crud module instead of auth
 
 def get_user_by_username(db: Session, username: str) -> models.User | None:
-    """Fetches a user by their unique username."""
+    """
+    Retrieves a user by their username.
+    """
     return db.query(models.User).filter(models.User.username == username).first()
 
-def get_user_by_tag_id(db: Session, tag_id: str) -> models.User | None:
-    """Fetches a user by their RFID tag ID."""
-    return db.query(models.User).filter(models.User.tag_id == tag_id).first()
+def get_user_by_id(db: Session, user_id: int) -> models.User | None:
+    """
+    Retrieves a user by their ID.
+    """
+    return db.query(models.User).filter(models.User.id == user_id).first()
+
+def get_all_users(db: Session, skip: int = 0, limit: int = 100) -> list[models.User]:
+    """
+    Retrieves all users with pagination.
+    """
+    return db.query(models.User).offset(skip).limit(limit).all()
 
-def create_user(db: Session, user: models.UserCreate) -> models.User:
-    """Creates a new user in the database."""
-    if get_user_by_username(db, user.username):
+def create_user(db: Session, user_data: models.UserCreate) -> models.User:
+    """
+    Creates a new user account.
+    """
+    # Check if username already exists
+    existing_user = get_user_by_username(db, user_data.username)
+    if existing_user:
         raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT,
-            detail=f"Username '{user.username}' is already registered."
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Username '{user_data.username}' is already registered."
         )
-    hashed_password = get_password_hash(user.password)
-    new_user = models.User(
-        username=user.username,
+
+    # Hash the password
+    hashed_password = hash_password(user_data.password)  # Use the imported function
+    
+    # Create new user
+    db_user = models.User(
+        username=user_data.username,
+        name=user_data.name,
         hashed_password=hashed_password,
-        role=user.role,
-        department=user.department,
-        tag_id=user.tag_id
+        role=user_data.role,
+        department=user_data.department,
+        tag_id=user_data.tag_id,
+        is_active=user_data.is_active if user_data.is_active is not None else True
     )
-    db.add(new_user)
+    
+    db.add(db_user)
     db.commit()
-    db.refresh(new_user)
-    return new_user
+    db.refresh(db_user)
+    
+    return db_user
 
-def update_user_tag_id(db: Session, username: str, tag_id: str) -> models.User:
-    """Updates the RFID tag ID for a specific user."""
-    db_user = get_user_by_username(db, username)
+def update_user(db: Session, user_id: int, user_update: models.UserCreate) -> models.User:
+    """
+    Updates an existing user.
+    """
+    db_user = get_user_by_id(db, user_id)
     if not db_user:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
-
-    existing_tag_user = get_user_by_tag_id(db, tag_id)
-    if existing_tag_user and existing_tag_user.username != username:
-         raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT,
-            detail=f"Tag ID '{tag_id}' is already assigned to another user."
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"User with ID {user_id} not found."
         )
-    
-    db_user.tag_id = tag_id
+
+    # Update fields
+    db_user.username = user_update.username
+    db_user.name = user_update.name
+    if user_update.password:  # Only update password if provided
+        db_user.hashed_password = hash_password(user_update.password)
+    db_user.role = user_update.role
+    db_user.department = user_update.department
+    db_user.tag_id = user_update.tag_id
+    db_user.is_active = user_update.is_active if user_update.is_active is not None else True
+
     db.commit()
     db.refresh(db_user)
+    
     return db_user
 
 def delete_user(db: Session, username_to_delete: str, current_admin: models.User) -> models.User:
@@ -90,4 +116,4 @@ def delete_user(db: Session, username_to_delete: str, current_admin: models.User
     db.delete(user_to_delete)
     db.commit()
     
-    return user_to_delete
+    return user_to_delete