Skip to content
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

fixed an issue with mentor profile update api #418

Merged
merged 2 commits into from
Dec 6, 2023
Merged

fixed an issue with mentor profile update api #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be71912
fixed an issue with mentor profile update
nevil-mathew Dec 6, 2023
3dc5573
updated form seeder
nevil-mathew Dec 6, 2023
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
147 changes: 105 additions & 42 deletions src/database/seeders/20231103090632-seed-forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@ module.exports = {
required: 'Enter your name',
pattern: 'This field can only contain alphabets',
},
validators: { required: true, pattern: '^[^0-9!@#%$&()\\-`.+,/"]*$' },
validators: {
required: true,
pattern: '^[^0-9!@#%$&()\\-`.+,/"]*$',
},
options: [],
meta: { showValidationError: true },
meta: {
showValidationError: true,
maxLength: 250,
},
},
{
name: 'location',
Expand All @@ -35,11 +41,17 @@ module.exports = {
class: 'ion-no-margin',
type: 'select',
position: 'floating',
multiple: false,
errorMessage: { required: 'Please select your location' },
validators: { required: true },
errorMessage: {
required: 'Please select your location',
},
validators: {
required: true,
},
options: [],
meta: { entityType: 'location', errorLabel: 'Location' },
meta: {
entityType: 'location',
errorLabel: 'Location',
},
},
{
name: 'designation',
Expand All @@ -49,9 +61,12 @@ module.exports = {
type: 'chip',
position: '',
disabled: false,
multiple: true,
errorMessage: { required: 'Enter your role' },
validators: { required: true },
errorMessage: {
required: 'Enter your role',
},
validators: {
required: true,
},
options: [],
meta: {
entityType: 'designation',
Expand All @@ -69,9 +84,14 @@ module.exports = {
type: 'text',
position: 'floating',
placeHolder: 'Ex. 5 years',
errorMessage: { required: 'Enter your experience in years' },
errorMessage: {
required: 'Enter your experience in years',
},
isNumberOnly: true,
validators: { required: true, maxLength: 2 },
validators: {
required: true,
maxLength: 2,
},
options: [],
},
{
Expand All @@ -81,9 +101,14 @@ module.exports = {
class: 'ion-no-margin',
type: 'textarea',
position: 'floating',
errorMessage: { required: 'This field cannot be empty' },
placeHolder: 'Please use only 150 character',
validators: { required: true, maxLength: 150 },
errorMessage: {
required: 'This field cannot be empty',
},
placeHolder: 'Please use only 150 characters',
validators: {
required: true,
maxLength: 150,
},
options: [],
},
{
Expand All @@ -94,9 +119,12 @@ module.exports = {
type: 'chip',
position: '',
disabled: false,
multiple: true,
errorMessage: { required: 'Enter your expertise' },
validators: { required: true },
errorMessage: {
required: 'Enter your expertise',
},
validators: {
required: true,
},
options: [],
meta: {
entityType: 'area_of_expertise',
Expand All @@ -113,11 +141,18 @@ module.exports = {
class: 'ion-no-margin',
type: 'text',
position: 'floating',
errorMessage: { required: 'Enter education qualification' },
errorMessage: {
required: 'Enter education qualification',
},
placeHolder: 'Ex. BA, B.ED',
validators: { required: true },
validators: {
required: true,
},
options: [],
meta: { errorLabel: 'Education qualification' },
meta: {
errorLabel: 'Education qualification',
maxLength: 250,
},
},
{
name: 'languages',
Expand All @@ -127,9 +162,12 @@ module.exports = {
type: 'chip',
position: '',
disabled: false,
multiple: true,
errorMessage: { required: 'Enter language' },
validators: { required: true },
errorMessage: {
required: 'Enter language',
},
validators: {
required: true,
},
options: [],
meta: {
entityType: 'languages',
Expand All @@ -151,7 +189,6 @@ module.exports = {
type: 'session',
sub_type: 'sessionForm',
data: JSON.stringify({
template_name: 'defaultTemplate',
fields: {
controls: [
{
Expand All @@ -162,8 +199,13 @@ module.exports = {
type: 'text',
placeHolder: 'Ex. Name of your session',
position: 'floating',
errorMessage: { required: 'Enter session title' },
validators: { required: true },
errorMessage: {
required: 'Enter session title',
},
validators: {
required: true,
maxLength: 250,
},
},
{
name: 'description',
Expand All @@ -173,8 +215,13 @@ module.exports = {
type: 'textarea',
placeHolder: 'Tell the community something about your session',
position: 'floating',
errorMessage: { required: 'Enter description' },
validators: { required: true },
errorMessage: {
required: 'Enter description',
},
validators: {
required: true,
maxLength: 250,
},
},
{
name: 'start_date',
Expand All @@ -185,9 +232,13 @@ module.exports = {
dependedChild: 'end_date',
type: 'date',
placeHolder: 'YYYY-MM-DD hh:mm',
errorMessage: { required: 'Enter start date' },
errorMessage: {
required: 'Enter start date',
},
position: 'floating',
validators: { required: true },
validators: {
required: true,
},
},
{
name: 'end_date',
Expand All @@ -198,21 +249,27 @@ module.exports = {
dependedParent: 'start_date',
type: 'date',
placeHolder: 'YYYY-MM-DD hh:mm',
position: 'floating',
errorMessage: { required: 'Enter end date' },
validators: { required: true },
errorMessage: {
required: 'Enter end date',
},
validators: {
required: true,
},
},
{
name: 'recommended_for',
label: 'Recommended for',
multiple: true,
class: 'ion-no-margin',
value: '',
type: 'chip',
position: '',
disabled: false,
errorMessage: { required: 'Enter recommended for' },
validators: { required: true },
errorMessage: {
required: 'Enter recommended for',
},
validators: {
required: true,
},
options: [],
meta: {
entityType: 'recommended_for',
Expand All @@ -225,14 +282,17 @@ module.exports = {
{
name: 'categories',
label: 'Categories',
multiple: true,
class: 'ion-no-margin',
value: '',
type: 'chip',
position: '',
disabled: false,
errorMessage: { required: 'Enter categories' },
validators: { required: true },
errorMessage: {
required: 'Enter categories',
},
validators: {
required: true,
},
options: [],
meta: {
entityType: 'categories',
Expand All @@ -243,16 +303,19 @@ module.exports = {
},
{
name: 'medium',
multiple: true,
label: 'Select medium',
alertLabel: 'medium',
class: 'ion-no-margin',
value: '',
type: 'chip',
position: '',
disabled: false,
errorMessage: { required: 'Enter select medium' },
validators: { required: true },
errorMessage: {
required: 'Enter select medium',
},
validators: {
required: true,
},
options: [],
meta: {
entityType: 'medium',
Expand Down
35 changes: 18 additions & 17 deletions src/services/mentors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,18 +385,6 @@ module.exports = class MentorsHelper {
}
})

const [updateCount, updatedMentor] = await mentorQueries.updateMentorExtension(userId, data, {
returning: true,
raw: true,
})

if (updateCount === '0') {
return common.failureResponse({
statusCode: httpStatusCode.not_found,
message: 'MENTOR_EXTENSION_NOT_FOUND',
})
}

const defaultOrgId = await getDefaultOrgId()
if (!defaultOrgId)
return common.failureResponse({
Expand All @@ -411,14 +399,26 @@ module.exports = class MentorsHelper {
[Op.in]: [orgId, defaultOrgId],
},
})

//validationData = utils.removeParentEntityTypes(JSON.parse(JSON.stringify(validationData)))
const validationData = removeDefaultOrgEntityTypes(entityTypes, orgId)
let mentorExtensionsModel = await mentorQueries.getColumns()

data = utils.restructureBody(updatedMentor[0], validationData, mentorExtensionsModel)
data = utils.restructureBody(data, validationData, mentorExtensionsModel)

const [updateCount, updatedMentor] = await mentorQueries.updateMentorExtension(userId, data, {
returning: true,
raw: true,
})

const processDbResponse = utils.processDbResponse(data, validationData)
if (updateCount === '0') {
return common.failureResponse({
statusCode: httpStatusCode.not_found,
message: 'MENTOR_EXTENSION_NOT_FOUND',
})
}

//validationData = utils.removeParentEntityTypes(JSON.parse(JSON.stringify(validationData)))

const processDbResponse = utils.processDbResponse(updatedMentor[0], validationData)
return common.successResponse({
statusCode: httpStatusCode.ok,
message: 'MENTOR_EXTENSION_UPDATED',
Expand Down Expand Up @@ -557,10 +557,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)
Expand Down