Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(backend): builder search history updates only the caller's own entry (#15698)

Reinier van der Leer801900cd11c7
diff --git a/autogpt_platform/backend/backend/api/features/builder/db.py b/autogpt_platform/backend/backend/api/features/builder/db.py
index 921007bf11..9aa6deacc0 100644
--- a/autogpt_platform/backend/backend/api/features/builder/db.py
+++ b/autogpt_platform/backend/backend/api/features/builder/db.py
@@ -208,33 +208,30 @@ async def update_search(
user_id: str, search: SearchEntry, organization_id: str | None = None
) -> str:
"""
- Upsert a search request for the user and return the search ID.
+ Update the user's search entry with ``search.search_id``, or create one when
+ that id is missing or not the user's, and return the entry's ID.
"""
if search.search_id:
- # Update existing search
- await prisma.models.BuilderSearchHistory.prisma().update(
- where={
- "id": search.search_id,
- },
+ updated = await prisma.models.BuilderSearchHistory.prisma().update_many(
+ where={"id": search.search_id, "userId": user_id},
data={
"searchQuery": search.search_query or "",
"filter": search.filter or [], # type: ignore
"byCreator": search.by_creator or [],
},
)
- return search.search_id
- else:
- # Create new search
- new_search = await prisma.models.BuilderSearchHistory.prisma().create(
- data={
- "userId": user_id,
- "searchQuery": search.search_query or "",
- "filter": search.filter or [], # type: ignore
- "byCreator": search.by_creator or [],
- **({"organizationId": organization_id} if organization_id else {}),
- }
- )
- return new_search.id
+ if updated:
+ return search.search_id
+ new_search = await prisma.models.BuilderSearchHistory.prisma().create(
+ data={
+ "userId": user_id,
+ "searchQuery": search.search_query or "",
+ "filter": search.filter or [], # type: ignore
+ "byCreator": search.by_creator or [],
+ **({"organizationId": organization_id} if organization_id else {}),
+ }
+ )
+ return new_search.id
async def get_recent_searches(user_id: str, limit: int = 5) -> list[SearchEntry]:
diff --git a/autogpt_platform/backend/backend/api/features/builder/search_history_db_test.py b/autogpt_platform/backend/backend/api/features/builder/search_history_db_test.py
new file mode 100644
index 0000000000..4c55a5c3d3
--- /dev/null
+++ b/autogpt_platform/backend/backend/api/features/builder/search_history_db_test.py
@@ -0,0 +1,70 @@
+"""Builder search history against a real Postgres (``server`` starts the stack)."""
+
+import uuid
+
+import prisma.models
+import pytest
+
+from backend.api.features.builder import db
+from backend.api.features.builder.model import SearchEntry
+from backend.util.test import SpinTestServer
+
+
[email protected](loop_scope="session")
+async def test_a_user_updates_their_own_entry_in_place(server: SpinTestServer):
+ [owner] = await _make_users(1)
+ try:
+ search_id = await db.update_search(owner, SearchEntry(search_query="alpha"))
+
+ returned = await db.update_search(
+ owner, SearchEntry(search_query="beta", search_id=search_id)
+ )
+
+ assert returned == search_id
+ rows = await prisma.models.BuilderSearchHistory.prisma().find_many(
+ where={"userId": owner}
+ )
+ assert [(r.id, r.searchQuery) for r in rows] == [(search_id, "beta")]
+ finally:
+ await _drop_users([owner])
+
+
[email protected](loop_scope="session")
[email protected]("target", ["another user's entry", "an unknown id"])
+async def test_an_id_that_is_not_the_users_creates_their_own_entry(
+ server: SpinTestServer, target: str
+):
+ owner, caller = await _make_users(2)
+ try:
+ owners_id = await db.update_search(owner, SearchEntry(search_query="alpha"))
+ search_id = owners_id if target == "another user's entry" else str(uuid.uuid4())
+
+ returned = await db.update_search(
+ caller, SearchEntry(search_query="beta", search_id=search_id)
+ )
+
+ assert returned not in (owners_id, search_id)
+ owners_row = await prisma.models.BuilderSearchHistory.prisma().find_unique(
+ where={"id": owners_id}
+ )
+ assert owners_row is not None
+ assert (owners_row.userId, owners_row.searchQuery) == (owner, "alpha")
+ callers_row = await prisma.models.BuilderSearchHistory.prisma().find_unique(
+ where={"id": returned}
+ )
+ assert callers_row is not None
+ assert (callers_row.userId, callers_row.searchQuery) == (caller, "beta")
+ finally:
+ await _drop_users([owner, caller])
+
+
+async def _make_users(count: int) -> list[str]:
+ user_ids = [f"search-history-{uuid.uuid4().hex[:16]}" for _ in range(count)]
+ await prisma.models.User.prisma().create_many(
+ data=[{"id": uid, "email": f"{uid}@example.invalid"} for uid in user_ids]
+ )
+ return user_ids
+
+
+async def _drop_users(user_ids: list[str]) -> None:
+ await prisma.models.User.prisma().delete_many(where={"id": {"in": user_ids}})