SQLAlchemy 1.0->SQLAlchemy 2.x

backend/app/tests/test_user.py

@@ -1,9 +1,4 @@
 
-
-from fastapi import security
-import jwt
-
-
 def test_users_list(test_client,login_user):
 
     response = test_client.get("/api/v1/users", headers={"Authorization": "Bearer " + login_user})
@@ -32,6 +27,7 @@ def test_user_create(test_client,login_user):
     data = response.json()
     assert "data" in data
     assert data["data"] is not None
+    assert data["data"]["id"] > 0
     assert data["data"]["email"] == user_data["email"] 
     assert data["data"]["first_name"] == user_data["first_name"] 
     assert data["data"]["last_name"] == user_data["last_name"] 
@@ -66,20 +62,60 @@ def test_admin_create_for_admin(test_client,login_admin):
     data = response.json()
     assert "data" in data
     assert data["data"] is not None
+    assert data["data"]["id"] > 0
     assert data["data"]["email"] == user_data["email"] 
     assert data["data"]["first_name"] == user_data["first_name"] 
     assert data["data"]["last_name"] == user_data["last_name"] 
     assert data["data"]["is_active"] == user_data["is_active"] 
     assert data["data"]["is_superuser"] == user_data["is_superuser"] 
 
-    def test_user_details(test_client, login_user,user):
-        payload = jwt.decode(login_user, security.SECRET_KEY, algorithms=[security.ALGORITHM])
-        id = payload.get("sub")
-        response = test_client.get("/api/v1/users/"+ id)
-        assert response.status_code == 200
-        assert response.json()["data"]["email"] ==user["email"]
-        assert data["data"]["first_name"] == user["first_name"] 
-        assert data["data"]["last_name"] == user["last_name"] 
-        assert data["data"]["is_active"] == user["is_active"] 
-        assert data["data"]["is_superuser"] == user["is_superuser"] 
-        assert response.json()["data"]["id"] == id
+def test_user_details(test_client, login_user_id, login_user,user):
+    id = login_user_id
+    response = test_client.get("/api/v1/users/"+ str(id), headers={"Authorization": "Bearer " + login_user})
+    assert response.status_code == 200
+    data = response.json()
+    assert data["data"]["email"] ==user.email
+    assert data["data"]["first_name"] == user.first_name
+    assert data["data"]["last_name"] == user.last_name
+    assert data["data"]["is_active"] == user.is_active
+    assert data["data"]["is_superuser"] == user.is_superuser
+    assert data["data"]["id"] == id
+
+def test_user_edit(test_client, login_user_id,login_user,user):
+    id = login_user_id
+    user_data = {
+        "email": user.email,
+        "first_name": "Updated",
+        "last_name": "test",
+        "is_active": True,
+        "is_superuser": False
+    }
+    response = test_client.put("/api/v1/users/" + str(id), json=user_data, headers={"Authorization": "Bearer " + login_user})
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["data"]["email"] == user.email
+    assert data["data"]["first_name"] == user_data["first_name"] 
+    assert data["data"]["last_name"] == user_data["last_name"] 
+    assert data["data"]["is_active"] == user.is_active
+    assert data["data"]["id"] == id
+
+def test_user_delete(test_client, login_user):
+    user_data = {
+        "email": "delete@example.com",
+        "password": "password123",
+        "first_name": "delete",
+        "last_name": "User",
+        "is_active": True,
+        "is_superuser": False
+    }
+    response = test_client.post("/api/v1/users", json=user_data, headers={"Authorization": "Bearer " + login_user})
+    assert response.status_code == 200
+    data = response.json()
+    id =  data["data"]["id"]
+    response = test_client.delete("/api/v1/users/"+ str(id),headers={"Authorization": "Bearer " + login_user})
+    assert response.status_code == 200
+    assert response.json()["data"]["email"] == "delete@example.com"
+    response = test_client.get("/api/v1/users/"+ str(id), headers={"Authorization": "Bearer " + login_user})
+    assert response.status_code == 200
+    assert "data" not in response.json()