chore: merge pull request #1 from AEGEE/add-categories

Add categories

CHANGELOG.md

@@ -1,3 +1,18 @@
+# [0.5.0](https://github.com/AEGEE/oms-discounts/compare/0.4.2...0.5.0) (2019-05-18)
+
+
+### Bug Fixes
+
+* **categories:** fixed categories endpoints ([08320a0](https://github.com/AEGEE/oms-discounts/commit/08320a0))
+
+
+### Features
+
+* **discounts:** added categories. Fixes MEMB-529 ([67d7380](https://github.com/AEGEE/oms-discounts/commit/67d7380))
+* **test:** testing categories CRUD ([53af8e7](https://github.com/AEGEE/oms-discounts/commit/53af8e7))
+
+
+
 ## [0.4.2](https://github.com/AEGEE/oms-discounts/compare/0.4.1...0.4.2) (2019-05-03)
 
 

lib/categories.js

@@ -0,0 +1,75 @@
+const { Category } = require('../models');
+const errors = require('./errors');
+const helpers = require('./helpers');
+
+exports.createCategory = async (req, res) => {
+ if (!req.permissions.manage_discounts) {
+ return errors.makeForbiddenError(res, 'You are not allowed to create integrations.');
+ }
+
+ const category = await Category.create(req.body);
+
+ return res.json({
+ success: true,
+ data: category
+ });
+};
+
+exports.listAllCategories = async (req, res) => {
+ const categories = await Category.findAll({});
+
+ return res.json({
+ success: true,
+ data: categories
+ });
+};
+
+exports.findCategory = async (req, res, next) => {
+ const isNumber = helpers.isNumber(req.params.category_id);
+
+ if (!isNumber) {
+ return errors.makeBadRequestError(res, 'The category ID is not a number.');
+ }
+
+ const category = await Category.findOne({ where: { id: Number(req.params.category_id) } });
+
+ if (!category) {
+ return errors.makeNotFoundError(res, 'The category is not found.');
+ }
+
+ req.category = category;
+ return next();
+};
+
+exports.getCategory = async (req, res) => {
+ return res.json({
+ success: true,
+ data: req.category
+ });
+};
+
+exports.updateCategory = async (req, res) => {
+ if (!req.permissions.manage_discounts) {
+ return errors.makeForbiddenError(res, 'You are not allowed to update category.');
+ }
+
+ await req.category.update(req.body);
+
+ return res.json({
+ success: true,
+ data: req.category
+ });
+};
+
+exports.deleteCategory = async (req, res) => {
+ if (!req.permissions.manage_discounts) {
+ return errors.makeForbiddenError(res, 'You are not allowed to delete category.');
+ }
+
+ await req.category.destroy();
+
+ return res.json({
+ success: true,
+ data: req.category
+ });
+};

lib/helpers.js

@@ -17,7 +17,7 @@ exports.isNumber = (value) => {
  return false;
 };
 
-exports.getMailText = ({ code, integration, user}) => {
+exports.getMailText = ({ code, integration, user }) => {
  return `Hey ${user.first_name},<br/>
  <br/>
 You've claimed the code for the discount, here are the details.<br/>
@@ -29,7 +29,7 @@ Claimed on: ${moment(code.updated_at).format('YYYY-MM-DD HH:MM')}<br/>
 ${integration.description}<br/>
 <br/>
 Sincerely yours,<br/>
-MyAEGEE discounts team.`
+MyAEGEE discounts team.`;
 };
 
 // A helper to determine if user has permission.

lib/integrations.js

@@ -67,7 +67,7 @@ exports.updateIntegration = async (req, res) => {
 
 exports.deleteIntegration = async (req, res) => {
  if (!req.permissions.manage_discounts) {
- return errors.makeForbiddenError(res, 'You are not allowed to update integration.');
+ return errors.makeForbiddenError(res, 'You are not allowed to delete integration.');
  }
 
  await req.integration.destroy();

lib/server.js

@@ -8,6 +8,7 @@ const bugsnag = require('./bugsnag');
 const morgan = require('./morgan');
 const middlewares = require('./middlewares');
 const integrations = require('./integrations');
+const categories = require('./categories');
 const db = require('./sequelize');
 
 const server = express();
@@ -26,6 +27,8 @@ process.on('unhandledRejection', (err) => {
 });
 
 GeneralRouter.use(middlewares.authenticateUser);
+
+// integrations and codes
 GeneralRouter.get('/integrations', integrations.listAllIntegrations);
 GeneralRouter.post('/integrations', integrations.createIntegration);
 GeneralRouter.post('/integrations/:integration_id/codes', integrations.findIntegration, integrations.addCodesToIntegration);
@@ -36,6 +39,13 @@ GeneralRouter.delete('/integrations/:integration_id', integrations.findIntegrati
 
 GeneralRouter.get('/codes/mine', integrations.getMyCodes);
 
+// categories and discounts (for listing to members)
+GeneralRouter.get('/categories', categories.listAllCategories);
+GeneralRouter.post('/categories', categories.createCategory);
+GeneralRouter.get('/categories/:category_id', categories.findCategory, categories.getCategory);
+GeneralRouter.put('/categories/:category_id', categories.findCategory, categories.updateCategory);
+GeneralRouter.delete('/categories/:category_id', categories.findCategory, categories.deleteCategory);
+
 server.use('/', GeneralRouter);
 server.use(middlewares.notFound);
 server.use(middlewares.errorHandler);

migrations/20190518200032-create-category.js

@@ -0,0 +1,27 @@
+module.exports = {
+ up: (queryInterface, Sequelize) => queryInterface.createTable('categories', {
+ id: {
+ allowNull: false,
+ autoIncrement: true,
+ primaryKey: true,
+ type: Sequelize.INTEGER
+ },
+ name: {
+ allowNull: false,
+ type: Sequelize.STRING
+ },
+ discounts: {
+ allowNull: false,
+ type: Sequelize.JSONB
+ },
+ created_at: {
+ allowNull: false,
+ type: Sequelize.DATE
+ },
+ updated_at: {
+ allowNull: false,
+ type: Sequelize.DATE
+ }
+ }),
+ down: queryInterface => queryInterface.dropTable('categories')
+};

models/Category.js

@@ -0,0 +1,38 @@
+const Joi = require('joi');
+const { Sequelize, sequelize } = require('../lib/sequelize');
+
+const categoriesSchema = Joi.array().min(1).items(Joi.object().keys({
+ icon: Joi.string().trim().required(),
+ name: Joi.string().trim().required(),
+ shortDescription: Joi.string().trim().required(),
+ longDescription: Joi.string().trim().required(),
+}));
+
+const Category = sequelize.define('category', {
+ name: {
+ type: Sequelize.STRING,
+ allowNull: false,
+ defaultValue: '',
+ validate: {
+ notEmpty: { msg: 'Name should be set.' },
+ },
+ },
+ discounts: {
+ type: Sequelize.JSONB,
+ allowNull: false,
+ defaultValue: '',
+ validate: {
+ isValid(categoriesValue) {
+ const { error, value } = Joi.validate(categoriesValue, categoriesSchema);
+ if (error) {
+ throw error;
+ }
+
+ // eslint-disable-next-line no-param-reassign
+ categoriesValue = value;
+ }
+ },
+ }
+}, { underscored: true, tableName: 'categories' });
+
+module.exports = Category;

models/index.js

@@ -1,10 +1,12 @@
 const Integration = require('./Integration');
 const Code = require('./Code');
+const Category = require('./Category');
 
 Integration.hasMany(Code);
 Code.belongsTo(Integration);
 
 module.exports = {
  Integration,
- Code
+ Code,
+ Category
 };