api Page updated: refactor to make it looks like article

This commit is contained in:
tmshv committed 2020-03-02 04:40:01 +03:00
1 parent 68b7f4225d
commit 348c3baba8
11 files changed
+160 -63

No files matched your search

@@ -2,11 +2,7 @@ import Article from '../core/Article'
import { findArticles } from '../server/articles'
import { Request, Response } from 'express'
import { encodeArticle } from '../factory/article'
const int = (value: string | string[]) => parseInt(Array.isArray(value)
? value[0]
: value
)
import { readQueryInt } from '../lib/url'
export async function getItem(req: Request, res: Response) {
const id = req.params.slug
@@ -23,9 +19,8 @@ export async function getItem(req: Request, res: Response) {
}
export async function getAll(req: Request, res: Response) {
const { query } = req
const page = int(query.page)
const pageSize = int(query.pageSize)
const page = readQueryInt(req, 'page')
const pageSize = readQueryInt(req, 'pageSize')
const data = await findArticles(page, pageSize)
+45 -6
View File
@@ -1,20 +1,27 @@
import { Request, Response } from 'express'
import Page from '../core/Page'
import { dropTrailingSlash, getPathWaterfall } from '../lib/url'
import { dropTrailingSlash, getPathWaterfall, readQueryArray, readQueryInt } from '../lib/url'
import { encodePage } from '../factory/page'
import * as breadcrumb from './breadcrumb'
async function resolveItem(page: Page) {
const breadcrumbs = await breadcrumb.getItems(page.getUrl())
page.setBreadcrumb(breadcrumbs)
return page
}
export async function getItem(req: Request, res: Response) {
const page = dropTrailingSlash(req.query.page)
const breadcrumbs = await breadcrumb.getItems(page)
const resource = await Page.findByUrl(page)
const pageUrl = dropTrailingSlash(req.query.page)
const resource = await Page.findByUrl(pageUrl)
if (resource) {
res.json(encodePage(resource, breadcrumbs))
const page = await resolveItem(resource)
res.json(encodePage(page))
} else {
res.status(404)
res.json({
error: `Resource ${page} not found`
error: `Resource ${pageUrl} not found`
})
}
}
@@ -34,6 +41,38 @@ export async function getAll(req: Request, res: Response) {
}
}
export async function getByTags(req: Request, res: Response) {
const skip = readQueryInt(req, 'skip')
const limit = readQueryInt(req, 'limit')
const tags = readQueryArray(req, 'tag')
if (tags.length === 0) {
res.status(400)
return res.json({
error: `No tags in request`
})
}
const options = { skip, limit }
const models = await Page.find({
tags: { $in: ['event', 'album'] },
}, options)
if (models) {
const pages = await Promise.all(models.map(resolveItem))
const items = pages.map(encodePage)
res.json({
items,
})
} else {
res.status(404)
res.json({
error: `Not found`
})
}
}
export async function getUrls(req: Request, res: Response) {
const data = await Page.find({})