From bdcf7c345fa00f41d4410c8e75550d8745d8148a Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Mon, 29 Jan 2024 19:55:00 +0000
Subject: [PATCH] Relations added

---
 .vscode/settings.json            |  14 +++++++++++++-
 bun.lockb                        | Bin 271752 -> 271752 bytes
 scripts/queries.sql              |   1 +
 src/components/maps/main-map.tsx |   1 +
 src/server/db/index.ts           |   8 +++++---
 src/server/db/schema/devices.ts  |   2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 scripts/queries.sql

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 316fb18..4001a19 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,5 +10,17 @@
     ".next": true,
     "node_modules": true
   },
-  "workbench.colorTheme": "poimandres-noitalics"
+  "workbench.colorTheme": "poimandres-noitalics",
+  "sqltools.connections": [
+    {
+      "previewLimit": 50,
+      "server": "localhost",
+      "port": 5432,
+      "driver": "PostgreSQL",
+      "name": "kidarr (local)",
+      "database": "kidarr",
+      "username": "postgres",
+      "password": "hackme"
+    }
+  ]
 }
diff --git a/bun.lockb b/bun.lockb
index a5fd113c22aa75ccce95b323e63a99c98f5fbc38..ca4ce00e7bcebf9579feeb075cb3cbeabc94d629 100755
GIT binary patch
delta 1339
zcmeA;EzogVV1k~49kc171{c3=XH@Je4n4I9S#Q>Q$-%Ez<l?R$E({;4@;3Ul`Artl
zGTF@G&y&I^GWno}_T+|>oRd8_b3=HOG&v@BZ0135P9SkMb8I=o2$$N-vF(B&QzsM9
z5Vgq;GdU-7o<K6h;{=i+9VdDa+B{D3#yZUVDZHV(Z<c=C)104*|5Zy@bM{USt>>7Y
zq;ar2J-W;KvQvrXvd=QHhQ3GkpA86Is+`k#W$JHVLFP^T3zG7~PHdm5#yF$XA-8?C
zjbXj~>|f#gdP<Hd_H%A%IAGToe07yc^XhcL6({!O{L67Kt8>}B$l}=Cd)4YQOw;CP
zFo@{%Hp$;r+J653^xO@M67|9dR(?MzSlz)TXXO0gqG8OM|7RYRGG`>Fp6@UW_|?6~
z;*^no`_iJFLMDyUg-l1^F3|nCBU#G%)??+IlbHoam>C!t7#aTY|6^oe&}IU1pn%2T
zd|K^fhBoDjf`>8z4-J1iKHIr;dxZGA31a@7e}q;<UO4Tc9owBQ*|1>MQs(meSHHXM
z(LHx6Ol?>6x>sI_E{(C%Wj8WPIJlJ*W#8I4dzpmS1m8D3r*>aV(><muw3B(_dHa&p
zf3EZgbZmMXBKW%BzGeS+ZKf4Grn#+LrzFKY%p84|8Wk1)+FrVmv4P29dDnYc7H6N{
zT#006QO<o*cl@tT{KO=;BZ4_}v7(I0sVJYw?~CQXbDq#u3gn(Ee(J2YJwKZ&?{Q9{
zTi>l$HSXDNx`nYpqP}eXivw*9`eJS?Gk3aHc{#V;ieJ{u9UpgdZdLJ-=?V8c-UojY
zSaCaSiAYo4lcJY4oKj1Bji%>yW?U>i+%Ng?HZX8tfmMqfShY56j-HR(+Sn@<t7gv%
zGxK@IW1geobYsnf!Zu^=g`Zz>c`@DcJt%pb`<P5j)D@Kzs~puopL`k}c-7cCd2!Mn
zx#_-Vfr0hMY2D$Mg1fU1tk7aUV9>b5B;<w4sa($u2l_6_Z;;v~Ru}#5#m5($PA@Gh
zyu8Z1-)o~egJ(9=Q}zX|-4l6j`mCleJ<E8)VO7bBJf(pAz)Cgak^~cfx!n`|w*FSo
zR-1P9;l#M|S6LOE7aNi`8LjX8EdD8N!fclU)^ue%g}|ojhG$VPHG3azUwe-6%`JAu
zI14=!J%jBFRx*jrVKFk$GniiB#w-S5353E}?_8P1n2ZdjJDgz>o4!DjnRU9N8?zy!
z(e&R+%u>^H-IygIIxy62-|NQQ%!rVLuolQMi)=6QVE)Ag;THrmi^+j3XJFWInt?%r
zfuVujue!WI^PLkDqnRGqS(rv&4`!Bz8ja1(8$6k1rn`kQ>&f6V8R4bvt3#PJOs6Z{
zU{;#W-N($e{eKs;asvlQvtCJh)%1zs%)--cxmk_?y&c#ORCIxxMR>Y74~qbbKrIi8
z2H02ISMsp@WrWIYKgq{(T$s^v`a~s`AT%@oDY2A6!l6Q$<qh006&B9v6I57!001_r
B|78FG

delta 1332
zcmeA;EzogVV1k~4^TM7+qqi4&&M<$CDE#o~>p8n6r8joGd~y93>(LdZ)1){0wfRjB
z(KXr3;m?!8C_GtES9@~9NzTcho4FypNtzs!J2vwmI46)en>n_eVT4O<=Gb;Ykg0=d
z@<9!?$qq9)Cv%=aGQ{Hqk|7-@dJx(?PV&Y&{My`LJ#Y5SN9L<1<Tgbdan<~`D<$Q1
zQLEAq>02Gq=~Mp+?#uhR{`Y^kgw1SP4Z;c^?<{>+*B5)=E9-!bLwxXp?NiklXLLG5
zxL?1W^N2}qrHg;^+?^^qS@jPkf|q`OeRI;zoVhi|Cp&8R8GiX!2VX17END@cOf#sc
zcE8M-n)>qJzVG}-yrI)`H!w=nH@W93yx-{Y{?d$IvDXI<Hg|8;@Jv(mGT&SCKwhzb
z^K!!mS)J^Xr^~K5F!(A4_9hxHjNw_R|8|i<r{S{q%f)LM7#J8C{_+1~WMI%{0&<{$
z<@K{CF9LPhr0*yFa^GOVpkKY>f%yBmmM<FLd9T~B_~s+uPrN5oFI|@8Z>aBCd*RhD
z3#a(wi?nK$k2SvhSoc!=@T%#u8yO`WGQu5>y(nf032WDHzwLQrcYK{z{sPfIyw)v8
zR%;tiIIh5ACeW9B@^$!XdFjbFTsq?<6W6>u@x;+%>ikub@){xAOE)q$FgZL>4^J|h
z|N7r7jmtvQ^$*&2G<m$rH_BSeZ<4zrW)tJ`?dNBztnfHB_e$j+!_%L(tTSj5vp>DV
zm{0V`o{gz_&Cj=+ZeeVYs257~$=Z5v#jM&wr*(fBWjY)*=ez7bDz2HD-7vd$%9|S+
zDH_ZAPAt_dyl8z}s={^W(}y>+n3$WFUJiKu{WgDQA24uWfmMqfSnFDZ3LRV5JzY_L
zq2*L-rB=X<b<Ym{{eA57-{QC@Un0#7<If$Nb68Dso;S}y4cl)~rpJ_4v)h<;p60YU
zU~uKN*RkooXMusG_T#?b?Ea@&JgYfsJwEXBDqd>7=qOXTu;=#zPno=D#`1k1GFQ)k
zBWdvO%lRnh*@~}}Y8d-ZP5vd47|6r$N9q0arDqvWI9&Q(H1+Pi!atrnuRHfJOxYJ8
zmvHO2{V(TAPP3&6fj3;{37aT3&utc;dmyJjfJ0J3IQMCjhd1Zs6uH`kf~7Z<wy!<M
z_~sTn)PLI-tYi|K!(?bVJ<p9<g2m8M&v3dxD6<%Z_0E-93?$d!!Ynsk#f@1HBK%K@
zS$uk~8?z*)s_h5dm>U=o;t<vXIcAaVMIOw*xFGz3U}iBnkX;N6J5Dn&NH8!ou=`b)
z7ihk7Vq!GY1G@s*?(MgNnI#x;xpIRiv&?k2P-Z<Dd`5yjv3*@Av#Keh@$`*bnH8sV
z_c3#A|KG)|+`s|SsaKL-HGN_@v+#6VZk8h;+kmQ+rY9sYvraGIVG){c!^6UjA#4iv
z()N`+EPuf+1nN=VewvTvsPJ?{Ru+Zn8<bd#(TxA6#8L(chzezvH^?TkP481-`2_%x
C_X)ND

diff --git a/scripts/queries.sql b/scripts/queries.sql
new file mode 100644
index 0000000..78422f2
--- /dev/null
+++ b/scripts/queries.sql
@@ -0,0 +1 @@
+select * From pings
\ No newline at end of file
diff --git a/src/components/maps/main-map.tsx b/src/components/maps/main-map.tsx
index 32837f7..06227ee 100644
--- a/src/components/maps/main-map.tsx
+++ b/src/components/maps/main-map.tsx
@@ -34,6 +34,7 @@ const MainMap: React.FC<MainMapProps> = ({ kids }) => {
                 device.pings.map((ping) => (
                   <MapMarker
                     key={ping.id}
+                    deviceId={device.id}
                     childName={kid.name}
                     avatar={kid.avatar}
                     deviceName={device.name}
diff --git a/src/server/db/index.ts b/src/server/db/index.ts
index d59843d..5e0e35a 100644
--- a/src/server/db/index.ts
+++ b/src/server/db/index.ts
@@ -8,6 +8,7 @@ import {
   verificationTokens,
   children,
   devices,
+  pings,
   childrenRelations,
   deviceRelations,
   pingRelations,
@@ -16,11 +17,12 @@ import {
 export const client = postgres(env.DATABASE_URL);
 export const db = drizzle(client, {
   schema: {
-    devices,
-    children,
-    users,
     accounts,
     sessions,
+    users,
+    children,
+    devices,
+    pings,
     verificationTokens,
     childrenRelations,
     deviceRelations,
diff --git a/src/server/db/schema/devices.ts b/src/server/db/schema/devices.ts
index 3b07d6f..6dbd62e 100644
--- a/src/server/db/schema/devices.ts
+++ b/src/server/db/schema/devices.ts
@@ -28,11 +28,11 @@ export const devices = pgTable("devices", {
     .notNull(),
 });
 export const deviceRelations = relations(devices, ({ one, many }) => ({
+  pings: many(pings),
   child: one(children, {
     fields: [devices.childId],
     references: [children.id],
   }),
-  pings: many(pings),
 }));
 
 // Schema for devices - used to validate API requests