Merge pull request #40 from Financial-Times/fix-user-email-digest-prefs

Calling new next-myft-api endpoint for setting user email preferences
Financial-Times · Nov 30, 2017 · ba1807c · ba1807c
2 parents c0d86cb + 2a1159a
commit ba1807c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/lib/myFTClient.js b/lib/myFTClient.js
@@ -853,12 +853,26 @@ function getEmailDigestPreference (uuid) {
  *        at a minimum this should be type and timezone. For example:
  *        {type: "daily", timezone:"Europe/London", byTool: "KAT",
  *          byUser: "[user-id]"}
- * @param {Object} [options] - additional options {supressEvents: true|false, waitForPurge: true|false }
- *        default behaviour not to supress event generation and wait for a cache purge
  * @return {Promise} response -  EmailDigestPreference json structure
  */
-function setEmailDigestPreference (uuid, preference, options) {
-	return _multiAddRemoveRelationships('POST', myftConst.userNodeName, uuid, myftConst.prefRelType, myftConst.prefRelName, [{uuid: myftConst.prefRelId}], preference, options);
+function setEmailDigestPreference (uuid, preference) {
+	const theUrl = `${config.MYFT_API_URL}/kat/user/email-digest`;
+	const params = {
+		noEvent: config.MYFT_NO_EVENT,
+		waitForPurge: config.MYFT_WAIT_FOR_PURGE_ADD
+	};
+	const data = {
+		preferenceData: preference,
+		// Make sure we pass uuid as an array
+		userIds: Array.isArray(uuid) ? uuid : [uuid]
+	};
+
+	return _doRelationshipRequest('POST', theUrl, data, params)
+		.then(helpers.parseJsonRes)
+		.then(res => {
+			log.debug({operation: 'myFTClient.setEmailDigestPreferences', uuid, res: 'success'});
+			return res;
+		});
 }
 
 /**
@@ -1329,14 +1343,7 @@ function syncUserFollowers (groupId, userId) {
 							return addConceptsFollowedByUser(userId, newConceptsToFollow, followProps)
 								.then(() => {
 									log.silly({operation, subOp: 'setEmailDigestPreference', userId});
-									return getEmailDigestPreference(userId)
-										.catch(err => {
-											// if no preferences are found
-											if (err instanceof clientErrors.NotFoundError) {
-												return setEmailDigestPreference(userId, digestProperties);
-											}
-											throw err;
-										});
+									return setEmailDigestPreference(userId, digestProperties);
 								})
 								.then(() => {
 									const cleanConcepts = newConceptsToFollow.map(item => {

diff --git a/lib/syncUserFollows.js b/lib/syncUserFollows.js
@@ -84,15 +84,7 @@ function userFollows (groupId, userId) {
 								.then(() => {
 									//Not sure we need to be doing this
 									log.info({operation, subOp: 'getEmailDigestPreference', userId});
-									return myFT.getEmailDigestPreference(userId)
-										.catch(err => {
-											// if no preferences are found
-											if (err instanceof clientErrors.NotFoundError) {
-												log.info({operation, subOp: 'getEmailDigestPreference', userId});
-												return myFT.setEmailDigestPreference(userId, digestProperties);
-											}
-											throw err;
-										});
+									return myFT.setEmailDigestPreference(userId, digestProperties);
 								})
 								.then(() => {
 									const cleanConcepts = newConceptsToFollow.map(item => {

diff --git a/test/myFTClient.spec.js b/test/myFTClient.spec.js
@@ -55,7 +55,7 @@ describe('myFT Client proxy', () => {
 		it('Should set an EmailDigestPreference for a valid user uuid', done => {
 
 			nock(baseUrl)
-				.post(`/${myftConst.userNodeName}/${myftConst.prefRelType}/${myftConst.prefRelName}${extraParams}`)
+				.post(`/kat/user/email-digest${extraParams}`)
 				.reply(200, () => ({}));
 
 			nock(baseUrl)