Fix search catalog for metadata lookup (#57)

* Fix mapped catalog for metadata lookup * Changelog updated
senaite · Apr 2, 2023 · d8b9cb3 · d8b9cb3
1 parent a352b3a
commit d8b9cb3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 2.5.0 (unreleased)
 ------------------
 
+- #57 Fix search catalog for metadata lookup
 - #56 Fix implicit imports for controlpanel mappings
 - #54 Lookup mapped catalogs for CatalogBrains
 

diff --git a/src/senaite/jsonapi/api.py b/src/senaite/jsonapi/api.py
@@ -660,12 +660,13 @@ def get_brain(brain_or_object):
 
     # fetch the brain by UID
     uid = get_uid(brain_or_object)
-    uc = get_tool("uid_catalog")
-    results = uc({"UID": uid}) or search(query={'UID': uid})
+    portal_type = api.get_portal_type(brain_or_object)
+    query = {"UID": uid, "portal_type": portal_type}
+    results = api.search(query)
     if len(results) == 0:
         return None
     if len(results) > 1:
-        fail(500, "More than one object with UID={} found in portal_catalog".format(uid))
+        fail(500, "More than one object with UID={}".format(uid))
     return results[0]