Merge pull request #12 from wizpanda/deletion-fixes

Minor fixes, added 15 min start delay in delete marked file job.
wizpanda · Oct 19, 2018 · ac9d737 · ac9d737
2 parents 3717ef9 + b4de5ad
commit ac9d737
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/grails-app/jobs/com/wizpanda/file/DeleteMarkedFileJob.groovy b/grails-app/jobs/com/wizpanda/file/DeleteMarkedFileJob.groovy
@@ -4,14 +4,16 @@ package com.wizpanda.file
  * Job to delete marked stored files from S3.
  *
  * @author Ankit Kumar Singh
- * @since 1.0.3
+ * @since 0.1.3
  */
 class DeleteMarkedFileJob {
 
     FileDeletionService fileDeletionService
 
+    def concurrent = false
+
     static triggers = {
-        simple repeatInterval: 1000l * 60 * 60 * 2 // execute job once in 2 hour
+        simple startDelay:  1000l * 60 * 15, repeatInterval: 1000l * 60 * 60 * 2 // execute job once in 2 hour
     }
 
     def execute() {

diff --git a/grails-app/services/com/wizpanda/file/FileDeletionService.groovy b/grails-app/services/com/wizpanda/file/FileDeletionService.groovy
@@ -8,7 +8,7 @@ import groovy.time.TimeCategory
  * Service class to perform delete operations on file which are marked for deletion.
  *
  * @author Ankit Kumar Singh
- * @since 1.0.3
+ * @since 0.1.3
  */
 @Transactional
 class FileDeletionService {
@@ -31,7 +31,7 @@ class FileDeletionService {
             isNotNull("markedForDeletion")
             le("markedForDeletion", dateForDeletion)
 
-            maxResult(MAX)
+            maxResults(MAX)
         }
 
         storedFileList.each { StoredFile storedFile ->

diff --git a/src/test/groovy/com/wizpanda/file/FileDeletionServiceSpec.groovy b/src/test/groovy/com/wizpanda/file/FileDeletionServiceSpec.groovy
@@ -3,7 +3,7 @@ package com.wizpanda.file
 import grails.testing.services.ServiceUnitTest
 import spock.lang.Specification
 
-class FileDeletionServiceSpec extends Specification implements ServiceUnitTest<FileDeletionService>{
+class FileDeletionServiceSpec extends Specification implements ServiceUnitTest<FileDeletionService> {
 
     def setup() {
     }
@@ -12,7 +12,7 @@ class FileDeletionServiceSpec extends Specification implements ServiceUnitTest<F
     }
 
     void "test something"() {
-        expect:"fix me"
-            true == false
+        expect: "fix me"
+        true == false
     }
 }