jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Fixed days query

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2018-10-17 20:49:32 -07:00
parent 0065f26b10
commit 4e6288455e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/routes/days.js
View File

@ -27,10 +27,10 @@ const router = express.Router();
router.get("/*", function(req, res/*, next*/) { router.get("/*", function(req, res/*, next*/) {
const path = decodeURI(req.url).replace(/\?.*$/, "").replace(/^\//, ""); const path = decodeURI(req.url).replace(/\?.*$/, "").replace(/^\//, "");
console.log("Looking for daily photo counts in " + path); console.log("Looking for daily photo counts in '" + path + "'");
return photoDB.sequelize.query( return photoDB.sequelize.query(
"SELECT DATE(photos.taken) AS date,COUNT(photos.id) AS count FROM albums " + "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" + "JOIN photos ON photos.deleted!=1 AND photos.duplicate=0 AND photos.albumId=albums.id AND photos.taken IS NOT NULL " +
"WHERE albums.path LIKE :path GROUP BY DATE(photos.taken) ORDER BY date DESC", { "WHERE albums.path LIKE :path GROUP BY DATE(photos.taken) ORDER BY date DESC", {
replacements: { replacements: {
path: path + "%" path: path + "%"
@ -40,7 +40,6 @@ router.get("/*", function(req, res/*, next*/) {
}).then(function(days) { }).then(function(days) {
return res.status(200).json(days); return res.status(200).json(days);
}).catch(function(error) { }).catch(function(error) {
console.error("Query failed: " + query);
return Promise.reject(error); return Promise.reject(error);
}); });
}); });