Merge remote-tracking branch 'refs/remotes/origin/main' into main

README.md

@@ -10,6 +10,7 @@ An API centric news server. Uses Sequelize and mariaDB by default.
 # API
 
 ```
+//NOTE: GET will return null if a specific article can't be found
 //NOTE: you can add a "limit" query parameter to change the default limit
 GET /news?limit=10
 

package.json

@@ -4,7 +4,7 @@
   "description": "An API centric news server. Uses Sequelize and mariaDB by default.",
   "main": "server/server.js",
   "scripts": {
-    "start": "node server/server.js",
+    "start": "pm2 start server/server.js --watch",
     "dev": "npm run watch:server",
     "watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'"
   },

server/news/query.js

@@ -1,3 +1,4 @@
+const { Op } = require('sequelize');
 const { articles } = require('../database/models');
 
 //the query function that can be reused
@@ -8,13 +9,14 @@ const query = (ascending, titlesOnly) => async (req, res) => {
 			attributes: [
 				'index', 'title', 'author', ...(!titlesOnly ? ['body', 'edits'] : [])
 			],
-			order: [
+			where: {
-				['index', ascending ? 'ASC' : 'DESC']
+				index: {
-			],
+					[Op.eq]: ascending ? parseInt(req.params.id) : (await articles.max('index')) - parseInt(req.params.id) + 1
-			offset: parseInt(req.query.id) || 0,
+				}
-			limit: 1
+			}
 		});
 
+		//returns null if failed to find
 		return res.status(200).json(result);
 	}
 
@@ -34,4 +36,4 @@ const query = (ascending, titlesOnly) => async (req, res) => {
 	}
 };
 
-module.exports = query;
+module.exports = query;