Skip to content

chore: ensure exclusion of deleted database records from listings #34

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
Mar 5, 2025
Merged

chore: ensure exclusion of deleted database records from listings #34

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
13 changes: 7 additions & 6 deletions app/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ def fetch_database_stats(access_token: str = Depends(security), db: Session = De
total = 0

for flavour in database_flavours:
databases = db.query(Database).filter_by(
database_flavour_name=flavour['name']).all()
databases = db.query(Database).filter(
Database.database_flavour_name == flavour['name'],
Database.deleted == False
).all()

database_count = len(databases)
dbs_per_flavour[f"{flavour['name']}_db_count"] = database_count
Expand Down Expand Up @@ -71,6 +73,9 @@ def get_all_databases(
query = query.filter(
Database.database_flavour_name == database_flavour_name)

# ensure at this point that deleted databases are not part of the query for the above filters
query = query.filter(Database.deleted == False)

total_count = query.count()
total_pages = (total_count + per_page - 1) // per_page

Expand Down Expand Up @@ -181,9 +186,6 @@ def create_database(database: DatabaseFlavor, access_token: str = Depends(securi
return SimpleNamespace(status_code=201, data={"database": database})





@router.post("/databases/{database_id}/enable")
def enable_database(database_id: str, access_token: str = Depends(security), db: Session = Depends(get_db)):
current_user = get_current_user(access_token.credentials)
Expand Down Expand Up @@ -621,7 +623,6 @@ 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)
Expand Down