diff --git a/generics/services/survey.js b/generics/services/survey.js index e15f5c07..361266f3 100644 --- a/generics/services/survey.js +++ b/generics/services/survey.js @@ -592,15 +592,17 @@ const listProgramsBasedOnIds = function ( programIds ) { * @name removeSolutionsFromProgram * @param {String} programId - Program id. * @param {Array} solutionIds - Array of solutions ids. + * @param {Boolean} checkProgramIdExists - check program id exists or not. + * @param {String} projectId - project id. * @returns {JSON} - updated program. */ -const removeSolutionsFromProgram = function ( token,programId,solutionIds ) { +const removeSolutionsFromProgram = function ( token,programId,solutionIds,checkProgramIdExists,projectId ) { return new Promise(async (resolve, reject) => { try { const url = - ASSESSMENT_URL + CONSTANTS.endpoints.REMOVE_SOLUTIONS_FROM_PROGRAM + "/" + programId; + ASSESSMENT_URL + CONSTANTS.endpoints.REMOVE_SOLUTIONS_FROM_PROGRAM + "/" + programId + "?checkProgramIdExists=" + checkProgramIdExists + "&projectId=" + projectId +"&referneceFrom=ml-project"+"&ts"+ Date.now(); const options = { headers : { diff --git a/module/userProjects/helper.js b/module/userProjects/helper.js index 67d487fc..2f9e93f2 100644 --- a/module/userProjects/helper.js +++ b/module/userProjects/helper.js @@ -230,12 +230,14 @@ module.exports = class UserProjectsHelper { } if (solutionExists) { - + let checkProgramIdExists = data.programId ? true :false let updateProgram = await surveyService.removeSolutionsFromProgram( userToken, userProject[0].programInformation._id, - [userProject[0].solutionInformation._id] + [userProject[0].solutionInformation._id], + checkProgramIdExists, + projectId.toString(), ); if (!updateProgram.success) { @@ -361,7 +363,7 @@ module.exports = class UserProjectsHelper { if ( data.status == CONSTANTS.common.COMPLETED_STATUS || data.status == CONSTANTS.common.SUBMITTED_STATUS ) { updateProject.completedDate = new Date(); } - + let projectUpdated = await projectQueries.findOneAndUpdate( {