Merge pull request #1 from Zephyrrus/feature/store_refactor

Feature/store refactor

1 files changed, 15 insertions, 7 deletions

diff --git a/src/api/routes/albums/link/linkPOST.js b/src/api/routes/albums/link/linkPOST.js
index 6009922..d58598a 100644
--- a/src/api/routes/albums/link/linkPOST.js
+++ b/src/api/routes/albums/link/linkPOST.js
@@ -14,14 +14,21 @@ class linkPOST extends Route {
 		/*
 			Make sure the album exists
 		*/
-		const exists = await db.table('albums').where({ id: albumId, userId: user.id }).first();
+		const exists = await db
+			.table('albums')
+			.where({ id: albumId, userId: user.id })
+			.first();
 		if (!exists) return res.status(400).json({ message: 'Album doesn\t exist' });
 
 		/*
 			Count the amount of links created for that album already and error out if max was reached
 		*/
-		const count = await db.table('links').where('albumId', albumId).count({ count: 'id' });
-		if (count[0].count >= parseInt(process.env.MAX_LINKS_PER_ALBUM, 10)) return res.status(400).json({ message: 'Maximum links per album reached' });
+		const count = await db
+			.table('links')
+			.where('albumId', albumId)
+			.count({ count: 'id' })
+			.first();
+		if (count >= parseInt(process.env.MAX_LINKS_PER_ALBUM, 10)) return res.status(400).json({ message: 'Maximum links per album reached' });
 
 		/*
 			Try to allocate a new identifier on the db
@@ -30,19 +37,20 @@ class linkPOST extends Route {
 		if (!identifier) return res.status(500).json({ message: 'There was a problem allocating a link for your album' });
 
 		try {
-			await db.table('links').insert({
+			const insertObj = {
 				identifier,
 				userId: user.id,
 				albumId,
 				enabled: true,
 				enableDownload: true,
 				expiresAt: null,
-				views: 0
-			});
+				views: 0,
+			};
+			await db.table('links').insert(insertObj);
 
 			return res.json({
 				message: 'The link was created successfully',
-				identifier
+				data: insertObj,
 			});
 		} catch (error) {
 			return super.error(res, error);