Skip to content

Juhitha fix financials endpoints validation #1769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
one-community merged 2 commits into from
Mar 1, 2026
Merged

Juhitha fix financials endpoints validation #1769

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
180615f
fix: corrected endpoints for dashboard
Juhitha-Reddy Oct 2, 2025
150afcc
Merge branch 'development' into Juhitha_fix_financials_endpoints_vali…
Juhitha-Reddy Oct 2, 2025
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
24 changes: 16 additions & 8 deletions src/controllers/bmdashboard/bmFinancialController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const bmFinancialController = function (BuildingProject, BuildingMaterial, Build
let laborCost = 0;

try {
materialsCost = await calculateMaterialsCost(BuildingMaterial, project._id);
materialsCost = await calculateMaterialsCost(project._id);
} catch (error) {
logger.logException(
`Materials cost error for project ${project._id}: ${error.message}`,
Expand Down Expand Up @@ -218,7 +218,7 @@ const bmFinancialController = function (BuildingProject, BuildingMaterial, Build

const results = await Promise.all(
projects.map(async (project) => {
const materialsCost = await calculateMaterialsCost(BuildingMaterial, project._id);
const materialsCost = await calculateMaterialsCost(project._id);
const toolsCost = await calculateToolsCost(project._id);
const laborCost = await calculateLaborCost(project._id);
const totalCost = materialsCost + toolsCost + laborCost;
Expand All @@ -242,12 +242,16 @@ const bmFinancialController = function (BuildingProject, BuildingMaterial, Build

const getTotalProjectCost = async (req, res) => {
try {
const project = await BuildingProject.findById(req.params.projectId);
const { projectId } = req.params;
if (!mongoose.Types.ObjectId.isValid(projectId)) {
return res.status(400).json({ message: 'Invalid project ID' });
}
const project = await BuildingProject.findById(projectId);
if (!project) {
logger.logException(`Project with ID ${req.params.projectId} not found`);
logger.logException(`Project with ID ${projectId} not found`);
return res.status(404).json({ message: 'Project not found' });
}
const materialsCost = await calculateMaterialsCost(BuildingMaterial, project._id);
const materialsCost = await calculateMaterialsCost(project._id);
const toolsCost = await calculateToolsCost(project._id);
const laboorCost = await calculateLaborCost(project._id);

Expand All @@ -263,12 +267,16 @@ const bmFinancialController = function (BuildingProject, BuildingMaterial, Build

const getCostBreakdown = async (req, res) => {
try {
const project = await BuildingProject.findById(req.params.projectId);
const { projectId } = req.params;
if (!mongoose.Types.ObjectId.isValid(projectId)) {
return res.status(400).json({ message: 'Invalid project ID' });
}
const project = await BuildingProject.findById(projectId);
if (!project) {
logger.logException(`Project with ID ${req.params.projectId} not found`);
logger.logException(`Project with ID ${projectId} not found`);
return res.status(404).json({ message: 'Project not found' });
}
const materialsCost = await calculateMaterialsCost(BuildingMaterial, project._id);
const materialsCost = await calculateMaterialsCost(project._id);
const toolsCost = await calculateToolsCost(project._id);
const laboorCost = await calculateLaborCost(project._id);

Expand Down