refactor

Author: LegendaryAKx3

gs/backend/api/v1/aro/endpoints/user.py

@@ -4,12 +4,7 @@
 
 from gs.backend.api.v1.aro.models.requests import UserRequest
 from gs.backend.api.v1.aro.models.responses import AllUsersResponse, UserResponse
-from gs.backend.data.data_wrappers.aro_wrapper.aro_user_data_wrapper import (
-    add_user,
-    delete_user_by_id,
-    update_user_by_id,
-)
-from gs.backend.data.data_wrappers.aro_wrapper.aro_user_data_wrapper import get_all_users as get_all_db_users
+from gs.backend.data.data_wrappers.wrappers import AROUsersWrapper
 
 aro_user_router = APIRouter(tags=["ARO", "User Information"])
 
@@ -21,10 +16,25 @@ async def get_all_users() -> AllUsersResponse:
 
     :return: all users
     """
-    users = get_all_db_users()
+    users = AROUsersWrapper().get_all()
     return AllUsersResponse(data=users)
 
 
+@aro_user_router.get("/get_user/{userid}", response_model=UserResponse)
+def get_user(userid: str) -> UserResponse:
+    """
+    Gets a user by ID
+
+    :param userid: The unique identifier of the user
+    :return: the user
+    """
+    try:
+        user = AROUsersWrapper().get_by_id(UUID(userid))
+        return UserResponse(data=user)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e)) from e
+
+
 @aro_user_router.post("/create_user", response_model=UserResponse)
 def create_user(payload: UserRequest) -> UserResponse:
     """
@@ -33,48 +43,30 @@ def create_user(payload: UserRequest) -> UserResponse:
     :return: returns the user created
     """
 
-    user = add_user(
-        call_sign=payload.call_sign,
-        email=payload.email,
-        f_name=payload.first_name,
-        l_name=payload.last_name,
-        phone_number=payload.phone_number,
+    user = AROUsersWrapper().create(
+        data={
+            "call_sign": payload.call_sign,
+            "email": payload.email,
+            "first_name": payload.first_name,
+            "last_name": payload.last_name,
+            "phone_number": payload.phone_number,
+        }
     )
 
     return UserResponse(data=user)
 
 
-@aro_user_router.put("/update_user/{userid}", response_model=UserResponse)
-def update_user(userid: str, payload: UserRequest) -> UserResponse:
-    """
-    Modifies the user’s info based on the payload
-    :param userid: The unique identifier of the user to be updated
-    :param payload: The data used to update a user
-    :return: returns the user updated
-    """
-    try:
-        user = update_user_by_id(
-            userid=UUID(userid),
-            call_sign=payload.call_sign,
-            email=payload.email,
-            f_name=payload.first_name,
-            l_name=payload.last_name,
-            phone_number=payload.phone_number,
-        )
-        return UserResponse(data=user)
-    except ValueError as e:
-        raise HTTPException(status_code=404, detail=str(e)) from e
-
-
 @aro_user_router.delete("/delete_user/{userid}", response_model=AllUsersResponse)
 def delete_user(userid: str) -> AllUsersResponse:
     """
     Deletes a user based on the user ID
     :param userid: The unique identifier of the user to be deleted
-    :return: returns the user deleted
+    :return: returns all remaining users
     """
     try:
-        users = delete_user_by_id(UUID(userid))
+        wrapper = AROUsersWrapper()
+        wrapper.delete_by_id(UUID(userid))
+        users = wrapper.get_all()
         return AllUsersResponse(data=users)
     except ValueError as e:
         raise HTTPException(status_code=404, detail=str(e)) from e

python_test/test_aro_user_api.py

@@ -68,63 +68,33 @@ def test_user2_creation(client, user2_data):
     return user
 
 
-# Test updating user1 (depends on test_user1_creation)
-@pytest.fixture
-def test_user1_update(client, test_user1_creation):
+# Test getting user1 by ID
+def test_get_user1_by_id(client, test_user1_creation):
     user_id = test_user1_creation["id"]
-    update_data = {
-        "call_sign": "123456",
-        "email": "bob2@test.com",
-        "first_name": "Rob",
-        "last_name": "Smith",
-        "phone_number": "234567890",
-    }
-    res = client.put(
-        f"/api/v1/aro/user/update_user/{user_id}", json=update_data, headers={"Content-Type": "application/json"}
-    )
-
+    res = client.get(f"/api/v1/aro/user/get_user/{user_id}")
     assert res.status_code == 200
-    updated_user = res.json()["data"]
-    assert updated_user["email"] == update_data["email"]
-    assert updated_user["call_sign"] == update_data["call_sign"]
-    assert updated_user["first_name"] == update_data["first_name"]
-    assert updated_user["last_name"] == update_data["last_name"]
-    assert updated_user["phone_number"] == update_data["phone_number"]
+    assert res.json()["data"]["id"] == user_id
+
 
-    return updated_user
+# Test getting user2 by ID
+def test_get_user2_by_id(client, test_user2_creation):
+    user_id = test_user2_creation["id"]
+    res = client.get(f"/api/v1/aro/user/get_user/{user_id}")
+    assert res.status_code == 200
+    assert res.json()["data"]["id"] == user_id
 
 
-# Test getting all users (after creating user1 and user2, and updating user1 to ensure creation and update work oncorrect user objects)
-@pytest.fixture
-def test_get_users(client, test_user1_update, test_user2_creation):
+# Test getting all users
+def test_get_all_users(client, test_user1_creation, test_user2_creation):
     res = client.get("/api/v1/aro/user/get_all_users")
-
     assert res.status_code == 200
     all_users = res.json()["data"]
-    assert len(all_users) == 2
-
-    # Check user1
-    user1_id = test_user1_update["id"]
-    user1_from_response = next(user for user in all_users if user["id"] == user1_id)
-    assert user1_from_response["call_sign"] == test_user1_update["call_sign"]
-    assert user1_from_response["email"] == test_user1_update["email"]
-    assert user1_from_response["first_name"] == test_user1_update["first_name"]
-    assert user1_from_response["last_name"] == test_user1_update["last_name"]
-    assert user1_from_response["phone_number"] == test_user1_update["phone_number"]
-
-    # Check user2
-    user2_id = test_user2_creation["id"]
-    user2_from_response = next(user for user in all_users if user["id"] == user2_id)
-    assert user2_from_response["email"] == test_user2_creation["email"]
-    assert user2_from_response["call_sign"] == test_user2_creation["call_sign"]
-    assert user2_from_response["first_name"] == test_user2_creation["first_name"]
-    assert user2_from_response["last_name"] == test_user2_creation["last_name"]
-    assert user2_from_response["phone_number"] == test_user2_creation["phone_number"]
-
-
-# Test deleting user1 (after test_get_users to ensure both users exist)
-def test_user1_deletion(client, test_user1_update, test_user2_creation, test_get_users):
-    user_id = test_user1_update["id"]
+    assert len(all_users) >= 2
+
+
+# Test deleting user1
+def test_user1_deletion(client, test_user1_creation, test_user2_creation):
+    user_id = test_user1_creation["id"]
     res = client.delete(f"/api/v1/aro/user/delete_user/{user_id}", headers={"Content-Type": "application/json"})
 
     assert res.status_code == 200