expense, mess user controller code refactored

mirajehossain · Feb 20, 2019 · 3d210be · 3d210be
1 parent 49a0a2c
commit 3d210be
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 62 deletions.
diff --git a/app/modules/expense/expense.controller.js b/app/modules/expense/expense.controller.js
@@ -1,13 1,17 @@
-let response = require('../../../helper/response');
-let ExpenseLib = require('./expense.lib');
 const response = require('../../../helper/response');
 const ExpenseLib = require('./expense.lib');
 
 const date = new Date(), y = date.getFullYear(), m = date.getMonth();
 const currentMonthFirstDate = new Date(y, m, 1).toISOString();
 const currentMonthLastDate = new Date(y, m   1, 0).toISOString();
 
 class ExpenseController{
  constructor(){};
  static async addExpense(req,res){
  try {
  let expenseObject = req.body;
- let date = new Date(req.body.date).toISOString();
  expenseObject.messId = req.auth.messId;
- expenseObject.date = date; /// date formate "10/22/2018"
  expenseObject.date = new Date(req.body.date).toISOString(); /// date formate "10/22/2018"
  const result = await ExpenseLib.addExpense(expenseObject);
  return res.status(200).json(response.single(true,`You are add ${result.amount} amount on your Expense`, result));
  } catch (e) {
@@ -17,26 21,16 @@ class ExpenseController{
 
  static async totalMessExpense(req,res){
  try {
- let messId = req.auth.messId;
- const date = new Date(), y = date.getFullYear(), m = date.getMonth();
- const currentMonthFirstDate = new Date(y, m, 1).toISOString();
- const currentMonthLastDate = new Date(y, m   1, 0).toISOString();
-
- const expense = await ExpenseLib.totalMessExpense(currentMonthFirstDate, currentMonthLastDate, messId);
  const expense = await ExpenseLib.totalMessExpense(currentMonthFirstDate, currentMonthLastDate, req.auth.messId);
  return res.status(200).json(response.single(true, `Total expense of mess: ${expense.total} `, expense));
-
  } catch (e) {
  return res.status(500).json(response.error(false,"An error occur",`${e}`));
  }
  }
 
  static async totalMealExpense(req,res){
  try {
- const messId = req.auth.messId;
- const date = new Date(), y = date.getFullYear(), m = date.getMonth();
- const currentMonthFirstDate = new Date(y, m, 1).toISOString();
- const currentMonthLastDate = new Date(y, m   1, 0).toISOString();
- const expense = await ExpenseLib.totalMealExpense(currentMonthFirstDate, currentMonthLastDate, messId);
  const expense = await ExpenseLib.totalMealExpense(currentMonthFirstDate, currentMonthLastDate, req.auth.messId);
  return res.status(200).json(response.single(true, `Total expense of mess: ${expense.total} `, expense));
 
  } catch (e) {
@@ -46,12 40,7 @@ class ExpenseController{
 
  static async categoryWiseExpense(req, res){
  try {
- let categoryId = req.params.categoryId;
- const date = new Date(), y = date.getFullYear(), m = date.getMonth();
- const currentMonthFirstDate = new Date(y, m, 1).toISOString();
- const currentMonthLastDate = new Date(y, m   1, 0).toISOString();
-
- const expense = await ExpenseLib.categoryWiseExpense(currentMonthFirstDate, currentMonthLastDate, categoryId);
  const expense = await ExpenseLib.categoryWiseExpense(currentMonthFirstDate, currentMonthLastDate, req.params.categoryId);
  return res.status(200).json(response.single(true, `Expense amount of the categories is: ${expense.total} `, expense));
  } catch (e) {
  return res.status(500).json(response.error(false,"An error occur",`${e}`));
@@ -60,42 49,20 @@ class ExpenseController{
 
  static async updateExpense(req, res){
  try {
- const expenseId = req.params.expenseId;
- const body = req.body;
- const expense = await ExpenseLib.updateExpense(expenseId, body);
  const expense = await ExpenseLib.updateExpense(req.params.expenseId, req.body);
  return res.status(200).json(response.single(true, `Your updated expense is: ${expense.amount} `, expense));
  } catch (e) {
  return res.status(500).json(response.error(false,"An error occur",`${e}`));
  }
  }
  static async deleteExpense(req, res){
  try {
- const expenseId = req.params.expenseId;
- await ExpenseLib.deleteExpense(expenseId);
  await ExpenseLib.deleteExpense(req.params.expenseId);
  return res.status(200).json(response.single(true, `Delete expense successfully`));
  } catch (e) {
  return res.status(500).json(response.error(false,"An error occur",`${e}`));
  }
  }
- /*
- async totalExpenseInMonth(req, res) {
- try {
- const messId = req.auth.messId;
- const date = new Date(), y = date.getFullYear(), m = date.getMonth();
- const currentMonthFirstDate = new Date(y, m, 1).toISOString();
- const currentMonthLastDate = new Date(y, m 1, 0).toISOString();
- const result = await super.totalExpenseInMonth(currentMonthFirstDate, currentMonthLastDate, messId);
- if(result instanceof Error)
- return res.status(400).json(response.error(false,`${result}`, `${result}`));
- else
- return res.status(200).json(response.single(true, 'Total expense', result));
-
- } catch (e) {
- return res.status(400).json(response.error(false, 'An error occur', `${e}`));
- }
- };
- */
-
 }
 
 module.exports = ExpenseController;
diff --git a/app/modules/mess/mess.controller.js b/app/modules/mess/mess.controller.js
@@ -1,33 1,25 @@
-let response = require('../../../helper/response');
 const response = require('../../../helper/response');
 const MessLib = require('./mess.lib');
 
 const date = new Date(), y = date.getFullYear(), m = date.getMonth();
 const currentMonthFirstDate = new Date(y, m, 1).toISOString();
 const currentMonthLastDate = new Date(y, m   1, 0).toISOString();
 
 class MessController {
  constructor(){};
 
  static async userSummary(req,res) {
  try {
- let userId = req.params.userId;
- let messId = req.auth.messId;
- const date = new Date(), y = date.getFullYear(), m = date.getMonth();
- const currentMonthFirstDate = new Date(y, m, 1).toISOString();
- const currentMonthLastDate = new Date(y, m   1, 0).toISOString();
- const summary = await MessLib.userSummary(currentMonthFirstDate, currentMonthLastDate, userId, messId);
  const summary = await MessLib.userSummary(currentMonthFirstDate, currentMonthLastDate, req.params.userId, req.auth.messId);
  return res.status(200).json(response.single(true, `User Summary `, summary));
  } catch (e) {
  return res.status(400).json(response.error(false,"An error occur",`${e}`));
  }
  };
  static async messSummary(req,res){
  try {
- let firstDate = req.body.firstDate;
- let lastDate = req.body.lastDate;
- const messId = req.auth.messId;
- const date = new Date(), y = date.getFullYear(), m = date.getMonth();
- const currentMonthFirstDate = firstDate || new Date(y, m, 1).toISOString();
- const currentMonthLastDate = lastDate || new Date(y, m   1, 0).toISOString();
- const summary = await MessLib.messSummary(currentMonthFirstDate, currentMonthLastDate, messId);
  const summary = await MessLib.messSummary(req.body.firstDate, req.body.lastDate, req.auth.messId);
  return res.status(200).json(response.single(true, `Mess Summary `, summary));
-
  } catch (e) {
  return res.status(400).json(response.error(false,"An error occur",`${e}`));
  }

diff --git a/app/modules/user/user.controller.js b/app/modules/user/user.controller.js
@@ -12,7 12,7 @@ class UserController {
  }
  return res.status(200).json(response.error(false, userData.message));
  } catch (e) {
- return res.status(50).json(response.error(false, 'An error occur', `${e}`));
  return res.status(500).json(response.error(false, 'An error occur', `${e}`));
  }
  }