Fix bugs

models/category.js

@@ -25,28 +25,6 @@ module.exports = (sequelize, DataTypes) => {
 		classMethods: {
 			associate (models) {
 				Category.hasMany(models.Thread)
-			},
-			includeOptions (order, threadLimit, where, from) {
-				let models = sequelize.models
-				let options = {
-					model: models.Thread,
-					where: {
-						id: { $gt: from || -1 },
-						userId: where.userId
-					},
-					include: [
-						models.Category,
-						{ model: models.User, attributes: ['username', 'createdAt', 'id', 'color'] }, 
-						{
-							model: models.Post, limit: 1, order: [['id', order]], include:
-							[{ model: models.User, attributes: ['username', 'id'] }]
-						}
-					]
-				}
-
-				if(threadLimit) options.limit = threadLimit
-
-				return [options]
 			}
 		}
 	})

routes/category.js

@@ -7,10 +7,7 @@ let { Category, Post, Thread, User } = require('../models')
 
 router.get('/', async (req, res) => {
 	try {
-		let categories = await Category.findAll({
-			attributes: { exclude: ['id'] },
-			include: Category.includeOptions('ASC', 1)
-		})
+		let categories = await Category.findAll()
 
 		res.json(categories)
 	} catch (e) {
@@ -24,38 +21,62 @@ router.get('/', async (req, res) => {
 
 
 router.get('/:category', async (req, res) => {
+	function concatenateThreads(threads) {
+		let processedThreads = []
+		
+		threads.forEach(category => {
+			let jsonCategory = category.toJSON()
+			processedThreads.push(...jsonCategory.Threads)
+		})
+
+		return processedThreads
+	}
+
 	try {
-		let threads, threadsLatestPost, resThreads
+		let threads, threadsLatestPost, resThreads, user
 		let { from, limit } = pagination.getPaginationProps(req.query)
-		let where = {}
-		
+
 		if(req.query.username) {
-			where.userId = await User.findOne({ where: { 'username': req.query.username } }).userId
+			user = await User.findOne({ where: { username: req.query.username }})
 		}
 
-		function concatenateThreads(threads) {
-			let processedThreads = []
-			
-			threads.forEach(category => {
-				let jsonCategory = category.toJSON()
-				processedThreads.push(...jsonCategory.Threads)
-			})
+		function threadInclude(order) {
+			let options = {
+				model: Thread,
+				limit,
+				where: {
+					id: { $gte: from }
+					
+				},
+				include: [
+					Category,
+					{ model: User, attributes: ['username', 'createdAt', 'id', 'color'] }, 
+					{
+						model: Post, limit: 1, order: [['id', order]], include:
+						[{ model: User, attributes: ['username', 'id'] }]
+					}
+				]
+			}
+
+			if(user) {
+				options.where.userId = user.id
+			}
 
-			return processedThreads
+			return [options]
 		}
 
 		if(req.params.category === 'ALL') {
-			threads = await Category.findAll({ include: Category.includeOptions('ASC', limit, where, from) })
-			threadsLatestPost = await Category.findAll({ include: Category.includeOptions('DESC', limit, where, from) })
+			threads = await Category.findAll({ include: threadInclude('ASC') })
+			threadsLatestPost = await Category.findAll({ include: threadInclude('DESC') })
 		} else {
 			threads = await Category.findOne({
 				where: { name: req.params.category },
-				include: Category.includeOptions('ASC', limit, where, from)
+				include: threadInclude('ASC')
 			})
 
 			threadsLatestPost = await Category.findOne({
 				where: { name: req.params.category },
-				include: Category.includeOptions('DESC', limit, where, from)
+				include: threadInclude('DESC')
 			})
 		}
 
@@ -85,18 +106,19 @@ router.get('/:category', async (req, res) => {
 		})
 
 
-		let nextId = await pagination.getNextId(Thread, where, resThreads.Threads)
+		let nextId = await pagination.getNextId(Thread, user ? { userId: user.id } : {}, resThreads.Threads)
 
 		if(nextId) {
 			resThreads.meta.nextURL =
-				`/api/v1/category/${req.params.category}?&limit=${limit}&from=${nextId}`
+				`/api/v1/category/${req.params.category}?&limit=${limit}&from=${nextId + 1}`
 
-			if(req.query.username) {
-				resThreads.meta.nextURL += '&username=' + req.query.username
+			if(user) {
+				resThreads.meta.nextURL += '&username=' + user.username
 			}
 
 			resThreads.meta.nextThreadsCount = await pagination.getNextCount(
-				Thread, resThreads.Threads, limit, where
+				Thread, resThreads.Threads, limit,
+				{ userId: user.id }
 			)
 		} else {
 			resThreads.meta.nextURL = null

routes/user.js

@@ -150,7 +150,13 @@ router.get('/:username', async (req, res) => {
 
 			res.json(resUser)
 		} else if(req.query.threads) {
-			res.redirect('/api/v1/category/ALL?username=' + req.params.username)
+			let queryString = ''
+
+			Object.keys(req.query).forEach(query => {
+				queryString += `&${query}=${req.query[query]}`
+			})
+
+			res.redirect('/api/v1/category/ALL?username=' + req.params.username + queryString)
 		} else {
 			let user = await User.findOne(queryObj)
 			if(!user) throw Errors.accountDoesNotExist

test/user.js

@@ -398,8 +398,6 @@ describe('User', () => {
 			}
 
 			let pageOne = await agent.get('/api/v1/user/threadaccount?threads=true')
-			console.log(pageOne.body)
-
 			let pageTwo = await agent.get(pageOne.body.meta.nextURL)
 			let pageInvalid = await agent.get('/api/v1/user/threadaccount?threads=true&from=100')