From 2203bfc34a7aaad0ffc48342025b48dc3fced145 Mon Sep 17 00:00:00 2001
From: jacob-a-brown <brown.jacob.alexander@gmail.com>
Date: Tue, 9 Dec 2025 16:48:41 -0700
Subject: [PATCH 1/2] feat: add id to asset search properties & update things

Add the id to the asset search properties and update the
things associated with assets to correspond with the things
associated with contacts
---
 .DS_Store                | Bin 0 -> 8196 bytes
 api/search.py            |  11 +++++++++--
 tests/.DS_Store          | Bin 0 -> 10244 bytes
 tests/features/.DS_Store | Bin 0 -> 8196 bytes
 tests/test_search.py     |  20 ++++++++++++++++++--
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 tests/.DS_Store
 create mode 100644 tests/features/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d5ef56cf852670816ca41e3deaef6c16927a0707
GIT binary patch
literal 8196
zcmeHMO>fgc5S>lZ#vv3%s7Mt8$r9I6+EgGAmyosx4oIj$Z~$cDIBnfJc8HyZsw&DI
z_zV06?)(q<FPz}bt{Zvn^okJOt#)T^zqcQ6#&*UfBGDdu8$>HaWTCQc)X~f-e4T5d
zl+rV|U<LR@J?f$!P@kLv+MF;77zK<1MggOMQQ%)t0Pk!r)&=i<b=9;+0i(dBRDhok
zHY(dzYNyJ|M+X|20>D;qS{C$?2S|>c+E!|(%1SE6RM~?_sUl4=greiR&2ZROYNyI7
zItfK5k<KjA3`NM<!LuctL`zxI8U>63MFlu_uOnM`Xh<ho{_Z>tqMjQ>E)aZEJwaXj
zEem=?Rh-$TUD}{E8jzPme=DH76yUqSfL!var=!K~9J-G02pKeH@F^re$NH3GmBAVo
zP``4htJr0P(PBz~57EXLAG_B_FYV`e70DY>KZpB~!<EP*SI3mMa+pP6B8+zgMMgSS
z>ijjM^Ytv2?#fjRu-*vk?qlUA&@{-6!RlwnSOSuFIs%%RtY!jkOb0qsdLqkQrhUv9
zBR+ay_puf=k}o~P${pe=^vsRJzR8YL#VWgU-Z@$e_E8pHljsnPeYwZ^-pMj7dXDw6
zrhAwLv7@i2#9qqcud&BbnRAFadQy)BM+G&d_p;m?qJBq4|1;Qm(T{sYT+8^dA+>u?
zW2}u;9Hc6;ehGb`L|-kze;WS^SY!Ci!QJEG?*h+h91DI?-{L%Q3yKJMNW)iWc=lAR
zuZTUQp?P$~E*)b>J@j&TzI!zM0`>_M+B_1Txd`b_;$iv(`tA+`KTg)ye~MDMvandS
zs#e{4+c}6Pour$L<92uSnvY&YQQ)5UyY5TBKXDq%TTz&F{jfih1mEie^5&HvdeNjE
zjYBV%+>W|n)vTJ+xOsZo+`PZOYBx6@o~_!a8yn5$s{P>6=Gj@zx^d^;<6Y+{7=+Ph
zL>7ujf0)pcI-a#((97)pxHAfaDCDOLGa6821ikrrv?mpHW=hTRGRLB(R;|F#>C4X(
z@i7yNRYb!vA}Ek|%aQJ98F^XsY#XNY-ziX5J6hrVe+Qw+))b?FQQ&eZAS&CP?Kbv&
z{tC-)pL1;+^&Kh~#!Z!#6f`m&hn49#?Cc+g=-YrYr<K~NvN(hC*FOZ{2ZMS4oA<vA
IzDwNv0e#{85&!@I

literal 0
HcmV?d00001

diff --git a/api/search.py b/api/search.py
index ab4c28c0f..9c587a016 100644
--- a/api/search.py
+++ b/api/search.py
@@ -164,7 +164,10 @@ def make_spring_response(thing: Thing) -> dict:
 def _get_asset_results(session: Session, q: str, limit: int) -> list[dict]:
     vector = Asset.search_vector
     query = search(
-        select(Asset).join(AssetThingAssociation).join(Thing),
+        select(Asset)
+        .join(AssetThingAssociation)
+        .join(Thing)
+        .options(selectinload(Asset.things)),
         q,
         vector=vector,
         limit=limit,
@@ -176,7 +179,11 @@ def _get_asset_results(session: Session, q: str, limit: int) -> list[dict]:
             "label": a.name,
             "group": "Assets",
             "properties": {
-                "things": [t.name for t in a.things],
+                "id": a.id,
+                "things": [
+                    {"label": t.name, "id": t.id, "thing_type": t.thing_type}
+                    for t in a.things
+                ],
                 "storage_service": a.storage_service,
                 "storage_path": a.storage_path,
                 "mime_type": a.mime_type,
diff --git a/tests/.DS_Store b/tests/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b290e14aa882d8d6507c67f6780529b19d3efc88
GIT binary patch
literal 10244
zcmeHMO>fgM7=GQAE!93Kuw9TQMdHF?8eJ<8h)e0lfh$FD094X8>mt&mB<;Fs8tNVR
z3;YG{{15mqoZxw#bU3Y3ZU_xKvfniE^V)vi$Byh0k!Xy%dqg%7S;%b5YbZ2{-*cWz
zh4hIHD}X2RXh<zwyEK@qZ5|i~3<HJ%!+>GHFz_!hfNwS@Yc;W^Gz=I93<DPo@cLjQ
zv#qCgl32NPppaVt*diXwgnR4*B*so{J++g>N+^6Ly9bd%MY_ch2^{Zjt`1vI?If`Y
zoJ0aAk+v+-9g2{x182+XB<hJZrD4D@FwcOEN2_wr?op80zn?zw!%o`|+o-{l>Jjqp
zPnmExMGfebI^-Z9k;{H&P+#Uy9SYIXAx;Whic#`e!Ax6Xdj?gcF4`E9ll3k>%+#~s
z*OfI#6tVxA`ak|uzdeoz>6pK^2fh~%E0yn}uvEOVykf0btJdr0Q8;c6o#7~MIMGY~
z^(+ki_VnIqKlj{mtGu}%21CaS+(-hvu8S(KUU)$_95=#I(2XUwnY^${R;g9Kd3IK<
z-L34{)!O~@9s6u=uUg%)?>(rUpO>tyTX!BlZN2sTLHH4)KoaRvNbAY(i}Dlh=9oBc
zMu8s&Jq98#Q=g8(yoUV(*HI(Aei5q{xQ%hS`nVOo%^<HS$V4H1XpEyCK{uMVm-ZKW
z2+7CgP#X%$>4VhiXGN!1Gksv~K}XQ5R(ZsFRncn-`Vh*Ez?-JuQn4y-Q^EDn*AR1q
zd5gfhht^s9IzOyv)z8+PALcQVbBNgpsi$XBu+~*i*XKONh(FIN52df`ja0&7A456s
znUy>rtO?bJs-~VC$w;q5sRb3OM$!j^Cz45ysD??_f!I)VP*%pzyz#2VW6#4w2^sti
z1s_6z(`YXA!n(+K*-*R;q%H>F-qnqOSGNpS?ZJRX=z}jASlk2XAmc^l{~f%rCbe^s
zqo0f9)s=O9qU$-Y0~w?`>KMHD5%HW+bJQ1Ld3BHE*CsFK@0FNm+jXIo81asDedd`j
z7GWcBoi}Sa$|_dnm}dxoTYI`zWsFtiwxSPSB^}vk{;EY-L71~1o^=qhR{BlM>l4Ra
z^<0AItiPGBql~wTz{EAlFkl!k3>XFs1BQW1#=ufC9-GhqALsx7f5}E|hGQ5o45$o<
z;z9GEfhW@gCG{oW^I5x%{05m5*PA3(LQu%#cvyKHj~{#-e;b+WR@idFeLc04#Nr9k
YU;i_}?Em=;u0>}5|NDIVKimKR0<LWIN&o-=

literal 0
HcmV?d00001

diff --git a/tests/features/.DS_Store b/tests/features/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..289567590c64e16d603eb02cf9d2077ea5047dd9
GIT binary patch
literal 8196
zcmeHM!A{#i5S<OFgjA_TsDg-!%4)B5r2c_{^uU=PXmCPs<vOnI1aUy}oqymL_?mu9
zPvy<*3T-we4MnPuIvaUsy*u+}_suBF1R^qrv(YD_9uaNgVY&4Z-ESJN^Rv`CZss+l
zfju4P)ATf-p5lFLNn0nB0cAiLPzIC%W#Bn5fIFMp<^%V>UDaM0PzL@>2Kf6S!oxCg
zvb9paI?zc80NKT~G>qj>f5?a@AQLBBD=~v+tSO{5HLk=ku5vKe9P5eGZ>_ZEWW+OY
zoM+=I6ypjH6Nx&R#7gaz0cBvB0j}M<G@>CjGz{wZ1FZFbNfX0YG^T>)lu<=fjK0Zx
zLwzdgGO)c3Y<o0;_LRO-Ew(W*#u%6KR%6_!GxWTV8Lutknf(B7hjLh^qMtd$0<sa*
z)mYa7)<@Yz4ci!J%COUF0XGNc1T!gJLc?)|5uczzpFz&Cp8w$tKLfwJI6t4b0`j@T
zTbq&2BtUy3Xoc`w0c}k-IzIxO7eHVZOR5)RuyGV<zJuO5PG5kXn7$)!W1NLKD&<r|
z$q>e>fVnaz#JP6k<=XoN>;|YMa4a%={Tm;glfI8gqBq3;YeaR1DDY0h2(KLx$x$Ew
z16=?y$0r6KBYZM=wAsqp5({@{$l3}_apv2#l}s7VUf;{U=Oq;^=82>7SY*ymA9>G1
zX1qC0Q(%|8UygDL-sY?0+PT6N{nm@?wuiZHhH|Fg?@RB0u%S&Ecsc_c7NW=X|L2E)
z|9`q8MNkHmfoIEr=?+c?huEIGTbDM<wRVK(3m$H)*IFqi=%gHnlyV&M{vU=IM^I&(
V#L3o5%%JHH0YZaz%D_Km;0}REHP-+D

literal 0
HcmV?d00001

diff --git a/tests/test_search.py b/tests/test_search.py
index 137f82263..42d473cae 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -39,14 +39,16 @@ def override_dependencies_fixture():
     app.dependency_overrides = {}
 
 
-def test_search_api(water_well_thing, spring_thing, contact):
+def test_search_api(
+    water_well_thing, spring_thing, contact, asset_with_associated_thing
+):
     response = client.get("/search", params={"q": "Test"})
     assert response.status_code == 200
     data = response.json()
     assert isinstance(data, dict)
     items = data.get("items")
     assert isinstance(items, list)
-    assert len(items) == 3
+    assert len(items) == 4
 
     # Check the contacts returned
     contact_items = [item for item in items if item["group"] == "Contacts"]
@@ -62,6 +64,20 @@ def test_search_api(water_well_thing, spring_thing, contact):
         },
     ]
 
+    # Check the assets returned
+    asset_items = [item for item in items if item["group"] == "Assets"]
+    assert len(asset_items) == 1
+    asset_item = asset_items[0]
+    assert asset_item["label"] == asset_with_associated_thing.name
+    assert asset_item["properties"]["id"] == asset_with_associated_thing.id
+    assert asset_item["properties"]["things"] == [
+        {
+            "label": water_well_thing.name,
+            "id": water_well_thing.id,
+            "thing_type": water_well_thing.thing_type,
+        },
+    ]
+
 
 @pytest.mark.skip(reason="This test is not working .")
 def test_search_api2():

From ab49e112b9417f22b9863e50bc745cb356773956 Mon Sep 17 00:00:00 2001
From: jacob-a-brown <brown.jacob.alexander@gmail.com>
Date: Tue, 9 Dec 2025 16:54:06 -0700
Subject: [PATCH 2/2] fix: remove .DS_Store

---
 .DS_Store                | Bin 8196 -> 0 bytes
 tests/.DS_Store          | Bin 10244 -> 0 bytes
 tests/features/.DS_Store | Bin 8196 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 tests/.DS_Store
 delete mode 100644 tests/features/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index d5ef56cf852670816ca41e3deaef6c16927a0707..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMO>fgc5S>lZ#vv3%s7Mt8$r9I6+EgGAmyosx4oIj$Z~$cDIBnfJc8HyZsw&DI
z_zV06?)(q<FPz}bt{Zvn^okJOt#)T^zqcQ6#&*UfBGDdu8$>HaWTCQc)X~f-e4T5d
zl+rV|U<LR@J?f$!P@kLv+MF;77zK<1MggOMQQ%)t0Pk!r)&=i<b=9;+0i(dBRDhok
zHY(dzYNyJ|M+X|20>D;qS{C$?2S|>c+E!|(%1SE6RM~?_sUl4=greiR&2ZROYNyI7
zItfK5k<KjA3`NM<!LuctL`zxI8U>63MFlu_uOnM`Xh<ho{_Z>tqMjQ>E)aZEJwaXj
zEem=?Rh-$TUD}{E8jzPme=DH76yUqSfL!var=!K~9J-G02pKeH@F^re$NH3GmBAVo
zP``4htJr0P(PBz~57EXLAG_B_FYV`e70DY>KZpB~!<EP*SI3mMa+pP6B8+zgMMgSS
z>ijjM^Ytv2?#fjRu-*vk?qlUA&@{-6!RlwnSOSuFIs%%RtY!jkOb0qsdLqkQrhUv9
zBR+ay_puf=k}o~P${pe=^vsRJzR8YL#VWgU-Z@$e_E8pHljsnPeYwZ^-pMj7dXDw6
zrhAwLv7@i2#9qqcud&BbnRAFadQy)BM+G&d_p;m?qJBq4|1;Qm(T{sYT+8^dA+>u?
zW2}u;9Hc6;ehGb`L|-kze;WS^SY!Ci!QJEG?*h+h91DI?-{L%Q3yKJMNW)iWc=lAR
zuZTUQp?P$~E*)b>J@j&TzI!zM0`>_M+B_1Txd`b_;$iv(`tA+`KTg)ye~MDMvandS
zs#e{4+c}6Pour$L<92uSnvY&YQQ)5UyY5TBKXDq%TTz&F{jfih1mEie^5&HvdeNjE
zjYBV%+>W|n)vTJ+xOsZo+`PZOYBx6@o~_!a8yn5$s{P>6=Gj@zx^d^;<6Y+{7=+Ph
zL>7ujf0)pcI-a#((97)pxHAfaDCDOLGa6821ikrrv?mpHW=hTRGRLB(R;|F#>C4X(
z@i7yNRYb!vA}Ek|%aQJ98F^XsY#XNY-ziX5J6hrVe+Qw+))b?FQQ&eZAS&CP?Kbv&
z{tC-)pL1;+^&Kh~#!Z!#6f`m&hn49#?Cc+g=-YrYr<K~NvN(hC*FOZ{2ZMS4oA<vA
IzDwNv0e#{85&!@I

diff --git a/tests/.DS_Store b/tests/.DS_Store
deleted file mode 100644
index b290e14aa882d8d6507c67f6780529b19d3efc88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHMO>fgM7=GQAE!93Kuw9TQMdHF?8eJ<8h)e0lfh$FD094X8>mt&mB<;Fs8tNVR
z3;YG{{15mqoZxw#bU3Y3ZU_xKvfniE^V)vi$Byh0k!Xy%dqg%7S;%b5YbZ2{-*cWz
zh4hIHD}X2RXh<zwyEK@qZ5|i~3<HJ%!+>GHFz_!hfNwS@Yc;W^Gz=I93<DPo@cLjQ
zv#qCgl32NPppaVt*diXwgnR4*B*so{J++g>N+^6Ly9bd%MY_ch2^{Zjt`1vI?If`Y
zoJ0aAk+v+-9g2{x182+XB<hJZrD4D@FwcOEN2_wr?op80zn?zw!%o`|+o-{l>Jjqp
zPnmExMGfebI^-Z9k;{H&P+#Uy9SYIXAx;Whic#`e!Ax6Xdj?gcF4`E9ll3k>%+#~s
z*OfI#6tVxA`ak|uzdeoz>6pK^2fh~%E0yn}uvEOVykf0btJdr0Q8;c6o#7~MIMGY~
z^(+ki_VnIqKlj{mtGu}%21CaS+(-hvu8S(KUU)$_95=#I(2XUwnY^${R;g9Kd3IK<
z-L34{)!O~@9s6u=uUg%)?>(rUpO>tyTX!BlZN2sTLHH4)KoaRvNbAY(i}Dlh=9oBc
zMu8s&Jq98#Q=g8(yoUV(*HI(Aei5q{xQ%hS`nVOo%^<HS$V4H1XpEyCK{uMVm-ZKW
z2+7CgP#X%$>4VhiXGN!1Gksv~K}XQ5R(ZsFRncn-`Vh*Ez?-JuQn4y-Q^EDn*AR1q
zd5gfhht^s9IzOyv)z8+PALcQVbBNgpsi$XBu+~*i*XKONh(FIN52df`ja0&7A456s
znUy>rtO?bJs-~VC$w;q5sRb3OM$!j^Cz45ysD??_f!I)VP*%pzyz#2VW6#4w2^sti
z1s_6z(`YXA!n(+K*-*R;q%H>F-qnqOSGNpS?ZJRX=z}jASlk2XAmc^l{~f%rCbe^s
zqo0f9)s=O9qU$-Y0~w?`>KMHD5%HW+bJQ1Ld3BHE*CsFK@0FNm+jXIo81asDedd`j
z7GWcBoi}Sa$|_dnm}dxoTYI`zWsFtiwxSPSB^}vk{;EY-L71~1o^=qhR{BlM>l4Ra
z^<0AItiPGBql~wTz{EAlFkl!k3>XFs1BQW1#=ufC9-GhqALsx7f5}E|hGQ5o45$o<
z;z9GEfhW@gCG{oW^I5x%{05m5*PA3(LQu%#cvyKHj~{#-e;b+WR@idFeLc04#Nr9k
YU;i_}?Em=;u0>}5|NDIVKimKR0<LWIN&o-=

diff --git a/tests/features/.DS_Store b/tests/features/.DS_Store
deleted file mode 100644
index 289567590c64e16d603eb02cf9d2077ea5047dd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM!A{#i5S<OFgjA_TsDg-!%4)B5r2c_{^uU=PXmCPs<vOnI1aUy}oqymL_?mu9
zPvy<*3T-we4MnPuIvaUsy*u+}_suBF1R^qrv(YD_9uaNgVY&4Z-ESJN^Rv`CZss+l
zfju4P)ATf-p5lFLNn0nB0cAiLPzIC%W#Bn5fIFMp<^%V>UDaM0PzL@>2Kf6S!oxCg
zvb9paI?zc80NKT~G>qj>f5?a@AQLBBD=~v+tSO{5HLk=ku5vKe9P5eGZ>_ZEWW+OY
zoM+=I6ypjH6Nx&R#7gaz0cBvB0j}M<G@>CjGz{wZ1FZFbNfX0YG^T>)lu<=fjK0Zx
zLwzdgGO)c3Y<o0;_LRO-Ew(W*#u%6KR%6_!GxWTV8Lutknf(B7hjLh^qMtd$0<sa*
z)mYa7)<@Yz4ci!J%COUF0XGNc1T!gJLc?)|5uczzpFz&Cp8w$tKLfwJI6t4b0`j@T
zTbq&2BtUy3Xoc`w0c}k-IzIxO7eHVZOR5)RuyGV<zJuO5PG5kXn7$)!W1NLKD&<r|
z$q>e>fVnaz#JP6k<=XoN>;|YMa4a%={Tm;glfI8gqBq3;YeaR1DDY0h2(KLx$x$Ew
z16=?y$0r6KBYZM=wAsqp5({@{$l3}_apv2#l}s7VUf;{U=Oq;^=82>7SY*ymA9>G1
zX1qC0Q(%|8UygDL-sY?0+PT6N{nm@?wuiZHhH|Fg?@RB0u%S&Ecsc_c7NW=X|L2E)
z|9`q8MNkHmfoIEr=?+c?huEIGTbDM<wRVK(3m$H)*IFqi=%gHnlyV&M{vU=IM^I&(
V#L3o5%%JHH0YZaz%D_Km;0}REHP-+D