From 0065f26b100eb398ea4f2bc46cd98d26d5eab9c1 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Wed, 17 Oct 2018 20:45:25 -0700 Subject: [PATCH] Fix days to exclude duplicate and deleted photos Signed-off-by: James Ketrenos --- server/routes/days.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/routes/days.js b/server/routes/days.js index b8ffcdc..34a5e0d 100644 --- a/server/routes/days.js +++ b/server/routes/days.js @@ -25,13 +25,13 @@ const router = express.Router(); */ router.get("/*", function(req, res/*, next*/) { - const path = decodeURI(req.url).replace(/\?.*$/, "").replace(/^\//, ""), - query = "SELECT DATE(photos.taken) AS date,COUNT(photos.id) AS count FROM albums " + - "JOIN photos ON photos.albumId=albums.id " + - "WHERE albums.path LIKE :path GROUP BY DATE(photos.taken) ORDER BY date DESC"; - + const path = decodeURI(req.url).replace(/\?.*$/, "").replace(/^\//, ""); + console.log("Looking for daily photo counts in " + path); - return photoDB.sequelize.query(query, { + return photoDB.sequelize.query( + "SELECT DATE(photos.taken) AS date,COUNT(photos.id) AS count FROM albums " + + "JOIN photos ON photos.deleted!=1 AND photos.duplicate=0 AND photos.albumId=albums.id AND photos.taken NOT NULL" + + "WHERE albums.path LIKE :path GROUP BY DATE(photos.taken) ORDER BY date DESC", { replacements: { path: path + "%" },