From 5558ea16844edd63decac30503feb58eeb256100 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 21 Aug 2019 16:04:34 +0200 Subject: [PATCH] blog --- modules/blog/blog.routes.js | 6 ++++-- modules/blog/post.model.js | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/blog/blog.routes.js b/modules/blog/blog.routes.js index 829d82a..dcb5359 100644 --- a/modules/blog/blog.routes.js +++ b/modules/blog/blog.routes.js @@ -45,13 +45,15 @@ routes.get('/admin/posts', isAdministratorUser, SortMiddleware.middleware({ default: "-date" }), blogController.find({ - scopes: ['includeAllStates'], + scopes: ['includeMultimedias', 'includeCategories'], }) ); routes.get('/admin/posts/:id', isLoggedUser, isAdministratorUser, - blogController.findOne() + blogController.findOne({ + scopes: ['includeMultimedias', 'includeCategories'], + }) ); routes.get('/admin/posts/:id/comments', isLoggedUser, diff --git a/modules/blog/post.model.js b/modules/blog/post.model.js index c698a0c..c760742 100644 --- a/modules/blog/post.model.js +++ b/modules/blog/post.model.js @@ -20,13 +20,17 @@ module.exports = function (sequelize, DataTypes) { type: DataTypes.STRING, allowNull: false }, + summary: { + type: DataTypes.TEXT, + allowNull: false + }, content: { type: DataTypes.TEXT, allowNull: false }, link: { type: DataTypes.STRING, - allowNull: false + allowNull: true }, state: { type: DataTypes.STRING, @@ -65,14 +69,15 @@ module.exports = function (sequelize, DataTypes) { foreignKey: 'entityId', as: { singular: 'comment', plural: 'comments' } }); - }; - Post.addScope('includeAllStates', () => { - return { - where: { - state: ['publish', 'draft'] - }, + Post.addScope('includeCategories', () => { + return { + include: [{ + model: sequelize.models.Category, + as: 'categories', + required: false, + }] } });