Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions middleware/expenseValidator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const Joi = require('joi');
const currencyService = require('../services/currencyService');

const expenseSchema = Joi.object({
description: Joi.string().trim().max(100).required(),
amount: Joi.number().min(0.01).required(),
currency: Joi.string().uppercase().optional(),
category: Joi.string().valid('food', 'transport', 'entertainment', 'utilities', 'healthcare', 'shopping', 'other').required(),
type: Joi.string().valid('income', 'expense').required(),
merchant: Joi.string().trim().max(50).optional(),
date: Joi.date().optional(),
workspaceId: Joi.string().hex().length(24).optional()
});

const expenseValidator = async (req, res, next) => {
const { error, value } = expenseSchema.validate(req.body);
if (error) return res.status(400).json({ error: error.details[0].message });

const user = req.user; // Assuming auth middleware sets req.user
const expenseCurrency = value.currency || user.preferredCurrency;

if (!currencyService.isValidCurrency(expenseCurrency)) {
return res.status(400).json({ error: 'Invalid currency code' });
}

req.validatedExpense = value;
req.expenseCurrency = expenseCurrency;
next();
};

module.exports = expenseValidator;
64 changes: 64 additions & 0 deletions routes/expenseCreation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
const express = require('express');
const Expense = require('../models/Expense');
const User = require('../models/User');
const expenseValidator = require('../middleware/expenseValidator');
const auth = require('../middleware/auth');
const expenseService = require('../services/expenseService');
const { convertExpenseAmount } = require('../utils/currencyUtils');

const router = express.Router();

// POST new expense for authenticated user
router.post('/', auth, expenseValidator, async (req, res) => {
try {
const user = await User.findById(req.user._id);
const { validatedExpense: value, expenseCurrency } = req;

// Handle auto-categorization
const { finalCategory, autoCategorized } = await expenseService.handleAutoCategorization(value, req.user._id);

// Store original amount and currency
const expenseData = {
...value,
category: finalCategory,
user: value.workspaceId ? req.user._id : req.user._id,
addedBy: req.user._id,
workspace: value.workspaceId || null,
originalAmount: value.amount,
originalCurrency: expenseCurrency,
amount: value.amount,
autoCategorized
};

// Handle currency conversion if needed
const conversionData = await expenseService.handleCurrencyConversion(value.amount, expenseCurrency, user.preferredCurrency);
Object.assign(expenseData, conversionData);

const expense = new Expense(expenseData);
await expense.save();

// Handle approval submission
const { requiresApproval, workflow } = await expenseService.handleApprovalSubmission(expense, req.user._id);

// Handle budget update
const amountForBudget = expenseData.convertedAmount || value.amount;
await expenseService.handleBudgetUpdate(req.user._id, value.type, amountForBudget, value.category);

// Emit real-time update
const io = req.app.get('io');
const expenseForSocket = expenseService.prepareExpenseResponse(expense, user.preferredCurrency);
expenseService.emitRealTimeUpdate(io, req.user._id, 'expense_created', expenseForSocket);

const response = {
...expenseService.prepareExpenseResponse(expense, user.preferredCurrency),
requiresApproval,
workflow: workflow ? { _id: workflow._id, status: workflow.status } : null
};

res.status(201).json(response);
} catch (error) {
res.status(500).json({ error: error.message });
}
});

module.exports = router;
43 changes: 43 additions & 0 deletions routes/expenseExport.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
const express = require('express');
const exportService = require('../services/exportService');
const auth = require('../middleware/auth');

const router = express.Router();

// GET export expenses to CSV
router.get('/export', auth, async (req, res) => {
try {
const { format, startDate, endDate, category } = req.query;

// Validate format
if (format && format !== 'csv') {
return res.status(400).json({ error: 'Only CSV format is supported' });
}

// Get expenses using export service
const expenses = await exportService.getExpensesForExport(req.user._id, {
startDate,
endDate,
category,
type: 'all' // Include both income and expenses
});

if (expenses.length === 0) {
return res.status(404).json({ error: 'No expenses found for the selected filters' });
}

// Generate CSV using ExportService
const csv = exportService.generateCSV(expenses);

// Set CSV headers
res.setHeader('Content-Type', 'text/csv');
res.setHeader('Content-Disposition', 'attachment; filename="expenses.csv"');

res.send(csv);
} catch (error) {
console.error('Export error:', error);
res.status(500).json({ error: 'Failed to export expenses' });
}
});

