Marketplace actually fixed now

This commit is contained in:
Troplo 2021-01-17 17:30:10 +11:00
parent 5265d798a8
commit 9c52b4d1ff

View file

@ -67,6 +67,7 @@ router.get('/:category', async(req, res, next) => {
let threads, threadsLatestPost, resThreads, user
let { from } = pagination.getPaginationProps(req.query, true)
let offset = Number.isInteger(+req.query.offset) ? +req.query.offset : 0;
console.log(offset)
let limit = 30
if(req.query.username) {
@ -77,6 +78,9 @@ router.get('/:category', async(req, res, next) => {
let options = {
model: Item,
order: [['id', order]],
limit: 30,
offset: offset,
subQuery: false,
where: {deleted: false, approved: true},
include: [
{ model: User, attributes: ['username', 'createdAt', 'id', 'color', 'picture', 'locked', 'admin', 'booster', 'executive', 'bot'] },
@ -99,17 +103,10 @@ router.get('/:category', async(req, res, next) => {
} else {
threads = await ItemCategory.findOne({
where: { id: req.params.category },
offset: offset,
include: threadInclude('ASC')
})
threadsLatestPost = await ItemCategory.findOne({
where: { id: req.params.category },
offset: offset,
include: threadInclude('DESC')
})
}
if(!threads) res.json({success: false, message: 'Reached the end'})
console.log(threads)
if(Array.isArray(threads)) {
resThreads = {
name: 'All',
@ -123,24 +120,6 @@ router.get('/:category', async(req, res, next) => {
resThreads = threads.toJSON()
resThreads.meta = {}
}
threadsLatestPost.Items.forEach((thread) => {
resThreads.Items.push()
})
let nextId = await pagination.getNextIdDesc(Item, resThreads.Items.id, resThreads.Items)
if(nextId) {
resThreads.meta.nextURL =
`/api/v1/marketplace/${req.params.category}?&limit=${limit}&offset=${nextId - 1}`
resThreads.meta.nextThreadsCount = await pagination.getNextCount(
Item, resThreads.Items, limit,
user ? { userId: user.id } : {},
true
)
} else {
resThreads.meta.nextURL = null
resThreads.meta.nextThreadsCount = 0
}
res.json(resThreads)