Fixed: Cannot delete video with viewing status #110

streamaserver · Dec 31, 2015 · f62577a · f62577a
1 parent 66324c0
commit f62577a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 9 deletions.
diff --git a/grails-app/conf/BootStrap.groovy b/grails-app/conf/BootStrap.groovy
@@ -2,12 +2,14 @@ class BootStrap {
 
     def marshallerService
     def defaultDataService
+    def migrationService
 
     def init = { servletContext ->
         marshallerService.init()
         defaultDataService.createDefaultRoles()
         defaultDataService.createDefaultUsers()
         defaultDataService.createDefaultSettings()
+        migrationService.setDefaultDeletedFlag()
     }
     def destroy = {
     }

diff --git a/grails-app/controllers/streama/DashController.groovy b/grails-app/controllers/streama/DashController.groovy
@@ -4,8 +4,8 @@ class DashController {
 
     def searchMedia() {
       String query = params.query
-      def movies = Movie.list()
-      def shows = TvShow.list()
+      def movies = Movie.findAllByDeletedNotEqual(true)
+      def shows = TvShow.findAllByDeletedNotEqual(true)
 
 
       def result = [

diff --git a/grails-app/controllers/streama/EpisodeController.groovy b/grails-app/controllers/streama/EpisodeController.groovy
@@ -13,7 +13,7 @@ class EpisodeController {
 
     def index() {
         TvShow show = TvShow.get(params.getLong("showId"))
-        respond Episode.findAllByShow(show), [status: OK]
+        respond Episode.findAllByShowAndDeletedNotEqual(show, true), [status: OK]
     }
 
     @Transactional
@@ -59,7 +59,9 @@ class EpisodeController {
             return
         }
 
-        episodeInstance.delete flush:true
+        episodeInstance.deleted = true
+        episodeInstance.save failOnError: true, flush: true
+
         render status: NO_CONTENT
     }
 }
diff --git a/grails-app/controllers/streama/MovieController.groovy b/grails-app/controllers/streama/MovieController.groovy
@@ -12,7 +12,7 @@ class MovieController {
   static allowedMethods = [save: "POST", update: "PUT", delete: "DELETE"]
 
   def index() {
-    respond Movie.list(), [status: OK]
+    respond Movie.findAllByDeletedNotEqual(true), [status: OK]
   }
 
   @Transactional
@@ -50,7 +50,8 @@ class MovieController {
       return
     }
 
-    movieInstance.delete flush: true
+    movieInstance.deleted = true
+    movieInstance.save failOnError: true, flush: true
     render status: NO_CONTENT
   }
 }
diff --git a/grails-app/controllers/streama/VideoController.groovy b/grails-app/controllers/streama/VideoController.groovy
@@ -18,7 +18,7 @@ class VideoController {
 
 
   def index() {
-    respond Video.list(), [status: OK]
+    respond Video.findAllByDeletedNotEqual(true), [status: OK]
   }
 
   def dash() {
@@ -31,11 +31,12 @@ class VideoController {
       eq("user", currentUser)
       video{
         isNotEmpty("files")
+        ne("deleted", true)
       }
       eq("completed", false)
       order("lastUpdated", "desc")
     }
-    def movies = Movie.list().findAll{ Movie movie ->
+    def movies = Movie.findAllByDeletedNotEqual(true).findAll{ Movie movie ->
       return (!continueWatching.find{it.video.id == movie.id} && movie.files)
     }
 
@@ -115,7 +116,8 @@ class VideoController {
       return
     }
 
-    videoInstance.delete flush:true
+    videoInstance.deleted = true
+    videoInstance.save failOnError: true, flush: true
     render status: NO_CONTENT
   }
 

diff --git a/grails-app/domain/streama/Video.groovy b/grails-app/domain/streama/Video.groovy
@@ -13,6 +13,7 @@ class Video {
   Integer vote_count
   Double popularity
 
+  Boolean deleted = false
   String imdb_id
 
   static hasMany = [files: File]

diff --git a/grails-app/services/streama/MigrationService.groovy b/grails-app/services/streama/MigrationService.groovy
@@ -0,0 +1,16 @@
+package streama
+
+import grails.transaction.Transactional
+
+@Transactional
+class MigrationService {
+
+  def setDefaultDeletedFlag() {
+    def videos = Video.findAllByDeletedIsNull()
+
+    videos.each{
+      it.deleted = false
+      it.save(failOnError: true)
+    }
+  }
+}