remove deprecated method reduceContinueWatchingEps

in favor for same handling during viewingStatus/save
Zasch · Apr 8, 2021 · 8922f8b · 8922f8b
1 parent eefe526
commit 8922f8b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/grails-app/services/streama/VideoService.groovy b/grails-app/services/streama/VideoService.groovy
@@ -45,39 +45,6 @@ class VideoService {
     return [total: totalCount, list: viewingStatusList]
   }
 
-  private static List<ViewingStatus> reduceContinueWatchingEps(List<ViewingStatus> continueWatching) {
-    def result = []
-    continueWatching.each { continueWatchingItem ->
-      if (continueWatchingItem.video instanceof Episode) {
-        def previousShowEntry = result.find { it.video instanceof Episode && it.video.show?.id == continueWatchingItem.video.show?.id }
-
-        if (!previousShowEntry) {
-          if(!continueWatchingItem.hasVideoEnded()){
-            result.add(continueWatchingItem)
-          }else{
-            continueWatchingItem.completed = true
-            continueWatchingItem.save()
-            ViewingStatus newViewingStatus = ViewingStatusService.createNewForNextEpisode(continueWatchingItem)
-            if(newViewingStatus){
-              result.add(newViewingStatus)
-            }
-          }
-        }
-      } else{
-        if(!continueWatchingItem.hasVideoEnded()){
-          result.add(continueWatchingItem)
-        }else{
-          continueWatchingItem.completed = true
-          continueWatchingItem.save()
-        }
-      }
-    }
-
-    return result
-  }
-
-
-
 
   @Transactional
   def addLocalFile(Video videoInstance, params){

diff --git a/grails-app/services/streama/ViewingStatusService.groovy b/grails-app/services/streama/ViewingStatusService.groovy
@@ -55,6 +55,16 @@ class ViewingStatusService {
     viewingStatus.runtime = runtime
     viewingStatus.user = currentUser
 
+
+    if(viewingStatus.hasVideoEnded()){
+      viewingStatus.completed = true
+      viewingStatus.isActive = false
+
+      if(video instanceof Episode){
+        ViewingStatusService.createNewForNextEpisode(viewingStatus)
+     }
+    }
+
     //TODO update other active viewingStatuses from the same tvShow to isActive=false
     viewingStatus.validate()
     if (viewingStatus.hasErrors()) {
@@ -78,6 +88,7 @@ class ViewingStatusService {
     viewingStatus.user = continueWatchingItem.user
     viewingStatus.profile = continueWatchingItem.profile
     viewingStatus.video = nextEpisode
+    viewingStatus.isActive = true
     viewingStatus.save()
 
     return viewingStatus