From b3df1dd7a653909fb3f18ed7c0c91ffa347480fb Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Thu, 7 Jan 2021 21:36:56 +0200 Subject: feat: change mutation timestamp on every database mutation --- src/api/routes/albums/albumDELETE.js | 3 ++- src/api/routes/albums/albumPOST.js | 2 +- src/api/routes/albums/albumPurgeDELETE.js | 3 ++- src/api/routes/albums/albumZipGET.js | 3 ++- src/api/routes/albums/link/linkPOST.js | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/api/routes/albums') diff --git a/src/api/routes/albums/albumDELETE.js b/src/api/routes/albums/albumDELETE.js index f9c22e6..8fd79ca 100644 --- a/src/api/routes/albums/albumDELETE.js +++ b/src/api/routes/albums/albumDELETE.js @@ -26,7 +26,8 @@ class albumDELETE extends Route { await db.table('albumsLinks').where({ albumId: id }).delete(); // Delete any album links created for this album - await db.table('links').where({ albumId: id }).delete(); + await db.table('links').where({ albumId: id }).delete() + .wasMutated(); return res.json({ message: 'The album was deleted successfully' }); } catch (error) { diff --git a/src/api/routes/albums/albumPOST.js b/src/api/routes/albums/albumPOST.js index 52352a1..ec94eb8 100644 --- a/src/api/routes/albums/albumPOST.js +++ b/src/api/routes/albums/albumPOST.js @@ -28,7 +28,7 @@ class albumPOST extends Route { editedAt: now }; - const dbRes = await db.table('albums').insert(insertObj); + const dbRes = await db.table('albums').insert(insertObj).wasMutated(); insertObj.id = dbRes.pop(); diff --git a/src/api/routes/albums/albumPurgeDELETE.js b/src/api/routes/albums/albumPurgeDELETE.js index a63eafc..ff48c33 100644 --- a/src/api/routes/albums/albumPurgeDELETE.js +++ b/src/api/routes/albums/albumPurgeDELETE.js @@ -18,7 +18,8 @@ class albumDELETE extends Route { try { await Util.deleteAllFilesFromAlbum(id); - await db.table('albums').where({ id }).delete(); + await db.table('albums').where({ id }).delete() + .wasMutated(); return res.json({ message: 'The album was deleted successfully' }); } catch (error) { return super.error(res, error); diff --git a/src/api/routes/albums/albumZipGET.js b/src/api/routes/albums/albumZipGET.js index c560cff..22b0b6f 100644 --- a/src/api/routes/albums/albumZipGET.js +++ b/src/api/routes/albums/albumZipGET.js @@ -74,7 +74,8 @@ class albumGET extends Route { Util.createZip(filesToZip, album); await db.table('albums') .where('id', link.albumId) - .update('zippedAt', db.fn.now()); + .update('zippedAt', db.fn.now()) + .wasMutated(); const filePath = path.join(__dirname, '../../../../', process.env.UPLOAD_FOLDER, 'zips', `${album.userId}-${album.id}.zip`); const fileName = `${process.env.SERVICE_NAME}-${identifier}.zip`; diff --git a/src/api/routes/albums/link/linkPOST.js b/src/api/routes/albums/link/linkPOST.js index 28e9dfe..42eac58 100644 --- a/src/api/routes/albums/link/linkPOST.js +++ b/src/api/routes/albums/link/linkPOST.js @@ -63,7 +63,7 @@ class linkPOST extends Route { expiresAt: null, views: 0 }; - await db.table('links').insert(insertObj); + await db.table('links').insert(insertObj).wasMutated(); return res.json({ message: 'The link was created successfully', -- cgit v1.2.3 From b58e12cad888389b8ae69b6d36357390f35a727d Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Fri, 8 Jan 2021 00:41:43 +0200 Subject: fix: pg driver doesn't return anything without .returning() feat: disable .returning() is not supported warning message, it's useless. --- src/api/routes/albums/albumPOST.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/api/routes/albums') diff --git a/src/api/routes/albums/albumPOST.js b/src/api/routes/albums/albumPOST.js index ec94eb8..04cab1e 100644 --- a/src/api/routes/albums/albumPOST.js +++ b/src/api/routes/albums/albumPOST.js @@ -28,7 +28,11 @@ class albumPOST extends Route { editedAt: now }; - const dbRes = await db.table('albums').insert(insertObj).wasMutated(); + const dbRes = await db + .table('albums') + .insert(insertObj) + .returning('id') + .wasMutated(); insertObj.id = dbRes.pop(); -- cgit v1.2.3