diff --git a/notePad-wg-cmd.txt b/notePad-wg-cmd.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/controllers/project/projectUpdateSf.controller.js b/src/controllers/project/projectUpdateSf.controller.js index 545cdd5..ff7a035 100644 --- a/src/controllers/project/projectUpdateSf.controller.js +++ b/src/controllers/project/projectUpdateSf.controller.js @@ -155,11 +155,11 @@ async function update_project_sf(req, res) { // updateData.vaAssigned = newVaAssignedArray; // Calculate VAs to add and remove for relationship updates - const currentVaIds = existingProject.vaAssigned.map(va => va.toString()); + const currentVaIds = existingProject.vaAssigned.map(va => va.vaId.toString()); const newVaIds = newVaAssignedArray.map(va => va.toString()); const vaToAdd = newVaAssignedArray.filter(va => !currentVaIds.includes(va.toString())); - const vaToRemove = existingProject.vaAssigned.filter(va => !newVaIds.includes(va.toString())); + const vaToRemove = existingProject.vaAssigned.filter(va => !newVaIds.includes(va.vaId.toString())); // Update relationships for added VAs if (vaToAdd.length > 0) { diff --git a/src/controllers/va/vaLeaves/vaLeavesApply.controller.js b/src/controllers/va/vaLeaves/vaLeavesApply.controller.js index 45a6451..b6d6bae 100644 --- a/src/controllers/va/vaLeaves/vaLeavesApply.controller.js +++ b/src/controllers/va/vaLeaves/vaLeavesApply.controller.js @@ -158,7 +158,7 @@ async function va_leave_apply_function(req, res) { "dateTo": endDate.toISOString().split('T')[0], "totalDays": totalDays, "leaveType": leaveType, - "comment": processedComment.plainText, // Send plain text to Salesforce + "comment": processedComment.plainText !== "" ? processedComment.plainText : "-", // Send plain text to Salesforce "attachments": processedComment.extractedImages, // Send extracted images info "status": "PENDING", "rejectionReason": "" @@ -176,6 +176,7 @@ async function va_leave_apply_function(req, res) { if (!response.ok) { const errorText = await response.text(); + await LeavesModel.findByIdAndDelete(leaveRequest._id) throw new Error(`Salesforce API responded with status ${response.status}: ${errorText}`); } diff --git a/src/controllers/va/vaProfile/vaProfileUpdate.controller.js b/src/controllers/va/vaProfile/vaProfileUpdate.controller.js index f1d6d20..743f5d5 100644 --- a/src/controllers/va/vaProfile/vaProfileUpdate.controller.js +++ b/src/controllers/va/vaProfile/vaProfileUpdate.controller.js @@ -68,7 +68,7 @@ async function va_profile_update_callback(req, res) { const allowedFields = [ "firstName", "lastName", "dob", "age", "address", "city", "state", "country", "phone", "skype", - "paymentMethod", "payoneerAccount", "veemAccount" + "paymentMethod", "payoneerAccount", "veemAccount", "wiseEmail" ]; let hasUpdates = false; diff --git a/src/controllers/va/vaTimesheetAdjustment/vaTimesheetAdjustment.controller.js b/src/controllers/va/vaTimesheetAdjustment/vaTimesheetAdjustment.controller.js index 3884422..8cba7ee 100644 --- a/src/controllers/va/vaTimesheetAdjustment/vaTimesheetAdjustment.controller.js +++ b/src/controllers/va/vaTimesheetAdjustment/vaTimesheetAdjustment.controller.js @@ -148,7 +148,7 @@ async function va_timesheet_adjustment_function(req, res) { "date": adjustmentDate.toISOString().split('T')[0], "loginTime": loginDateTime.toISOString(), "logoutTime": logoutDateTime.toISOString(), - "comment": processedComment.plainText, // Send plain text to Salesforce + "comment": processedComment.plainText !== "" ? processedComment.plainText : "-", // Send plain text to Salesforce "attachments": processedComment.extractedImages, // Send extracted images info "status": "PENDING", "rejectionReason": "", @@ -167,6 +167,7 @@ async function va_timesheet_adjustment_function(req, res) { if (!response.ok) { const errorText = await response.text(); + await AdjustedHoursModel.findByIdAndDelete(adjustmentRequest._id) throw new Error(`Salesforce API responded with status ${response.status}: ${errorText}`); } diff --git a/src/helper/updateEntityRelationships.js b/src/helper/updateEntityRelationships.js index 85d7af6..4a81d1f 100644 --- a/src/helper/updateEntityRelationships.js +++ b/src/helper/updateEntityRelationships.js @@ -69,7 +69,7 @@ async function updateEntityRelationships(data) { if (vaId && Array.isArray(vaId)) { await ProjectModel.findByIdAndUpdate( projectId, - { $addToSet: { "vaAssigned.vaId": { $each: vaId } } } + { $addToSet: { vaAssigned: { $each: vaId } } } ); } @@ -103,7 +103,7 @@ async function updateEntityRelationships(data) { { _id: { $in: projectId } }, { $addToSet: { - "vaAssigned.vaId": vaId + vaAssigned: vaId } } ); @@ -285,7 +285,7 @@ async function removeEntityRelationships(data) { if (projectId && Array.isArray(projectId)) { await ProjectModel.updateMany( { _id: { $in: projectId } }, - { $pull: { "vaAssigned.vaId": vaId } } + { $pull: { vaAssigned: vaId } } ); }