Skip to content
Closed
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
75 changes: 39 additions & 36 deletions gs/backend/api/v1/aro/endpoints/user.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from uuid import UUID

from fastapi import APIRouter, HTTPException
from fastapi import APIRouter

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.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

aro_user_router = APIRouter(tags=["ARO", "User Information"])

Expand All @@ -21,8 +20,9 @@ async def get_all_users() -> AllUsersResponse:

:return: all users
"""
users = get_all_db_users()
return AllUsersResponse(data=users)
# users = get_all_db_users()
# return AllUsersResponse(data=users)
return None


@aro_user_router.post("/create_user", response_model=UserResponse)
Expand All @@ -33,15 +33,16 @@ 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 = 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,
# )

return UserResponse(data=user)
# return UserResponse(data=user)
return None


@aro_user_router.put("/update_user/{userid}", response_model=UserResponse)
Expand All @@ -52,18 +53,19 @@ def update_user(userid: str, payload: UserRequest) -> UserResponse:
: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
# 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
return None


@aro_user_router.delete("/delete_user/{userid}", response_model=AllUsersResponse)
Expand All @@ -73,8 +75,9 @@ def delete_user(userid: str) -> AllUsersResponse:
:param userid: The unique identifier of the user to be deleted
:return: returns the user deleted
"""
try:
users = delete_user_by_id(UUID(userid))
return AllUsersResponse(data=users)
except ValueError as e:
raise HTTPException(status_code=404, detail=str(e)) from e
# try:
# users = delete_user_by_id(UUID(userid))
# return AllUsersResponse(data=users)
# except ValueError as e:
# raise HTTPException(status_code=404, detail=str(e)) from e
return None
25 changes: 10 additions & 15 deletions gs/backend/api/v1/aro/models/responses.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
from pydantic import BaseModel
# class AllUsersResponse(BaseModel):
# """
# The users response model.
# """

from gs.backend.data.tables.aro_user_tables import AROUsers
# data: list[AROUsers]


class AllUsersResponse(BaseModel):
"""
The users response model.
"""
# class UserResponse(BaseModel):
# """
# Single user response model.
# """

data: list[AROUsers]


class UserResponse(BaseModel):
"""
Single user response model.
"""

data: AROUsers
# data: AROUsers
4 changes: 2 additions & 2 deletions gs/backend/api/v1/mcc/endpoints/main_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from fastapi_cache.decorator import cache

from gs.backend.api.v1.mcc.models.responses import MainCommandsResponse
from gs.backend.data.data_wrappers.mcc_wrappers.main_command_wrapper import get_all_main_commands
from gs.backend.data.data_wrappers.wrappers import MainCommandWrapper

main_commands_router = APIRouter(tags=["MCC", "Main Commands"])

Expand All @@ -15,5 +15,5 @@ async def get_main_commands() -> MainCommandsResponse:

:return: list of all commands
"""
items = get_all_main_commands()
items = MainCommandWrapper().get_all()
return MainCommandsResponse(data=items)
73 changes: 0 additions & 73 deletions gs/backend/data/data_wrappers/aro_wrapper/aro_request_wrapper.py

This file was deleted.

This file was deleted.

97 changes: 0 additions & 97 deletions gs/backend/data/data_wrappers/aro_wrapper/aro_user_data_wrapper.py

This file was deleted.

Loading
Loading