krgamestudios/news-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Brought into line with JWT protocol

Browse Source 
Resolved #2
This commit is contained in:
Kayne Ruse
2021-03-07 13:53:29 +11:00
parent f919af4248
commit 67a1c744ae
20 changed files with 479 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/news/query.js
+6 -6
View File
@@ -2,12 +2,12 @@ const { Op } = require('sequelize');
const { articles } = require('../database/models');
//the query function that can be reused
const query = (ascending, titlesOnly) => async (req, res) => {
//specific search
const query = (ascending, metadataOnly) => async (req, res) => {
//specific search (id is defined)
if (req.params.id && typeof(parseInt(req.params.id)) === 'number') {
const result = await articles.findOne({
attributes: [
'index', 'title', 'author', 'edits', 'createdAt', 'updatedAt', ...(!titlesOnly ? ['body'] : [])
'index', 'title', 'author', 'edits', 'createdAt', 'updatedAt', ...(!metadataOnly ? ['body'] : [])
],
where: {
index: {
@@ -16,15 +16,15 @@ const query = (ascending, titlesOnly) => async (req, res) => {
}
});
//returns null if failed to find
return res.status(200).json(result);
//result is null if failed to find
return res.status(200).json(result || []);
}
//default search
else {
const result = await articles.findAndCountAll({
attributes: [
'index', 'title', 'author', 'edits', 'createdAt', 'updatedAt', ...(!titlesOnly ? ['body'] : [])
'index', 'title', 'author', 'edits', 'createdAt', 'updatedAt', ...(!metadataOnly ? ['body'] : [])
],
order: [
['index', ascending ? 'ASC' : 'DESC']