Merge pull request #423 from ELEVATE-Project/profile-update-changes

[#1121]updated profile update response to handle cases where no update was done

Author: aks30

src/services/mentees.js

@@ -668,12 +668,24 @@ module.exports = class MenteesHelper {
 				raw: true,
 			})
 
-			if (updateCount === '0') {
-				return common.failureResponse({
-					statusCode: httpStatusCode.not_found,
-					message: 'MENTEE_EXTENSION_NOT_FOUND',
+			if (updateCount === 0) {
+				const fallbackUpdatedUser = await menteeQueries.getMenteeExtension(userId)
+				console.log(fallbackUpdatedUser)
+				if (!fallbackUpdatedUser) {
+					return common.failureResponse({
+						statusCode: httpStatusCode.not_found,
+						message: 'MENTEE_EXTENSION_NOT_FOUND',
+					})
+				}
+				const processDbResponse = utils.processDbResponse(fallbackUpdatedUser, validationData)
+
+				return common.successResponse({
+					statusCode: httpStatusCode.ok,
+					message: 'MENTEE_EXTENSION_UPDATED',
+					result: processDbResponse,
 				})
 			}
+
 			const processDbResponse = utils.processDbResponse(updatedUser[0], validationData)
 
 			return common.successResponse({

src/services/mentors.js

@@ -409,10 +409,20 @@ module.exports = class MentorsHelper {
 				raw: true,
 			})
 
-			if (updateCount === '0') {
-				return common.failureResponse({
-					statusCode: httpStatusCode.not_found,
-					message: 'MENTOR_EXTENSION_NOT_FOUND',
+			if (updateCount === 0) {
+				const fallbackUpdatedUser = await mentorQueries.getMentorExtension(userId)
+				if (!fallbackUpdatedUser) {
+					return common.failureResponse({
+						statusCode: httpStatusCode.not_found,
+						message: 'MENTOR_EXTENSION_NOT_FOUND',
+					})
+				}
+
+				const processDbResponse = utils.processDbResponse(fallbackUpdatedUser, validationData)
+				return common.successResponse({
+					statusCode: httpStatusCode.ok,
+					message: 'MENTOR_EXTENSION_UPDATED',
+					result: processDbResponse,
 				})
 			}
 
@@ -557,11 +567,11 @@ module.exports = class MentorsHelper {
 					[Op.in]: [orgId, defaultOrgId],
 				},
 			})
-			console.log('mentorExtension', mentorExtension)
+
 			// validationData = utils.removeParentEntityTypes(JSON.parse(JSON.stringify(validationData)))
 			const validationData = removeDefaultOrgEntityTypes(entityTypes, orgId)
 			const processDbResponse = utils.processDbResponse(mentorExtension, validationData)
-			console.log(processDbResponse)
+
 			const totalSessionHosted = await sessionQueries.countHostedSessions(id)
 
 			const totalSession = await sessionAttendeesQueries.countEnrolledSessions(id)