Merge pull request #979 from OneCommunityGlobal/Ramakrishna_backend_5…

…_letter_team_code_accept_numbers Ramakrishna Updating the teamcode validation with numbers
OneCommunityGlobal · Jun 13, 2024 · 27fb760 · 27fb760
2 parents 278945c + 065056a
commit 27fb760
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/models/team.js b/src/models/team.js
@@ -18,11 +18,11 @@ const team = new Schema({
     default: '',
     validate: {
       validator(v) {
-        const teamCoderegex = /^([a-zA-Z]-[a-zA-Z]{3}|[a-zA-Z]{5})$|^$/;
+        const teamCoderegex = /^([a-zA-Z0-9]-[a-zA-Z0-9]{3,5}|[a-zA-Z0-9]{5,7})$/;
         return teamCoderegex.test(v);
       },
       message:
-        'Please enter a code in the format of A-AAA or AAAAA',
+        'Please enter a code in the format of A-AAAA or AAAAA, with optional numbers, and a total length between 5 and 7 characters.',
     },
   },
 });

diff --git a/src/models/userProfile.js b/src/models/userProfile.js
@@ -55,9 +55,7 @@ const userProfileSchema = new Schema({
     type: String,
     required: true,
     unique: true,
-    validate: [
-      validate({ validator: 'isEmail', message: 'Email address is invalid' }),
-    ],
+    validate: [validate({ validator: 'isEmail', message: 'Email address is invalid' })],
   },
   copiedAiPrompt: { type: Date, default: Date.now() },
   emailSubscriptions: {
@@ -77,7 +75,7 @@ const userProfileSchema = new Schema({
   startDate: {
     type: Date,
     required: true,
-    default: function () {
+    default() {
       return this.createdDate;
     },
   },
@@ -228,10 +226,11 @@ const userProfileSchema = new Schema({
     default: '',
     validate: {
       validator(v) {
-        const teamCoderegex = /^([a-zA-Z]-[a-zA-Z]{3}|[a-zA-Z]{5})$|^$/;
+        const teamCoderegex = /^([a-zA-Z0-9]-[a-zA-Z0-9]{3,5}|[a-zA-Z0-9]{5,7})$/;
         return teamCoderegex.test(v);
       },
-      message: 'Please enter a code in the format of A-AAA or AAAAA',
+      message:
+        'Please enter a code in the format of A-AAAA or AAAAA, with optional numbers, and a total length between 5 and 7 characters.',
     },
   },
   infoCollections: [
@@ -262,8 +261,4 @@ userProfileSchema.pre('save', function (next) {
     .catch((error) => next(error));
 });
 
-module.exports = mongoose.model(
-  'userProfile',
-  userProfileSchema,
-  'userProfiles',
-);
+module.exports = mongoose.model('userProfile', userProfileSchema, 'userProfiles');