Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 0e92e9f

Browse files
author
Ursula Clarke Everett
committed
Merge pull request #172 from CoderDojo/issue-800
load user profile
2 parents 1376bc1 + 23c35af commit 0e92e9f

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

‎profiles.js

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var moment = require('moment');
88
module.exports = function (options) {
99
var seneca = this;
1010

11-
var PARENT_GUARDIAN_PROFILE_ENTITY = 'cd/profiles';
11+
var ENTITY_NS = 'cd/profiles';
1212
var plugin = 'cd-profiles';
1313
var _ = require('lodash');
1414
var async = require('async');
@@ -93,6 +93,7 @@ module.exports = function (options) {
9393
seneca.add({role: plugin, cmd: 'create'}, cmd_create);
9494
seneca.add({role: plugin, cmd: 'user_profile_data'}, cmd_user_profile_data);
9595
seneca.add({role: plugin, cmd: 'load'}, cmd_load);
96+
seneca.add({role: plugin, cmd: 'load_user_profile'}, cmd_load_user_profile);
9697
seneca.add({role: plugin, cmd: 'save-youth-profile'}, cmd_save_youth_profile);
9798
seneca.add({role: plugin, cmd: 'save'}, cmd_save);
9899
seneca.add({role: plugin, cmd: 'update-youth-profile'}, cmd_update_youth);
@@ -113,7 +114,7 @@ module.exports = function (options) {
113114
return done(new Error('Empty query'));
114115
}
115116

116-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).list$(args.query, done);
117+
seneca.make$(ENTITY_NS).list$(args.query, done);
117118
}
118119

119120
function cmd_create (args, done) {
@@ -129,7 +130,7 @@ module.exports = function (options) {
129130
});
130131

131132
function validateRequest (done) {
132-
var profileEntity = seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY);
133+
var profileEntity = seneca.make$(ENTITY_NS);
133134
profileEntity.load$(profile.id, function (err, originalProfile) {
134135
if (err) return done(err);
135136
if (!originalProfile) return done();
@@ -154,7 +155,7 @@ module.exports = function (options) {
154155
if (profile.id) {
155156
profile = _.omit(profile, immutableFields);
156157
}
157-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).save$(profile, function (err, profile) {
158+
seneca.make$(ENTITY_NS).save$(profile, function (err, profile) {
158159
if (err) return done(err);
159160

160161
if (process.env.SALESFORCE_ENABLED === 'true') {
@@ -185,7 +186,7 @@ module.exports = function (options) {
185186
}
186187

187188
function updateSalesForce (profile) {
188-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).load$(profile.id, function (err, res) {
189+
seneca.make$(ENTITY_NS).load$(profile.id, function (err, res) {
189190
if (err) return salesForceLogger('error', '[error][salesforce] profile id: ' + profile.id + ' not present');
190191

191192
if (res.userType.toLowerCase() === 'champion') {
@@ -338,7 +339,7 @@ module.exports = function (options) {
338339
var fieldsToBeRemoved = _.union(derivedFields, immutableFields);
339340

340341
profile = _.omit(profile, fieldsToBeRemoved);
341-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).save$(profile, function (err, profile) {
342+
seneca.make$(ENTITY_NS).save$(profile, function (err, profile) {
342343
if (err) {
343344
return done(err);
344345
}
@@ -353,12 +354,12 @@ module.exports = function (options) {
353354

354355
function saveChild (profile, parentId, done) {
355356
if (_.contains(profile.parents, parentId)) {
356-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).save$(profile, function (err, profile) {
357+
seneca.make$(ENTITY_NS).save$(profile, function (err, profile) {
357358
if (err) {
358359
return done(err);
359360
}
360361

361-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).list$({userId: parentId}, function (err, results) {
362+
seneca.make$(ENTITY_NS).list$({userId: parentId}, function (err, results) {
362363
var parent = results[0];
363364

364365
if (err) {
@@ -400,6 +401,7 @@ module.exports = function (options) {
400401
addFlags,
401402
optionalFieldsFilter,
402403
privateFilter,
404+
privateFilter,
403405
publicProfilesFilter,
404406
under13Filter,
405407
resolveChildren,
@@ -414,7 +416,7 @@ module.exports = function (options) {
414416
function getProfile (done) {
415417
var query = args.query;
416418

417-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).list$({userId: query.userId}, function (err, results) {
419+
seneca.make$(ENTITY_NS).list$({userId: query.userId}, function (err, results) {
418420
if (err) {
419421
return done(err);
420422
}
@@ -590,7 +592,7 @@ module.exports = function (options) {
590592

591593
if (!_.isEmpty(profile.children) && (_.contains(profile.userTypes, 'parent-guardian') || _.contains(profile.user.roles, 'cdf-admin'))) {
592594
async.each(profile.children, function (child, callback) {
593-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).list$({userId: child}, function (err, results) {
595+
seneca.make$(ENTITY_NS).list$({userId: child}, function (err, results) {
594596
if (err) {
595597
return callback(err);
596598
}
@@ -618,7 +620,7 @@ module.exports = function (options) {
618620

619621
if (!_.isEmpty(profile.parents)) {
620622
async.each(profile.parents, function (parent, callback) {
621-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).list$({userId: parent}, function (err, results) {
623+
seneca.make$(ENTITY_NS).list$({userId: parent}, function (err, results) {
622624
if (err) {
623625
return callback(err);
624626
}
@@ -649,7 +651,7 @@ module.exports = function (options) {
649651
var missingKeys = _.difference(requiredProfileFields, profileKeys);
650652
if (_.isEmpty(missingKeys)) profile.requiredFieldsComplete = true;
651653

652-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).save$(profile, done);
654+
seneca.make$(ENTITY_NS).save$(profile, done);
653655
}
654656

655657
function cmd_invite_parent_guardian (args, done) {
@@ -882,7 +884,7 @@ module.exports = function (options) {
882884
return done(err);
883885
}
884886

885-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).load$(profile.id, function (err, profile) {
887+
seneca.make$(ENTITY_NS).load$(profile.id, function (err, profile) {
886888
if (err) seneca.log.error(err);
887889

888890
var protocol = process.env.PROTOCOL || 'http';
@@ -975,15 +977,19 @@ module.exports = function (options) {
975977
});
976978
}
977979

980+
function cmd_load_user_profile (args, done) {
981+
seneca.make$(ENTITY_NS).load$({userId: args.userId}, done);
982+
}
983+
978984
function cmd_load (args, done) {
979-
seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY).load$(args.id, done);
985+
seneca.make$(ENTITY_NS).load$(args.id, done);
980986
}
981987

982988
function cmd_list (args, done) {
983989
var query = args.query || {};
984990
if (!query.limit$) query.limit$ = 'NULL';
985991

986-
var profilesEntity = seneca.make$(PARENT_GUARDIAN_PROFILE_ENTITY);
992+
var profilesEntity = seneca.make$(ENTITY_NS);
987993
profilesEntity.list$(query, done);
988994
}
989995

0 commit comments

Comments
 (0)