Finished testing api

app/api/budget-transaction/budget-transaction-api.js

@@ -1,14 +1,19 @@
 const _ = require('lodash');
 const apiOptions = require('../../lib/endpoint/api-options');
 const RestError = require('../../lib/error');
-const { handleTransactionError, validateBudgetDependencies } = require('../../lib/budget');
+const {
+  handleTransactionError,
+  validateBudgetDependencies,
+  validateCompanyDepartment
+} = require('../../lib/budget');
 
 class BudgetTransactionAPI {
   constructor(options) {
     apiOptions.apply(this, [options]);
   }
 
   async query(budgetTransactionQuery) {
+    await validateCompanyDepartment(this.db, budgetTransactionQuery);
     if (budgetTransactionQuery.id) {
       // prettier screws up here
       // eslint-disable-next-line max-len

app/api/expense/expense-api.js

@@ -1,13 +1,18 @@
 const apiOptions = require('../../lib/endpoint/api-options');
 const RestError = require('../../lib/error');
-const { handleTransactionError, validateBudgetDependencies } = require('../../lib/budget');
+const {
+  handleTransactionError,
+  validateBudgetDependencies,
+  validateCompanyDepartment
+} = require('../../lib/budget');
 
 class ExpenseAPI {
   constructor(options) {
     apiOptions.apply(this, [options]);
   }
 
   async query(expenseQuery) {
+    await validateCompanyDepartment(this.db, expenseQuery);
     if (expenseQuery.id) {
       // prettier screws up here
       // eslint-disable-next-line max-len
@@ -24,13 +29,22 @@ class ExpenseAPI {
       return expense;
     }
     const query = {
-      attributes: ['id', 'amount', 'concept', 'date', 'createdAt', 'updatedAt'],
+      attributes: [
+        'id',
+        'amount',
+        'concept',
+        'date',
+        'department',
+        'user',
+        'createdAt',
+        'updatedAt'
+      ],
       include: [
         {
           model: this.db.Department,
           required: true,
           where: {
-            department: expenseQuery.department
+            id: expenseQuery.department
           }
         }
       ],
@@ -40,7 +54,7 @@ class ExpenseAPI {
       query.include[0].where.company = expenseQuery.company;
     }
     if (expenseQuery.from) {
-      query.where.$or = [
+      query.where.$and = [
         {
           date: {
             $gte: expenseQuery.from
@@ -56,10 +70,10 @@ class ExpenseAPI {
           }
         }
       ];
-      if (query.where.$or) {
-        query.where.$or = query.where.$or.concat(condition);
+      if (query.where.$and) {
+        query.where.$and = query.where.$and.concat(condition);
       } else {
-        query.where.$or = condition;
+        query.where.$and = condition;
       }
     }
     const expenses = await this.db.Expense.findAll(query);
@@ -72,7 +86,8 @@ class ExpenseAPI {
     const { departmentBudget } = await this._validateDependencies(prospect);
     try {
       transaction = await this.db.sequelize.transaction({ autocommit: false });
-      expense = await this.db.Expense.create(prospect, { transaction });
+      const expenseTemplate = Object.assign({}, prospect, { user: this.user.id });
+      expense = await this.db.Expense.create(expenseTemplate, { transaction });
       this._applyExpense(departmentBudget, expense);
       await departmentBudget.save({ transaction });
       await transaction.commit();
@@ -103,7 +118,8 @@ class ExpenseAPI {
 
   async remove(toDelete) {
     let transaction;
-    let expense;
+    const expense = await this.query({ id: toDelete.id });
+    toDelete.date = expense.date;
     const { originalExpense, departmentBudget } = await this._validateDependencies(toDelete);
     try {
       transaction = await this.db.sequelize.transaction({ autocommit: false });

app/lib/budget/index.js

@@ -1,17 +1,25 @@
 const RestError = require('../error');
 
-const validateBudgetDependencies = async function (db, prospect) {
+const validateCompanyDepartment = async function (db, prospect) {
   let company;
+  let department;
   if (prospect.company) {
     company = await db.Company.findById(prospect.company);
     if (!company) {
       throw new RestError(404, { message: `Company ${prospect.company} does not exist` });
     }
   }
-  const department = await db.Department.findById(prospect.department);
-  if (!department || (company && department.company !== company.id)) {
-    throw new RestError(404, { message: `Department ${prospect.department} does not exist` });
+  if (prospect.department) {
+    department = await db.Department.findById(prospect.department);
+    if (!department || (company && department.company !== company.id)) {
+      throw new RestError(404, { message: `Department ${prospect.department} does not exist` });
+    }
   }
+  return { company, department };
+};
+
+const validateBudgetDependencies = async function (db, prospect) {
+  const { company, department } = await validateCompanyDepartment(db, prospect);
   const departmentBudget = await db.Budget.findOne({
     where: {
       department: prospect.department,
@@ -55,5 +63,6 @@ const handleTransactionError = async function (err, transaction, errMessage, log
 
 module.exports = {
   handleTransactionError,
-  validateBudgetDependencies
+  validateBudgetDependencies,
+  validateCompanyDepartment
 };

app/lib/db/migrations/20171226200206-create-expense-details.js → app/lib/db/migrations/20171226200206-create-expense.js

@@ -29,6 +29,15 @@ module.exports = {
             type: Sequelize.DATE,
             allowNull: false
           },
+          user_id: {
+            type: Sequelize.BIGINT.UNSIGNED,
+            allowNull: false,
+            references: {
+              model: 'users',
+              key: 'id',
+              onDelete: 'CASCADE'
+            }
+          },
           department_id: {
             type: Sequelize.BIGINT.UNSIGNED,
             allowNull: false,

app/lib/db/models/expense.js

@@ -49,6 +49,13 @@ module.exports = function (sequelize, DataTypes) {
   );
 
   Expense.associate = (models) => {
+    Expense.belongsTo(models.User, {
+      foreignKey: {
+        allowNull: false,
+        name: 'user',
+        field: 'user_id'
+      }
+    });
     Expense.belongsTo(models.Department, {
       foreignKey: {
         allowNull: false,

test/api/auth/auth-api.test.js

@@ -53,7 +53,7 @@ describe('AuthAPI', () => {
 
   it('should throw a 401 if no user matches', async () => {
     const credentials = {
-      email: 'unexisting@email.com',
+      email: 'inexisting@email.com',
       password: 'wrongPassword'
     };
     await _failureLoginTest(credentials);

test/api/budget-transaction/budget-transaction-api.test.js

@@ -72,6 +72,50 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql('Budget transaction does not exist');
   });
 
+  it('should throw a 404 if department does not exist', async () => {
+    const btAPI = createBudgetTransactionAPI();
+    let errThrown;
+    const badId = -1;
+    try {
+      await btAPI.query({ department: badId });
+    } catch (err) {
+      errThrown = err;
+    }
+    expect(errThrown).to.exist;
+    expect(errThrown.code).to.eql(404);
+    expect(errThrown.message).to.eql(`Department ${badId} does not exist`);
+  });
+
+  it('should throw a 404 if company does not exist', async () => {
+    const btAPI = createBudgetTransactionAPI();
+    let errThrown;
+    const badId = -1;
+    try {
+      await btAPI.query({ department: department.id, company: badId });
+    } catch (err) {
+      errThrown = err;
+    }
+    expect(errThrown).to.exist;
+    expect(errThrown.code).to.eql(404);
+    expect(errThrown.message).to.eql(`Company ${badId} does not exist`);
+  });
+
+  it('should throw a 404 if department does not belong to the company', async () => {
+    const btAPI = createBudgetTransactionAPI();
+    let errThrown;
+    const newCompany = await db.Company.create({
+      name: 'C2'
+    });
+    try {
+      await btAPI.query({ department: department.id, company: newCompany.id });
+    } catch (err) {
+      errThrown = err;
+    }
+    expect(errThrown).to.exist;
+    expect(errThrown.code).to.eql(404);
+    expect(errThrown.message).to.eql(`Department ${department.id} does not exist`);
+  });
+
   it('should return a budget transaction by id', async () => {
     const btAPI = createBudgetTransactionAPI();
     const newBt = await db.BudgetTransaction.create({
@@ -196,7 +240,7 @@ describe('BudgetTransactionAPI', () => {
     });
   });
 
-  it('should throw 404 when creating budget transaction with an unexisting department', async () => {
+  it('should throw 404 when creating budget transaction with an inexisting department', async () => {
     const btAPI = createBudgetTransactionAPI();
     let errThrown;
     const badId = -1;
@@ -215,7 +259,7 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql(`Department ${badId} does not exist`);
   });
 
-  it('should throw 404 when creating budget transaction with an unexisting company', async () => {
+  it('should throw 404 when creating budget transaction with an inexisting company', async () => {
     const btAPI = createBudgetTransactionAPI();
     let errThrown;
     const badId = -1;
@@ -311,7 +355,7 @@ describe('BudgetTransactionAPI', () => {
     expect(dbBudget.expenses).to.eql(0);
   });
 
-  it('should throw 404 when editing budget transaction with an unexisting department', async () => {
+  it('should throw 404 when editing budget transaction with an inexisting department', async () => {
     const btAPI = createBudgetTransactionAPI();
     let errThrown;
     const badId = -1;
@@ -338,7 +382,7 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql(`Department ${badId} does not exist`);
   });
 
-  it('should throw 404 when editing budget transaction with an unexisting company', async () => {
+  it('should throw 404 when editing budget transaction with an inexisting company', async () => {
     const btAPI = createBudgetTransactionAPI();
     let errThrown;
     const badId = -1;
@@ -366,7 +410,7 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql(`Company ${badId} does not exist`);
   });
 
-  it('should throw 404 when editing budget transaction with an unexisting company', async () => {
+  it('should throw 404 when editing budget transaction with an inexisting company', async () => {
     const btAPI = createBudgetTransactionAPI();
     let errThrown;
     const newCompany = await db.Company.create({
@@ -396,7 +440,7 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql(`Department ${department.id} does not exist`);
   });
 
-  it('should throw 404 when editing budget transaction with an unexisting budget transaction', async () => {
+  it('should throw 404 when editing budget transaction with an inexisting budget transaction', async () => {
     const btAPI = createBudgetTransactionAPI();
     let errThrown;
     const badId = -1;
@@ -478,7 +522,7 @@ describe('BudgetTransactionAPI', () => {
     expect(b.allocatedAmount).to.eql(0);
   });
 
-  it('should throw 404 when removing budget transaction with an unexisting department', async () => {
+  it('should throw 404 when removing budget transaction with an inexisting department', async () => {
     let errThrown;
     const btAPI = createBudgetTransactionAPI();
     const badId = -1;
@@ -498,7 +542,7 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql(`Department ${badId} does not exist`);
   });
 
-  it('should throw 404 when removing budget transaction with an unexisting company', async () => {
+  it('should throw 404 when removing budget transaction with an inexisting company', async () => {
     let errThrown;
     const btAPI = createBudgetTransactionAPI();
     const badId = -1;
@@ -540,7 +584,7 @@ describe('BudgetTransactionAPI', () => {
     expect(errThrown.message).to.eql(`Department ${department.id} does not exist`);
   });
 
-  it('should throw 404 when removing budget transaction with an unexisting budget transaction', async () => {
+  it('should throw 404 when removing budget transaction with an inexisting budget transaction', async () => {
     let errThrown;
     const btAPI = createBudgetTransactionAPI();
     const badId = -1;

test/api/department/department-api.test.js

@@ -235,6 +235,7 @@ describe('DepartmentAPI', () => {
     });
     const expense = await db.Expense.create({
       department,
+      user: user.id,
       amount: 50,
       concept: 'test concept',
       date: moment.utc().startOf('day')