Merge pull request #119 from milaroisin/86-user-phone-number-backend

[#86] Added phone number to Model and modified POST api for createUser
heyhellomila · Nov 14, 2019 · 16adc10 · 16adc10
2 parents 08a0f65 + c3e3ff9
commit 16adc10
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/backend/controllers/UserController.js b/backend/controllers/UserController.js
@@ -8,14 +8,13 @@ const userController = express.Router();
 const userService = new UserService();
 
 const loginFields = ['email', 'password']
-const registerFields = ['email', 'password', 'first_name', 'last_name', 'type']
+const registerFields = ['email', 'password', 'first_name', 'last_name', 'phone_number', 'type']
 
 // register API
 userController.post('/', validateBody(registerFields), async (req, res) => {
     try {
-        const { email, password, first_name, last_name, type } = req.body;
-        const user = await userService.register(email, password, first_name, last_name,
-            type);
+        const { email, password, first_name, last_name, phone_number, type } = req.body;
+        const user = await userService.register(email, password, first_name, last_name, phone_number, type);
         return res.status(200).json(user);
     } catch (err) {
         return handleError(err, res);

diff --git a/backend/gateways/UserGateway.js b/backend/gateways/UserGateway.js
@@ -15,12 +15,13 @@ const UserGateway = {
         return user;
     },
 
-    async createUser(email, password_hash, first_name, last_name, type) {
+    async createUser(email, password_hash, first_name, last_name, phone_number, type) {
         user = new User({
             email: email,
             password_hash: password_hash,
             first_name: first_name,
             last_name: last_name,
+            phone_number,
             type: type
         });
         try {
@@ -30,7 +31,7 @@ const UserGateway = {
         }
     },
 
-    async updateUser(id, email, password_hash, first_name, last_name, type) {
+    async updateUser(id, email, password_hash, first_name, last_name, phone_number, type) {
         user = this.getUserById(id);
         try {
             return await User.updateOne({id: id},
@@ -40,6 +41,7 @@ const UserGateway = {
                         password_hash: password_hash,
                         first_name: first_name,
                         last_name: last_name,
+                        phone_number: phone_number,
                         type: type
                     }
                 }

diff --git a/backend/models/User.js b/backend/models/User.js
@@ -29,6 +29,16 @@ const UserSchema = mongoose.Schema({
         required : true,
         trim : true
     },
+    phone_number:{
+        type: String,
+        required : true,
+        trim: true,
+        validate: value => {
+            if (!validator.isMobilePhone(value)) {
+                throw new Error('Invalid Phone Number')
+            }
+        }
+    },
     type: {
         type: String,
         required : true,

diff --git a/backend/services/UserService.js b/backend/services/UserService.js
@@ -19,7 +19,7 @@ class UserService {
         return true
     }
 
-    async register(email, password, first_name, last_name, type) {
+    async register(email, password, first_name, last_name, phone_number, type) {
         if (!passwordValidator.validate(password)) {
             throw new BadRequestError('Password must be at least 8 characters' +  
                 ' and must include at least one digit.')
@@ -30,7 +30,7 @@ class UserService {
             throw new ResourceExistsError("Email " + email + " already in use.");
         }
         try {
-            return await UserGateway.createUser(email, hashedPassword, first_name, last_name, type);
+            return await UserGateway.createUser(email, hashedPassword, first_name, last_name, phone_number, type);
         } catch (err) {
             throw new BadRequestError(err.message);
         }