module.exports = router;
51 changes: 51 additions & 0 deletions routes/expenseUpdate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
const express = require('express');
const Expense = require('../models/Expense');
const User = require('../models/User');
const expenseValidator = require('../middleware/expenseValidator');
const auth = require('../middleware/auth');
const expenseService = require('../services/expenseService');

const router = express.Router();

// PUT update expense for authenticated user
router.put('/:id', auth, expenseValidator, async (req, res) => {
try {
const user = await User.findById(req.user._id);
const { validatedExpense: value, expenseCurrency } = req;

// Prepare update data
const updateData = {
...value,
originalAmount: value.amount,
originalCurrency: expenseCurrency,
amount: value.amount
};

// Handle currency conversion if needed
const conversionData = await expenseService.handleCurrencyConversion(value.amount, expenseCurrency, user.preferredCurrency);
Object.assign(updateData, conversionData);

const expense = await Expense.findOneAndUpdate(
{ _id: req.params.id, user: req.user._id },
updateData,
{ new: true }
);
if (!expense) return res.status(404).json({ error: 'Expense not found' });

// Handle budget update
await expenseService.handleBudgetUpdate(req.user._id, value.type, updateData.convertedAmount || value.amount, value.category);

// Emit real-time update
const io = req.app.get('io');
const expenseForSocket = expenseService.prepareExpenseResponse(expense, user.preferredCurrency);
expenseService.emitRealTimeUpdate(io, req.user._id, 'expense_updated', expenseForSocket);

const response = expenseService.prepareExpenseResponse(expense, user.preferredCurrency);

res.json(response);
} catch (error) {
res.status(500).json({ error: error.message });
}
});

module.exports = router;
3 changes: 3 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ require('dotenv').config();

const authRoutes = require('./routes/auth');
const expenseRoutes = require('./routes/expenses');
const expenseCreationRoutes = require('./routes/expenseCreation');
const expenseUpdateRoutes = require('./routes/expenseUpdate');
const expenseExportRoutes = require('./routes/expenseExport');
const syncRoutes = require('./routes/sync');
const splitsRoutes = require('./routes/splits');
const groupsRoutes = require('./routes/groups');
Expand Down
2 changes: 1 addition & 1 deletion services/budgetService.js
Original file line number Diff line number Diff line change
Expand Up @@ -354,4 +354,4 @@ class BudgetService {
}
}

module.exports = new BudgetService();
module.exports = new BudgetService();
32 changes: 32 additions & 0 deletions utils/currencyUtils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
const currencyService = require('../services/currencyService');

const convertExpenseAmount = async (amount, fromCurrency, toCurrency) => {
if (fromCurrency === toCurrency) {
return { convertedAmount: amount, exchangeRate: 1 };
}
try {
const conversion = await currencyService.convertCurrency(amount, fromCurrency, toCurrency);
return { convertedAmount: conversion.convertedAmount, exchangeRate: conversion.exchangeRate };
} catch (error) {
console.error('Currency conversion failed:', error.message);
return null; // Or throw error, but for now return null to handle gracefully
}
};

const prepareExpenseWithDisplayAmounts = (expense, userPreferredCurrency) => {
const expenseObj = expense.toObject ? expense.toObject() : expense;
if (expenseObj.originalCurrency !== userPreferredCurrency) {
// Assuming convertedAmount is already set if conversion happened
expenseObj.displayAmount = expenseObj.convertedAmount || expenseObj.amount;
expenseObj.displayCurrency = userPreferredCurrency;
} else {
expenseObj.displayAmount = expenseObj.amount;
expenseObj.displayCurrency = expenseObj.originalCurrency;
}
return expenseObj;
};

module.exports = {
convertExpenseAmount,
prepareExpenseWithDisplayAmounts
};
30 changes: 30 additions & 0 deletions utils/logger.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const winston = require('winston');

// Create logger instance
const logger = winston.createLogger({
level: process.env.LOG_LEVEL || 'info',
format: winston.format.combine(
winston.format.timestamp(),
winston.format.errors({ stack: true }),
winston.format.json()
),
defaultMeta: { service: 'expense-flow' },
transports: [
// Write all logs with importance level of `error` or less to `error.log`
new winston.transports.File({ filename: 'logs/error.log', level: 'error' }),
// Write all logs with importance level of `info` or less to `combined.log`
new winston.transports.File({ filename: 'logs/combined.log' }),
],
});

// If we're not in production then log to the console with a simple format
if (process.env.NODE_ENV !== 'production') {
logger.add(new winston.transports.Console({
format: winston.format.combine(
winston.format.colorize(),
winston.format.simple()
)
}));
}

module.exports = logger;