From 34926dab516449486fec093ed99b43681ce3e528 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Sun, 9 Mar 2025 16:50:20 +0100
Subject: [PATCH] Fix entries's video retrieval

---
 api/src/controllers/entries.ts | 10 ++++++++--
 api/src/models/video.ts        |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/api/src/controllers/entries.ts b/api/src/controllers/entries.ts
index 120cb8b2..e132b96e 100644
--- a/api/src/controllers/entries.ts
+++ b/api/src/controllers/entries.ts
@@ -41,6 +41,7 @@ import {
 	sortToSql,
 } from "~/models/utils";
 import { desc } from "~/models/utils/descriptions";
+import type { EmbeddedVideo } from "~/models/video";
 
 const entryFilters: FilterDef = {
 	kind: {
@@ -115,9 +116,14 @@ async function getEntries({
 	const videosQ = db
 		.select({
 			videos: coalesce(
-				jsonbAgg(jsonbBuildObject({ slug: entryVideoJoin.slug, ...videosCol })),
+				jsonbAgg(
+					jsonbBuildObject<EmbeddedVideo>({
+						slug: entryVideoJoin.slug,
+						...videosCol,
+					}),
+				),
 				sql`'[]'::jsonb`,
-			),
+			).as("videos"),
 		})
 		.from(entryVideoJoin)
 		.where(eq(entryVideoJoin.entryPk, entries.pk))
diff --git a/api/src/models/video.ts b/api/src/models/video.ts
index b01a11bd..a61644aa 100644
--- a/api/src/models/video.ts
+++ b/api/src/models/video.ts
@@ -73,7 +73,7 @@ export const Video = t.Intersect([Resource(), SeedVideo, DbMetadata]);
 export type Video = Prettify<typeof Video.static>;
 
 // type used in entry responses
-export const EmbeddedVideo = t.Omit(Video, ["createdAt", "updatedAt"]);
+export const EmbeddedVideo = t.Omit(Video, ["guess", "createdAt", "updatedAt"]);
 export type EmbeddedVideo = Prettify<typeof EmbeddedVideo.static>;
 
 registerExamples(Video, bubbleVideo);