fixup! Add playlist feature

geichelberger · geichelberger · commit e13287ddec17 · 2026-03-04T21:53:19.000+01:00
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/command/DeletePlaylistCommand.java b/modules/graphql/src/main/java/org/opencastproject/graphql/command/DeletePlaylistCommand.java
@@ -24,7 +24,7 @@
 import org.opencastproject.graphql.exception.GraphQLUnauthorizedException;
 import org.opencastproject.graphql.execution.context.OpencastContext;
 import org.opencastproject.graphql.execution.context.OpencastContextManager;
-import org.opencastproject.graphql.playlist.GqlDeletePlaylistPayload;
+import org.opencastproject.graphql.playlist.type.output.GqlDeletePlaylistPayload;
 import org.opencastproject.playlists.PlaylistService;
 import org.opencastproject.security.api.UnauthorizedException;
 import org.opencastproject.util.NotFoundException;
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistCurrentUserExtension.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistCurrentUserExtension.java
@@ -34,11 +34,11 @@
 import graphql.schema.DataFetchingEnvironment;
 
 @GraphQLTypeExtension(GqlCurrentUser.class)
-public class PlaylistUserExtension {
+public class PlaylistCurrentUserExtension {
 
   private final GqlCurrentUser currentUser;
 
-  public PlaylistUserExtension(GqlCurrentUser currentUser) {
+  public PlaylistCurrentUserExtension(GqlCurrentUser currentUser) {
     this.currentUser = currentUser;
   }
 
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistGraphQLProvider.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistGraphQLProvider.java
@@ -21,6 +21,8 @@
 
 package org.opencastproject.graphql.playlist;
 
+import org.opencastproject.graphql.playlist.type.output.GqlEventPlaylistEntry;
+import org.opencastproject.graphql.playlist.type.output.GqlInaccessiblePlaylistEntry;
 import org.opencastproject.graphql.provider.GraphQLAdditionalTypeProvider;
 
 import org.osgi.service.component.annotations.Component;
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistMutationExtension.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistMutationExtension.java
@@ -21,10 +21,14 @@
 
 package org.opencastproject.graphql.playlist;
 
-import org.opencastproject.graphql.command.CreatePlaylistCommand;
+import org.opencastproject.graphql.playlist.command.CreatePlaylistCommand;
 import org.opencastproject.graphql.command.DeletePlaylistCommand;
-import org.opencastproject.graphql.command.UpdatePlaylistCommand;
+import org.opencastproject.graphql.playlist.command.UpdatePlaylistCommand;
 import org.opencastproject.graphql.directive.RolesAllowed;
+import org.opencastproject.graphql.playlist.type.output.GqlDeletePlaylistPayload;
+import org.opencastproject.graphql.playlist.type.input.PlaylistEntriesInput;
+import org.opencastproject.graphql.playlist.type.input.PlaylistMetadataInput;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylist;
 import org.opencastproject.graphql.type.input.AccessControlListInput;
 import org.opencastproject.graphql.type.input.Mutation;
 
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistQueryExtension.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/PlaylistQueryExtension.java
@@ -21,8 +21,10 @@
 
 package org.opencastproject.graphql.playlist;
 
-import org.opencastproject.graphql.datafetcher.playlist.PlaylistDataFetcher;
-import org.opencastproject.graphql.datafetcher.playlist.PlaylistOffsetDataFetcher;
+import org.opencastproject.graphql.playlist.datafetcher.PlaylistDataFetcher;
+import org.opencastproject.graphql.playlist.datafetcher.PlaylistOffsetDataFetcher;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylist;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylistList;
 import org.opencastproject.graphql.type.input.PlaylistOrderByInput;
 import org.opencastproject.graphql.type.output.Query;
 
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/command/CreatePlaylistCommand.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/command/CreatePlaylistCommand.java
@@ -19,17 +19,18 @@
  *
  */
 
-package org.opencastproject.graphql.command;
+package org.opencastproject.graphql.playlist.command;
 
 import org.opencastproject.authorization.xacml.manager.api.AclService;
 import org.opencastproject.authorization.xacml.manager.api.AclServiceFactory;
+import org.opencastproject.graphql.command.AbstractCommand;
 import org.opencastproject.graphql.exception.GraphQLRuntimeException;
 import org.opencastproject.graphql.exception.GraphQLUnauthorizedException;
 import org.opencastproject.graphql.execution.context.OpencastContext;
 import org.opencastproject.graphql.execution.context.OpencastContextManager;
-import org.opencastproject.graphql.playlist.GqlPlaylist;
-import org.opencastproject.graphql.playlist.PlaylistEntriesInput;
-import org.opencastproject.graphql.playlist.PlaylistMetadataInput;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylist;
+import org.opencastproject.graphql.playlist.type.input.PlaylistEntriesInput;
+import org.opencastproject.graphql.playlist.type.input.PlaylistMetadataInput;
 import org.opencastproject.graphql.type.input.AccessControlListInput;
 import org.opencastproject.graphql.util.GraphQLObjectMapper;
 import org.opencastproject.playlists.Playlist;
@@ -67,7 +68,6 @@ public GqlPlaylist execute() {
     final PlaylistService playlistService = context.getService(PlaylistService.class);
     final SecurityService securityService = context.getService(SecurityService.class);
     try {
-      // read arguments from environment when present, otherwise fall back to builder values
       final Object metadataArg = environment.getArgument("metadata");
       final PlaylistMetadataInput metadata = metadataArg == null
           ? metadataInput
@@ -124,7 +124,6 @@ public GqlPlaylist execute() {
       }
       playlist.setAccessControlEntries(aceList);
 
-      // Persist
       playlist = playlistService.update(playlist);
 
       return new GqlPlaylist(playlist);
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/command/UpdatePlaylistCommand.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/command/UpdatePlaylistCommand.java
@@ -19,18 +19,19 @@
  *
  */
 
-package org.opencastproject.graphql.command;
+package org.opencastproject.graphql.playlist.command;
 
 import org.opencastproject.authorization.xacml.manager.api.AclService;
 import org.opencastproject.authorization.xacml.manager.api.AclServiceFactory;
+import org.opencastproject.graphql.command.AbstractCommand;
 import org.opencastproject.graphql.exception.GraphQLNotFoundException;
 import org.opencastproject.graphql.exception.GraphQLRuntimeException;
 import org.opencastproject.graphql.exception.GraphQLUnauthorizedException;
 import org.opencastproject.graphql.execution.context.OpencastContext;
 import org.opencastproject.graphql.execution.context.OpencastContextManager;
-import org.opencastproject.graphql.playlist.GqlPlaylist;
-import org.opencastproject.graphql.playlist.PlaylistEntriesInput;
-import org.opencastproject.graphql.playlist.PlaylistMetadataInput;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylist;
+import org.opencastproject.graphql.playlist.type.input.PlaylistEntriesInput;
+import org.opencastproject.graphql.playlist.type.input.PlaylistMetadataInput;
 import org.opencastproject.graphql.type.input.AccessControlListInput;
 import org.opencastproject.graphql.util.GraphQLObjectMapper;
 import org.opencastproject.playlists.Playlist;
@@ -94,11 +95,8 @@ public GqlPlaylist execute() {
       if (entries != null && entries.getEntries() != null) {
         List<PlaylistEntry> playlistEntries = new ArrayList<>();
         for (var entryInput : entries.getEntries()) {
-          PlaylistEntryType type = PlaylistEntryType.EVENT;
-          if (entryInput != null && entryInput.getType() != null) {
-            type = entryInput.getType().getType();
-          }
-          PlaylistEntry pe = new PlaylistEntry(entryInput == null ? null : entryInput.getContentId(), type);
+          PlaylistEntryType type = entryInput.getType().getType();
+          PlaylistEntry pe = new PlaylistEntry(entryInput.getContentId(), type);
           playlistEntries.add(pe);
         }
         playlist.setEntries(playlistEntries);
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/datafetcher/PlaylistDataFetcher.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/datafetcher/PlaylistDataFetcher.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.opencastproject.graphql.datafetcher.playlist;
+package org.opencastproject.graphql.playlist.datafetcher;
 
 import org.opencastproject.graphql.datafetcher.ContextDataFetcher;
 import org.opencastproject.graphql.exception.GraphQLRuntimeException;
 import org.opencastproject.graphql.exception.OpencastErrorType;
 import org.opencastproject.graphql.execution.context.OpencastContext;
-import org.opencastproject.graphql.playlist.GqlPlaylist;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylist;
 import org.opencastproject.playlists.Playlist;
 import org.opencastproject.playlists.PlaylistService;
 import org.opencastproject.security.api.UnauthorizedException;
@@ -53,11 +53,9 @@ public GqlPlaylist get(OpencastContext opencastContext, DataFetchingEnvironment
       if (playlist == null) {
         return null;
       }
-      // enrich if available
       try {
         playlist = playlistService.enrich(playlist).toPlaylist();
       } catch (Throwable ignored) {
-        // If enrich is not available or fails, fall back to original playlist
       }
       return new GqlPlaylist(playlist);
     } catch (NotFoundException e) {
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/datafetcher/PlaylistOffsetDataFetcher.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/datafetcher/PlaylistOffsetDataFetcher.java
@@ -19,11 +19,11 @@
  *
  */
 
-package org.opencastproject.graphql.datafetcher.playlist;
+package org.opencastproject.graphql.playlist.datafetcher;
 
 import org.opencastproject.graphql.datafetcher.ElasticsearchDataFetcher;
 import org.opencastproject.graphql.execution.context.OpencastContext;
-import org.opencastproject.graphql.playlist.GqlPlaylistList;
+import org.opencastproject.graphql.playlist.type.output.GqlPlaylistList;
 import org.opencastproject.playlists.Playlist;
 import org.opencastproject.playlists.PlaylistAccessControlEntry;
 import org.opencastproject.playlists.PlaylistService;
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/GqlPlaylistEntryType.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/GqlPlaylistEntryType.java
@@ -19,15 +19,15 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type;
 
 import org.opencastproject.playlists.PlaylistEntryType;
 
 import graphql.annotations.annotationTypes.GraphQLDescription;
 import graphql.annotations.annotationTypes.GraphQLName;
 
 @GraphQLName(GqlPlaylistEntryType.TYPE_NAME)
-@GraphQLDescription("The direction of the order")
+@GraphQLDescription("The type of a playlist entry.")
 public enum GqlPlaylistEntryType {
   EVENT(PlaylistEntryType.EVENT),
   INACCESSIBLE(PlaylistEntryType.INACCESSIBLE);
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/input/PlaylistEntriesInput.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/input/PlaylistEntriesInput.java
@@ -19,24 +19,28 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.input;
 
 
+import java.util.List;
+
+import graphql.annotations.annotationTypes.GraphQLDescription;
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLNonNull;
 
 @GraphQLName(PlaylistEntriesInput.TYPE_NAME)
+@GraphQLDescription("Input type for a list of playlist entries.")
 public class PlaylistEntriesInput {
   public static final String TYPE_NAME = "PlaylistEntriesInput";
 
   @GraphQLField
   @GraphQLNonNull
-  private java.util.List<PlaylistEntryInput> entries;
+  private List<PlaylistEntryInput> entries;
 
   public PlaylistEntriesInput() { }
 
-  public java.util.List<PlaylistEntryInput> getEntries() {
+  public List<PlaylistEntryInput> getEntries() {
     return entries;
   }
 }
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/input/PlaylistEntryInput.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/input/PlaylistEntryInput.java
@@ -19,19 +19,27 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.input;
 
+import org.opencastproject.graphql.playlist.type.GqlPlaylistEntryType;
+
+import graphql.annotations.annotationTypes.GraphQLDescription;
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
+import graphql.annotations.annotationTypes.GraphQLNonNull;
 
 @GraphQLName(PlaylistEntryInput.TYPE_NAME)
+@GraphQLDescription("Input type for a playlist entry.")
 public class PlaylistEntryInput {
+
   public static final String TYPE_NAME = "PlaylistEntryInput";
 
   @GraphQLField
+  @GraphQLNonNull
   private String contentId;
 
   @GraphQLField
+  @GraphQLNonNull
   private GqlPlaylistEntryType type;
 
   public PlaylistEntryInput() { }
@@ -43,4 +51,5 @@ public String getContentId() {
   public GqlPlaylistEntryType getType() {
     return type;
   }
+
 }
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/input/PlaylistMetadataInput.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/input/PlaylistMetadataInput.java
@@ -18,13 +18,15 @@
  * the License.
  *
  */
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.input;
 
 import graphql.annotations.annotationTypes.GraphQLConstructor;
+import graphql.annotations.annotationTypes.GraphQLDescription;
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
 
 @GraphQLName(PlaylistMetadataInput.TYPE_NAME)
+@GraphQLDescription("Input type for playlist metadata, including title and description.")
 public class PlaylistMetadataInput {
 
   public static final String TYPE_NAME = "PlaylistMetadataInput";
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlDeletePlaylistPayload.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlDeletePlaylistPayload.java
@@ -18,12 +18,12 @@
  * the License.
  *
  */
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 import graphql.annotations.annotationTypes.GraphQLDescription;
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
 @GraphQLName(GqlDeletePlaylistPayload.TYPE_NAME)
-@GraphQLDescription("DeletePlaylistPayload")
+@GraphQLDescription("The payload returned after deleting a playlist, containing the ID of the deleted playlist.")
 public class GqlDeletePlaylistPayload {
   public static final String TYPE_NAME = "DeletePlaylistPayload";
   public GqlDeletePlaylistPayload() {
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlEventPlaylistEntry.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlEventPlaylistEntry.java
@@ -19,14 +19,16 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 
 import org.opencastproject.graphql.datafetcher.event.EventDataFetcher;
 import org.opencastproject.graphql.type.output.GqlPublication;
 import org.opencastproject.playlists.PlaylistEntry;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import graphql.annotations.annotationTypes.GraphQLDescription;
@@ -52,12 +54,19 @@ public PlaylistEntry getEntry() {
   }
 
   @GraphQLField
-  public List<GqlPublication> publications(final DataFetchingEnvironment environment) {
+  public List<GqlPublication> publications(
+      @GraphQLName("channel") String channel,
+      @GraphQLName("tags") List<String> tags,
+      final DataFetchingEnvironment environment) {
     var event = new EventDataFetcher(contentId()).get(environment);
     if (event == null) {
       return Collections.emptyList();
     }
-    return event.getEvent().getPublications().stream().map(GqlPublication::new).collect(Collectors.toList());
+    return event.getEvent().getPublications().stream()
+        .filter(e -> !Objects.equals(e.getChannel(), "internal"))
+        .filter(e -> channel == null || Objects.equals(e.getChannel(), channel))
+        .filter(e -> tags == null || Arrays.stream(e.getTags()).anyMatch(tags::contains))
+        .map(GqlPublication::new)
+        .collect(Collectors.toList());
   }
-
 }
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlInaccessiblePlaylistEntry.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlInaccessiblePlaylistEntry.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 
 import org.opencastproject.playlists.PlaylistEntry;
 
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylist.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylist.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 
 import org.opencastproject.graphql.type.DateTimeFunction;
 import org.opencastproject.playlists.Playlist;
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylistAccessControlEntry.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylistAccessControlEntry.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 
 import org.opencastproject.playlists.PlaylistAccessControlEntry;
 
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylistEntry.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylistEntry.java
@@ -19,8 +19,10 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 
+import org.opencastproject.graphql.playlist.type.resolver.PlaylistEntryTypeResolver;
+import org.opencastproject.graphql.playlist.type.GqlPlaylistEntryType;
 import org.opencastproject.playlists.PlaylistEntry;
 
 import graphql.annotations.annotationTypes.GraphQLDescription;
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylistList.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/output/GqlPlaylistList.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.output;
 
 import org.opencastproject.graphql.type.output.OffsetPageInfo;
 import org.opencastproject.playlists.Playlist;
diff --git a/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/resolver/PlaylistEntryTypeResolver.java b/modules/graphql/src/main/java/org/opencastproject/graphql/playlist/type/resolver/PlaylistEntryTypeResolver.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.opencastproject.graphql.playlist;
+package org.opencastproject.graphql.playlist.type.resolver;
 
 import graphql.TypeResolutionEnvironment;
 import graphql.annotations.annotationTypes.GraphQLName;
diff --git a/modules/graphql/src/test/java/org/opencastproject/graphql/playlist/GqlPlaylistTest.java b/modules/graphql/src/test/java/org/opencastproject/graphql/playlist/GqlPlaylistTest.java
