Spaces:
Runtime error
Runtime error
Commit
·
d25fc26
1
Parent(s):
015e632
fix: improve base query (deletion)
Browse files- db/fetching.py +1 -1
- db/query/base_query.py +5 -3
db/fetching.py
CHANGED
|
@@ -12,7 +12,7 @@ class DataFetching:
|
|
| 12 |
user_meta_query = UserMetaQuery(self.user)
|
| 13 |
user_meta_entries = user_meta_query.get_user_meta_entries(self.db)
|
| 14 |
|
| 15 |
-
if not user_meta_entries:
|
| 16 |
return {"info": "No book collection found"}
|
| 17 |
|
| 18 |
# Extract relevant data from the user_meta_entries
|
|
|
|
| 12 |
user_meta_query = UserMetaQuery(self.user)
|
| 13 |
user_meta_entries = user_meta_query.get_user_meta_entries(self.db)
|
| 14 |
|
| 15 |
+
if not user_meta_entries or user_meta_entries==[]:
|
| 16 |
return {"info": "No book collection found"}
|
| 17 |
|
| 18 |
# Extract relevant data from the user_meta_entries
|
db/query/base_query.py
CHANGED
|
@@ -16,12 +16,12 @@ class BaseQuery:
|
|
| 16 |
if multiple:
|
| 17 |
results = db.execute(query).all()
|
| 18 |
if not results:
|
| 19 |
-
return
|
| 20 |
return results
|
| 21 |
else:
|
| 22 |
result = db.execute(query).scalar_one_or_none()
|
| 23 |
if not result:
|
| 24 |
-
return
|
| 25 |
return result
|
| 26 |
except Exception as e:
|
| 27 |
return handle_error(
|
|
@@ -65,7 +65,9 @@ class BaseQuery:
|
|
| 65 |
return entry
|
| 66 |
|
| 67 |
# Build the delete query
|
| 68 |
-
delete_query = delete(model)
|
|
|
|
|
|
|
| 69 |
if filter_conditions:
|
| 70 |
delete_query = delete_query.where(*filter_conditions)
|
| 71 |
|
|
|
|
| 16 |
if multiple:
|
| 17 |
results = db.execute(query).all()
|
| 18 |
if not results:
|
| 19 |
+
return []
|
| 20 |
return results
|
| 21 |
else:
|
| 22 |
result = db.execute(query).scalar_one_or_none()
|
| 23 |
if not result:
|
| 24 |
+
return []
|
| 25 |
return result
|
| 26 |
except Exception as e:
|
| 27 |
return handle_error(
|
|
|
|
| 65 |
return entry
|
| 66 |
|
| 67 |
# Build the delete query
|
| 68 |
+
delete_query = delete(model)
|
| 69 |
+
if id :
|
| 70 |
+
delete_query = delete_query.where(model.id == id)
|
| 71 |
if filter_conditions:
|
| 72 |
delete_query = delete_query.where(*filter_conditions)
|
| 73 |
|