Skip to content

corrected the get database graph data #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhodinemma merged 1 commit into from
Jan 27, 2025
Merged

corrected the get database graph data #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 66 additions & 62 deletions app/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,69 +181,7 @@ def create_database(database: DatabaseFlavor, access_token: str = Depends(securi
return SimpleNamespace(status_code=201, data={"database": database})


@router.get("/databases/{database_id}")
def single_database(database_id: str, access_token: str = Depends(security), db: Session = Depends(get_db)):
current_user = get_current_user(access_token.credentials)
check_authentication(current_user)

user_database = db.query(Database).filter(
Database.id == database_id).first()
if not user_database:
raise HTTPException(status_code=404, detail="Database not found")

flavour_name = user_database.database_flavour_name
if not flavour_name:
flavour_name = "mysql"

db_flavour = get_db_flavour(flavour_name)

if not db_flavour:
return dict(
status_code=404,
message=f"""Database flavour with name
{user_database.database_flavour_name} is not mysql or postgres."""
)

database_service = db_flavour['class']

# Get db status
try:
database_connection = database_service.create_db_connection(
user=user_database.user, password=user_database.password, db_name=user_database.name)
if not database_connection:
db_status = False
else:
db_status = True
except:
db_status = False
finally:
if database_connection:
if database_service == MysqlDbService():
if database_connection.is_connected():
database_connection.close()
else:
database_connection.close()

database_dict = {
**user_database.__dict__,
"db_status": db_status,
"default_storage_kb": database_service.get_database_size(
user=user_database.user, password=user_database.password, db_name=user_database.name)
}

return SimpleNamespace(status_code=200, data={"database": database_dict})


@router.get("/databases/{database_id}/password")
def get_database_password(database_id: str, access_token: str = Depends(security), db: Session = Depends(get_db)):
current_user = get_current_user(access_token.credentials)
check_authentication(current_user)

db_exists = db.query(Database).filter(Database.id == database_id).first()
if not db_exists:
raise HTTPException(
status_code=404, detail=f"Database with ID {database_id} not found")
return SimpleNamespace(status_code=200, data={"database": {"password": db_exists.password}})


@router.post("/databases/{database_id}/enable")
Expand Down Expand Up @@ -683,6 +621,72 @@ def database_graph_data(start: Optional[str] = Query(description="Start date for
return {"status_code": 200, 'data': {'metadata': metadata, 'graph_data': db_info}}



@router.get("/databases/{database_id}")
def single_database(database_id: str, access_token: str = Depends(security), db: Session = Depends(get_db)):
current_user = get_current_user(access_token.credentials)
check_authentication(current_user)

user_database = db.query(Database).filter(
Database.id == database_id).first()
if not user_database:
raise HTTPException(status_code=404, detail="Database not found")

flavour_name = user_database.database_flavour_name
if not flavour_name:
flavour_name = "mysql"

db_flavour = get_db_flavour(flavour_name)

if not db_flavour:
return dict(
status_code=404,
message=f"""Database flavour with name
{user_database.database_flavour_name} is not mysql or postgres."""
)

database_service = db_flavour['class']

# Get db status
try:
database_connection = database_service.create_db_connection(
user=user_database.user, password=user_database.password, db_name=user_database.name)
if not database_connection:
db_status = False
else:
db_status = True
except:
db_status = False
finally:
if database_connection:
if database_service == MysqlDbService():
if database_connection.is_connected():
database_connection.close()
else:
database_connection.close()

database_dict = {
**user_database.__dict__,
"db_status": db_status,
"default_storage_kb": database_service.get_database_size(
user=user_database.user, password=user_database.password, db_name=user_database.name)
}

return SimpleNamespace(status_code=200, data={"database": database_dict})


@router.get("/databases/{database_id}/password")
def get_database_password(database_id: str, access_token: str = Depends(security), db: Session = Depends(get_db)):
current_user = get_current_user(access_token.credentials)
check_authentication(current_user)

db_exists = db.query(Database).filter(Database.id == database_id).first()
if not db_exists:
raise HTTPException(
status_code=404, detail=f"Database with ID {database_id} not found")
return SimpleNamespace(status_code=200, data={"database": {"password": db_exists.password}})


@router.post("/databases/{database_id}/revoke_write_access")
def revoke_write_access(database_id: str, access_token: str = Depends(security), db: Session = Depends(get_db)):
current_user = get_current_user(access_token.credentials)
Expand Down