fix data retention job

build.gradle

@@ -90,7 +90,7 @@ dependencies {
 	compile "org.grails.plugins:errbuddy:2.1.0"
 	compile "com.uberall.plugins:uber-doc:2.0.4"
 	compile 'org.grails.plugins:elasticsearch:1.0.0.2'
-	compile 'org.grails.plugins:grails-jesque-admin:0.1.5'
+	compile 'org.grails.plugins:jesque-admin:0.6.5'
 	compile 'org.grails.plugins:jesque:1.2.1-UBERALL'
 
 	assets 'net.errbuddy.plugins:babel-asset-pipeline:2.1.0'

default-config.groovy

@@ -69,6 +69,7 @@ errbuddy {
 	maximumMax = 100
 	supportedLanguages = ['en']
 	defaultLanguage = 'en'
+	retentionDays = 90
 }
 
 elasticSearch {

grails-app/jobs/errbuddy/DataRetentionJob.groovy

@@ -1,5 +1,8 @@
 package errbuddy
 
+import grails.core.GrailsApplication
+import org.joda.time.DateTime
+
 class DataRetentionJob {
 
 	static queueName = "put"
@@ -13,17 +16,30 @@ class DataRetentionJob {
 	}
 
 	def dataRetentionService
+	GrailsApplication grailsApplication
 
 	def perform(long id = 0) {
 		if (id) {
-			dataRetentionService.handleDataRetentionForApplication(id)
+			App app = App.get(id)
+			if (app) {
+				handle(app)
+			}
 		} else {
 			App.createCriteria().list {
 				eq('enabled', true)
-				projections { property('id') }
-			}.each { long appId ->
-				dataRetentionService.handleDataRetentionForApplication(appId)
+			}.each { App app ->
+				handle(app)
 			}
 		}
 	}
+
+	void handle(App app) {
+		DateTime until = DateTime.now().minusDays(grailsApplication.config.errbuddy.retentionDays ?: 90)
+		if (!app.clearUntil || app.clearUntil.isBefore(until)) {
+			app.clearUntil = until
+			app.save()
+		}
+		dataRetentionService.handleDataRetentionForApplication(app)
+	}
+
 }

grails-app/services/errbuddy/DataRetentionService.groovy

@@ -7,10 +7,7 @@ class DataRetentionService {
 
 	def jesqueService
 
-	void handleDataRetentionForApplication(long id) {
-		def app = App.read(id)
-		if (!app) return
-
+	void handleDataRetentionForApplication(App app) {
 		int max = 10000
 		def entries = Entry.createCriteria().list([max: max]) {
 			entryGroup {