Skip to content

Commit

Permalink
resolved conflict in src/models/userProfile.js
Browse files Browse the repository at this point in the history
  • Loading branch information
sucheta90 committed Mar 7, 2024
2 parents ed54870 + 313bd24 commit c9dd61d
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/models/userProfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ const userProfileSchema = new Schema({
index: true,
},
lastName: {
type: String, required: true, minlength: 2, index: true,
},
type: String,
required: true,
minlength: 2,
index: true,
},
phoneNumber: [{ type: String, phoneNumber: String }],
jobTitle: [{ type: String, jobTitle: String }],
bio: { type: String },
Expand Down Expand Up @@ -204,7 +207,7 @@ const userProfileSchema = new Schema({
],
weeklySummaryNotReq: { type: Boolean, default: false },
timeZone: { type: String, required: true, default: 'America/Los_Angeles' },
isVisible: { type: Boolean, default: false },
isVisible: { type: Boolean, default: true },
weeklySummaryOption: { type: String },
bioPosted: { type: String, default: 'default' },
isFirstTimelog: { type: Boolean, default: true },
Expand Down

0 comments on commit c9dd61d

Please sign in to comment.