Add flexibility for 'name' property definition in users

DemocracyOS · Jul 30, 2014 · 35ac439 · 35ac439
1 parent fa00cc5
commit 35ac439
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/source/jobs/resolvers.js b/source/jobs/resolvers.js
@@ -3,6 +3,13 @@ var db = require('../db')(config);
 
 var ObjectId = require('mongojs').ObjectId;
 
+function normalize (user) {
+	if (!user.name && user.firstName) {
+		user.name = user.firstName;
+	}
+	return user;
+}
+
 var resolvers = {
 	'send-welcome': function (action, callback) {
 		db.users.findOne({email: action.user}, function (err, user) {
@@ -14,10 +21,12 @@ var resolvers = {
 				return callback({message: 'user not found', email: action.email});
 			}
 
-			callback(null, action, {email: action.user, user: user, validateUrl: action.validateUrl});
+			callback(null, action, {email: action.user, user: normalize(user), validateUrl: action.validateUrl});
 		});
 	},
 
+	// TODO: check these later
+
 	'send-personal': function (action, callback) {
 		db.users.findOne({email: action.user}, function (err, user) {
 			if (err) {

diff --git a/source/templates/template.js b/source/templates/template.js
@@ -19,7 +19,7 @@ function jadeTemplate(name, vars, callback) {
     } else {
       callback(err);
     }
-  }); 
+  });
 };
 
 function replaceVars(template, vars) {