changes according to discussion:

- pass user series when uploading from workspace
- add a checker/mapper to insert user series for those events without series based on perms "owner"

Author: ferishili

bootstrap.php

@@ -7,5 +7,6 @@
 NotificationCenter::addObserver('Opencast\Models\Videos', 'parseEvent', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\Videos', 'checkEventACL', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\VideosUserPerms', 'setPermissions', 'OpencastVideoSync');
+NotificationCenter::addObserver('Opencast\Models\Helpers', 'mapEventUserSeriesUserPerms', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\Helpers', 'notifyUsers', 'OpencastNotifyUsers');
 

cronjobs/opencast_discover_videos.php

@@ -111,7 +111,7 @@ public function execute($last_result, $parameters = array())
                     // Is the episode related to this studip?
                     // We need to check this, because it might happen that the Opencast server is connected to multiple Stud.IP instances,
                     // and we only want to process events that are related to this Stud.IP instance.
-                    if (!Helpers::isEventInThisStudip($event)) {
+                    if (!Helpers::isEventInAnyKnownSeries($event)) {
                         echo '[Skipped] Event not related to this Stud.IP instance, skipping: ' . $event->identifier . "\n";
                         continue;
                     }

lib/Models/Helpers.php

@@ -8,6 +8,8 @@
 use Opencast\VersionHelper;
 use Opencast\Providers\Perm;
 use Opencast\Models\Videos;
+use Opencast\Models\REST\ApiEventsClient;
+use Opencast\Models\REST\ApiWorkflowsClient;
 
 class Helpers
 {
@@ -462,7 +464,7 @@ public static function getAllRecordedSeriesIds(bool $force = false)
     }
 
     /**
-     * Determines whether a given Opencast event belongs to this Stud.IP instance.
+     * Determines whether a given Opencast event belongs to any know series in this Stud.IP instance.
      *
      * This method checks if the provided Opencast event's series ID (`is_part_of`)
      * is known to the current Stud.IP system. If the event does not have a series ID,
@@ -472,7 +474,7 @@ public static function getAllRecordedSeriesIds(bool $force = false)
      * @param object $oc_event The Opencast event object to check.
      * @return bool True if the event belongs to this Stud.IP instance, false otherwise.
      */
-    public static function isEventInThisStudip($oc_event)
+    public static function isEventInAnyKnownSeries($oc_event)
     {
         if (empty($oc_event->is_part_of)) {
             // No series id, so we consider it as a valid event for this studip to be processed!
@@ -502,4 +504,57 @@ public static function invalidateRecordedSeriesIdsCache()
         $cache = \StudipCacheFactory::getCache();
         $cache->expire(self::RECORDED_SERIES_ID_CACHE_ID);
     }
+
+    /**
+     * Gives the events without series id a chance of getting one by mapping user perms and user series.
+     *
+     * @Notification OpencastVideoSync
+     *
+     * @param string $eventType
+     * @param object $event
+     * @param  Opencast\Models\Videos $video
+     */
+    public static function mapEventUserSeriesUserPerms($eventType, $event, $video)
+    {
+        if (!empty($event->is_part_of)) {
+            // Already has a series id, then we are done here!
+            return;
+        }
+
+        // Get the (a) video owner.
+        $video_owner = VideosUserPerms::findOneBySQL('video_id = ? AND perm = ?', [$video->id, 'owner']);
+        if (empty($video_owner)) {
+            // No owner, then we have nothing to do here!
+            return;
+        }
+
+        // Make sure the owner has a user series!
+        $user_series = null;
+
+        $all_user_series = UserSeries::getSeries($video_owner->user_id);
+        // Enforce user series creation!
+        if (empty($all_user_series)) {
+            $user_series = UserSeries::createSeries($video_owner->user_id);
+        } else {
+            $user_series = $all_user_series[0];
+        }
+
+        // Update the event with the new series id.
+        $api_event_client = ApiEventsClient::getInstance($video->config_id);
+
+        $metadata[] = [
+            'id' => 'isPartOf',
+            'value' => $user_series['series_id']
+        ];
+        $response = $api_event_client->updateMetadata($video->episode, $metadata);
+        $republish = in_array($response['code'], [200, 204]) === true;
+
+        if ($republish) {
+            $api_wf_client = ApiWorkflowsClient::getInstance($video->config_id);
+
+            if ($api_wf_client->republish($video->episode)) {
+                echo 'Event metadata has been updated by the owner specific series id: ' . $video->episode . "\n";
+            }
+        }
+    }
 }

vueapp/components/Videos/VideoUpload.vue

@@ -261,14 +261,19 @@ export default {
 
     computed: {
         ...mapGetters({
-            'config'        : 'simple_config_list',
-            'course_config' : 'course_config',
-            'cid'           : 'cid',
-            'playlist'      : 'playlist',
-            'playlists'     : 'playlists',
-            'currentLTIUser': 'currentLTIUser'
+            'config'            : 'simple_config_list',
+            'course_config'     : 'course_config',
+            'cid'               : 'cid',
+            'playlist'          : 'playlist',
+            'playlists'         : 'playlists',
+            'currentLTIUser'    : 'currentLTIUser',
+            'currentUserSeries' : 'currentUserSeries'
         }),
 
+        fragment() {
+            return this.$route.name;
+        },
+
         upload_playlists() {
             let upload_playlists = [...this.playlists];
 
@@ -405,6 +410,9 @@ export default {
 
             if (this.cid) {
                 uploadData['seriesId'] = this.course_config['series']['series_id'];
+            } else if (this.fragment === 'videos' && this.currentUserSeries) {
+                // Force to add user series if when in work space!
+                uploadData['seriesId'] = this.currentUserSeries;
             }
 
             uploadData['created']  = new Date(this.upload.recordDate).toISOString();
@@ -437,6 +445,17 @@ export default {
 
             let view = this;
 
+            // We need to force the seriesId from now on in order to make sure everything is in place.
+            if (!uploadData?.seriesId) {
+                this.$store.dispatch('addMessage', {
+                    'type': 'error',
+                    'text': this.$gettext('Leider kann das Video momentan nicht hochgeladen werden,' +
+                        ' da notwendige Daten fehlen. Bitte kontaktieren Sie Ihre Systemadministration.'),
+                    dialog: true
+                });
+                return;
+            }
+
             this.uploadService.upload(files, uploadData, this.selectedWorkflow.name, ltiUploader, {
                 uploadProgress: (track, loaded, total) => {
                     view.uploadProgress = {