Fix database

backend/app/crud/employees.py

@@ -1,6 +1,6 @@
 """Employee CRUD operations"""
 from sqlalchemy.orm import Session
-from typing import Optional, List
+from typing import List, Optional
 from ..models.employee import Employee
 from ..schemas.employee import EmployeeCreate, EmployeeUpdate
 from ..utils.loggers import auth_logger
@@ -13,57 +13,42 @@ def get_employee(db: Session, employee_id: int) -> Optional[Employee]:
     """Get employee by ID"""
     return db.query(Employee).filter(Employee.id == employee_id).first()
 
-def get_employee_by_last_name(db: Session, last_name: str) -> Optional[Employee]:
-    """Get employee by last name"""
-    return db.query(Employee).filter(Employee.last_name == last_name).first()
+def get_employee_by_credentials(db: Session, first_name: str, last_name: str) -> Optional[Employee]:
+    """Get employee by first name and last name"""
+    return db.query(Employee).filter(
+        Employee.first_name == first_name,
+        Employee.last_name == last_name
+    ).first()
 
 def create_employee(db: Session, employee: EmployeeCreate, hashed_password: str) -> Employee:
     """Create new employee"""
-    try:
-        db_employee = Employee(
-            first_name=employee.first_name,
-            last_name=employee.last_name,
-            department=employee.department,
-            office=employee.office,
-            hashed_password=hashed_password
-        )
-        db.add(db_employee)
-        db.commit()
-        db.refresh(db_employee)
-        return db_employee
-    except Exception as e:
-        auth_logger.error(f"Error creating employee: {e}")
-        db.rollback()
-        raise
+    db_employee = Employee(
+        first_name=employee.first_name,
+        last_name=employee.last_name,
+        department=employee.department,
+        office=employee.office,
+        hashed_password=hashed_password,
+        is_admin=employee.is_admin
+    )
+    db.add(db_employee)
+    db.commit()
+    db.refresh(db_employee)
+    return db_employee
 
 def update_employee(db: Session, employee_id: int, employee: EmployeeUpdate) -> Optional[Employee]:
-    """Update employee"""
+    """Update employee data"""
     db_employee = get_employee(db, employee_id)
-    if not db_employee:
-        return None
-        
-    for field, value in employee.model_dump(exclude_unset=True).items():
-        setattr(db_employee, field, value)
-        
-    try:
+    if db_employee:
+        for key, value in employee.dict(exclude_unset=True).items():
+            setattr(db_employee, key, value)
         db.commit()
         db.refresh(db_employee)
-        return db_employee
-    except Exception as e:
-        auth_logger.error(f"Error updating employee: {e}")
-        db.rollback()
-        raise
+    return db_employee
 
 def delete_employee(db: Session, employee_id: int) -> Optional[Employee]:
     """Delete employee"""
     db_employee = get_employee(db, employee_id)
     if db_employee:
-        try:
-            db.delete(db_employee)
-            db.commit()
-            return db_employee
-        except Exception as e:
-            auth_logger.error(f"Error deleting employee: {e}")
-            db.rollback()
-            raise
-    return None
+        db.delete(db_employee)
+        db.commit()
+    return db_employee

backend/app/crud/tokens.py

@@ -3,9 +3,9 @@ from sqlalchemy.orm import Session
 from typing import Optional
 from ..models.token import Token
 
-def create_token(db: Session, token: str, user_id: int) -> Token:
+def create_token(db: Session, token: str, employee_id: int) -> Token:
     """Create new token"""
-    db_token = Token(token=token, user_id=user_id)
+    db_token = Token(token=token, employee_id=employee_id)
     db.add(db_token)
     db.commit()
     db.refresh(db_token)
@@ -24,8 +24,8 @@ def delete_token(db: Session, token: str) -> bool:
         return True
     return False
 
-def delete_user_tokens(db: Session, user_id: int) -> bool:
-    """Delete all tokens for a user"""
-    db.query(Token).filter(Token.user_id == user_id).delete()
+def delete_employee_tokens(db: Session, employee_id: int) -> bool:
+    """Delete all tokens for an employee"""
+    db.query(Token).filter(Token.employee_id == employee_id).delete()
     db.commit()
     return True