Merge pull request #1295 from bcc-code/feat/playlist-section-context

Feat/playlist section context

Author: KillerX

backend/common/items.go

@@ -308,6 +308,7 @@ type Section struct {
 	Style               string         `json:"style"`
 	Size                string         `json:"size"`
 	CollectionID        null.Int       `json:"collectionId"`
+	PlaylistID          uuid.NullUUID  `json:"playlistId"`
 	MessageID           null.Int       `json:"messageId"`
 	EmbedUrl            null.String    `json:"embedUrl"`
 	EmbedAspectRatio    null.Float     `json:"embedAspectRatio"`

backend/common/models.go

@@ -129,6 +129,7 @@ type Progress struct {
 // EpisodeContext contains context for episode
 type EpisodeContext struct {
 	CollectionID null.Int
+	PlaylistID   uuid.NullUUID
 	Cursor       null.String
 	Shuffle      null.Bool
 }

backend/graph/api/episodes.resolvers.go

@@ -282,27 +282,31 @@ func (r *episodeResolver) Watched(ctx context.Context, obj *model.Episode) (bool
 
 // Context is the resolver for the context field.
 func (r *episodeResolver) Context(ctx context.Context, obj *model.Episode) (model.EpisodeContextUnion, error) {
-	var collectionId *int
-
 	episodeContext, err := r.getEpisodeContext(ctx, obj.ID)
 	if err != nil {
 		return nil, err
 	}
 
-	if episodeContext.CollectionID.Valid {
-		intId := int(episodeContext.CollectionID.Int64)
-		collectionId = &intId
+	if episodeContext.PlaylistID.Valid {
+		playlist, err := r.Loaders.PlaylistLoader.Get(ctx, episodeContext.PlaylistID.UUID)
+		if err != nil {
+			return nil, err
+		}
+		if playlist != nil {
+			return model.PlaylistFrom(ctx, playlist), nil
+		}
 	}
 
-	if collectionId != nil {
-		col, err := r.Loaders.CollectionLoader.Get(ctx, *collectionId)
+	if episodeContext.CollectionID.Valid {
+		collectionId := int(episodeContext.CollectionID.Int64)
+		col, err := r.Loaders.CollectionLoader.Get(ctx, collectionId)
 		if err != nil {
 			return nil, err
 		}
 		ginCtx, _ := utils.GinCtx(ctx)
 		languages := user.GetLanguagesFromCtx(ginCtx)
 
-		strID := strconv.Itoa(*collectionId)
+		strID := strconv.Itoa(collectionId)
 		return &model.ContextCollection{
 			ID:   strID,
 			Slug: col.Slugs.GetValueOrNil(languages),

backend/graph/api/generated/generated.go

@@ -27,12 +27,18 @@ func SectionFrom(ctx context.Context, s *common.Section) Section {
 	}
 
 	switch s.Type {
-	case "item":
+	case "item", "playlist":
+		var playlistID *string
+		if s.PlaylistID.Valid {
+			pid := s.PlaylistID.UUID.String()
+			playlistID = &pid
+		}
 		metadata := &ItemSectionMetadata{
 			SecondaryTitles:    s.Options.SecondaryTitles,
 			MyList:             s.Options.MyList,
 			ContinueWatching:   s.Options.ContinueWatching,
 			CollectionID:       strconv.Itoa(int(s.CollectionID.Int64)),
+			PlaylistID:         playlistID,
 			UseContext:         s.Options.UseContext,
 			PrependLiveElement: s.Options.PrependLiveElement,
 			Limit:              &s.Options.Limit,

backend/graph/api/model/models_gen.go

@@ -137,10 +137,20 @@ func (r *mutationRootResolver) SetEpisodeProgress(ctx context.Context, id string
 
 		if context != nil {
 			var col null.Int
-			if context.CollectionID != nil {
+			var playlistID uuid.NullUUID
+			if context.PlaylistID != nil {
+				pID := utils.AsUuid(*context.PlaylistID)
+				playlist, err := r.Loaders.PlaylistLoader.Get(ctx, pID)
+				if err == nil && playlist != nil {
+					col = playlist.CollectionID
+					playlistID = uuid.NullUUID{UUID: pID, Valid: true}
+				}
+			}
+			if !col.Valid && context.CollectionID != nil {
 				col.SetValid(int64(utils.AsInt(*context.CollectionID)))
 			}
 			episodeProgress.Context.CollectionID = col
+			episodeProgress.Context.PlaylistID = playlistID
 		} else {
 			episodeProgress.Context = common.EpisodeContext{}
 		}

backend/graph/api/model/section.go

@@ -403,17 +403,21 @@ func (r *queryRootResolver) Episode(ctx context.Context, id string, context *mod
 	ginCtx, _ := utils.GinCtx(ctx)
 	if context != nil {
 		var collectionID null.Int
+		var playlistID uuid.NullUUID
 		if context.PlaylistID != nil {
-			playlist, err := r.Loaders.PlaylistLoader.Get(ctx, utils.AsUuid(*context.PlaylistID))
+			pID := utils.AsUuid(*context.PlaylistID)
+			playlist, err := r.Loaders.PlaylistLoader.Get(ctx, pID)
 			if err == nil && playlist != nil {
 				collectionID = playlist.CollectionID
+				playlistID = uuid.NullUUID{UUID: pID, Valid: true}
 			}
 		}
 		if !collectionID.Valid {
 			collectionID = utils.AsNullInt(context.CollectionID)
 		}
 		ginCtx.Set(episodeContextKey, common.EpisodeContext{
 			CollectionID: collectionID,
+			PlaylistID:   playlistID,
 			Cursor:       null.StringFromPtr(context.Cursor),
 			Shuffle:      null.BoolFromPtr(context.Shuffle),
 		})

backend/graph/api/mutations.resolvers.go

@@ -3,7 +3,7 @@ enum EpisodeType {
     standalone
 }
 
-union EpisodeContextUnion = Season | ContextCollection
+union EpisodeContextUnion = Season | ContextCollection | Playlist
 
 enum ShareRestriction {
     registered

backend/graph/api/schema.resolvers.go

@@ -3,6 +3,7 @@ type ItemSectionMetadata {
     myList: Boolean!
     secondaryTitles: Boolean!
     collectionId: ID!
+    playlistId: ID
     useContext: Boolean!
     prependLiveElement: Boolean!
     page: Page @goField(forceResolver: true)