From ee518c17551a0a5c3ca13fafb9e7c920a51269df Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Mon, 30 Jul 2018 17:37:30 +0100
Subject: [PATCH] fix expired projects command

---
 Makefile                                    | 2 +-
 app/coffee/ProjectPersistenceManager.coffee | 8 ++++++--
 app/coffee/db.coffee                        | 2 ++
 docker-compose.ci.yml                       | 2 +-
 docker-compose.yml                          | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6daee1b..b1ce293 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.8
+# Version: 1.1.9
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
diff --git a/app/coffee/ProjectPersistenceManager.coffee b/app/coffee/ProjectPersistenceManager.coffee
index f41c14c..2c73c61 100644
--- a/app/coffee/ProjectPersistenceManager.coffee
+++ b/app/coffee/ProjectPersistenceManager.coffee
@@ -68,11 +68,15 @@ module.exports = ProjectPersistenceManager =
 
 	_findExpiredProjectIds: (callback = (error, project_ids) ->) ->
 		job = (cb)->
-			console.log("_findExpiredProjectIds")
-			db.Project.findAll(where: ["lastAccessed < ?", new Date(Date.now() - ProjectPersistenceManager.EXPIRY_TIMEOUT)])
+			keepProjectsFrom = new Date(Date.now() - ProjectPersistenceManager.EXPIRY_TIMEOUT)
+			console.log("_findExpiredProjectIds", keepProjectsFrom)
+			q = {}
+			q[db.op.gt] = keepProjectsFrom
+			db.Project.findAll(where:{lastAccessed:q})
 				.then((projects) ->
 					cb null, projects.map((project) -> project.project_id)
 				).error cb
+
 		dbQueue.queue.push(job, callback)
 
 
diff --git a/app/coffee/db.coffee b/app/coffee/db.coffee
index 764edeb..de48dfd 100644
--- a/app/coffee/db.coffee
+++ b/app/coffee/db.coffee
@@ -41,6 +41,8 @@ module.exports =
 		]
 	})
 
+	op: Sequelize.Op
+	
 	sync: () -> 
 		logger.log dbPath:Settings.mysql.clsi.storage, "syncing db schema"
 		sequelize.sync()
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index e8850b9..f6c8a27 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.8
+# Version: 1.1.9
 
 version: "2"
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f47658d..371e6e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.8
+# Version: 1.1.9
 
 version: "2"