Fix loader not returning data correctly

backend/cmd/api/loaders.go

@@ -279,7 +279,7 @@ func initBatchLoaders(queries *sqlc.Queries, membersClient *members.Client) *com
 			return i.ID
 		})),
 		ChaptersLoader: loaders.NewListLoader(ctx, queries.GetChaptersForEpisodeID, func(i common.TimedMetadata) int {
-			return int(i.ParentEpisodeID.Int64)
+			return i.ParentEpisodeID
 		}),
 		PhraseLoader: loaders.New(ctx, queries.GetPhrases, loaders.WithName("phrases-loader"), loaders.WithKeyFunc(func(i common.Phrase) string {
 			return i.Key

backend/common/items.go

@@ -239,7 +239,7 @@ type TimedMetadata struct {
 	SongID          uuid.NullUUID
 	MediaItemID     uuid.NullUUID
 	Images          Images
-	ParentEpisodeID null.Int
+	ParentEpisodeID int
 }
 
 // Short item type

backend/sqlc/timedmetadata-queries.go

@@ -66,7 +66,7 @@ func (q *Queries) GetChaptersForEpisodeID(ctx context.Context, ids []int) ([]com
 			Description:     description,
 			MediaItemID:     i.MediaitemID,
 			Images:          q.getImages(i.Images),
-			ParentEpisodeID: i.EpisodeID,
+			ParentEpisodeID: int(i.EpisodeID),
 		}
 	}), nil
 }

queries/timedmetadata.sql

@@ -117,9 +117,9 @@ DELETE FROM timedmetadata WHERE asset_id = @asset_id;
 
 -- name: getChaptesFromEpisode :many
 SELECT
+    e.id as episode_id,
     tm.id::uuid as id,
     tm.type::text as type,
-    tm.episode_id,
     tm.content_type,
     tm.song_id,
     (SELECT array_agg(c.person_id) FROM "contributions" c WHERE c.timedmetadata_id = tm.id)::uuid[] AS person_ids,
@@ -166,5 +166,5 @@ FROM episodes e
 ) images ON (images.timedmetadata_id = tm.id)
 WHERE e.id= ANY(@episode_ids::int[])
   AND tm.status = 'published'
-  AND tm.type = 'chapter';
-;
+  AND tm.type = 'chapter'
+ORDER BY tm.seconds ASC;