Merge pull request topcoder-platform#66 from vigneshTheDev/develop

sushilshinde · web-flow · commit 7f20b1bdace0 · 2019-05-10T15:51:40.000+05:30
update email preferences to use v5 api
diff --git a/__tests__/actions/__snapshots__/profile.js.snap b/__tests__/actions/__snapshots__/profile.js.snap
@@ -166,6 +166,7 @@ Object {
       },
     },
     "handle": "tcscoder",
+    "preferences": Object {},
   },
   "type": "PROFILE/SAVE_EMAIL_PREFERENCES_DONE",
 }
diff --git a/__tests__/reducers/__snapshots__/profile.js.snap b/__tests__/reducers/__snapshots__/profile.js.snap
@@ -740,7 +740,7 @@ Object {
   "deletingPhoto": false,
   "deletingWebLink": false,
   "emailPreferences": Object {
-    "TOPCODER_NL_DATA": true,
+    "Dev Newsletter": true,
   },
   "externalLinks": Array [
     Object {
@@ -939,7 +939,7 @@ Object {
   "deletingPhoto": false,
   "deletingWebLink": false,
   "emailPreferences": Object {
-    "TOPCODER_NL_DATA": true,
+    "Dev Newsletter": true,
   },
   "externalLinks": Array [
     Object {
@@ -989,7 +989,7 @@ Object {
   "deletingPhoto": false,
   "deletingWebLink": false,
   "emailPreferences": Object {
-    "TOPCODER_NL_DATA": true,
+    "Dev Newsletter": true,
   },
   "externalLinks": Array [
     Object {
@@ -1926,7 +1926,7 @@ Object {
   "deletingPhoto": false,
   "deletingWebLink": false,
   "emailPreferences": Object {
-    "TOPCODER_NL_DATA": true,
+    "Dev Newsletter": true,
   },
   "externalLinks": Array [
     Object {
@@ -2125,7 +2125,7 @@ Object {
   "deletingPhoto": false,
   "deletingWebLink": false,
   "emailPreferences": Object {
-    "TOPCODER_NL_DATA": true,
+    "Dev Newsletter": true,
   },
   "externalLinks": Array [
     Object {
@@ -2175,7 +2175,7 @@ Object {
   "deletingPhoto": false,
   "deletingWebLink": false,
   "emailPreferences": Object {
-    "TOPCODER_NL_DATA": true,
+    "Dev Newsletter": true,
   },
   "externalLinks": Array [
     Object {
diff --git a/__tests__/reducers/profile.js b/__tests__/reducers/profile.js
@@ -33,7 +33,7 @@ const mockActions = {
     deleteWebLinkInit: mockAction('DELETE_WEB_LINK_INIT'),
     deleteWebLinkDone: mockAction('DELETE_WEB_LINK_DONE', { handle, data: webLink }),
     saveEmailPreferencesInit: mockAction('SAVE_EMAIL_PREFERENCES_INIT'),
-    saveEmailPreferencesDone: mockAction('SAVE_EMAIL_PREFERENCES_DONE', { handle, data: { subscriptions: { TOPCODER_NL_DATA: true } } }),
+    saveEmailPreferencesDone: mockAction('SAVE_EMAIL_PREFERENCES_DONE', { handle, preferences: { 'Dev Newsletter': true } }),
     linkExternalAccountInit: mockAction('LINK_EXTERNAL_ACCOUNT_INIT'),
     linkExternalAccountDone: mockAction('LINK_EXTERNAL_ACCOUNT_DONE', { handle, data: linkedAccount2 }),
     unlinkExternalAccountInit: mockAction('UNLINK_EXTERNAL_ACCOUNT_INIT'),
diff --git a/config/test.js b/config/test.js
@@ -2,6 +2,7 @@ module.exports = {
   API: {
     V2: 'https://api.topcoder-dev.com/v2',
     V3: 'https://api.topcoder-dev.com/v3',
+    V5: 'https://api.topcoder-dev.com/v5',
   },
   dummyConfigKey: 'Dummy config value',
 };
diff --git a/src/actions/profile.js b/src/actions/profile.js
@@ -397,7 +397,7 @@ function saveEmailPreferencesInit() {}
 function saveEmailPreferencesDone(profile, tokenV3, preferences) {
   const service = getUserService(tokenV3);
   return service.saveEmailPreferences(profile, preferences)
-    .then(res => ({ data: res, handle: profile.handle }));
+    .then(res => ({ data: res, handle: profile.handle, preferences }));
 }
 
 /**
diff --git a/src/reducers/profile.js b/src/reducers/profile.js
@@ -434,13 +434,13 @@ function onSaveEmailPreferencesDone(state, { payload, error }) {
     return newState;
   }
 
-  if (newState.profileForHandle !== payload.handle || !payload.data) {
+  if (newState.profileForHandle !== payload.handle) {
     return newState;
   }
 
   return {
     ...newState,
-    emailPreferences: payload.data.subscriptions,
+    emailPreferences: payload.preferences,
   };
 }
 
diff --git a/src/services/user.js b/src/services/user.js
@@ -114,6 +114,7 @@ class User {
     this.private = {
       api: getApi('V3', tokenV3),
       apiV2: getApi('V2', tokenV2),
+      apiV5: getApi('V5', tokenV3),
       tokenV2,
       tokenV3,
     };
@@ -174,10 +175,10 @@ class User {
    * @returns {Promise} Resolves to the email preferences result
    */
   async getEmailPreferences(userId) {
-    const url = `/users/${userId}/preferences/email`;
-    const res = await this.private.api.get(url);
-    const x = (await res.json()).result;
-    return x.content;
+    const url = `/users/${userId}/preferences`;
+    const res = await this.private.apiV5.get(url);
+    const x = (await res.json());
+    return x.email;
   }
 
   /**
@@ -193,18 +194,17 @@ class User {
     const settings = {
       firstName,
       lastName,
-      subscriptions: {},
+      createdBy: String(userId),
+      updatedBy: String(userId),
+      subscriptions: preferences,
     };
 
-    if (!preferences) {
-      settings.subscriptions.TOPCODER_NL_GEN = true;
-    } else {
-      settings.subscriptions = preferences;
-    }
-    const url = `/users/${userId}/preferences/email`;
-
-    const res = await this.private.api.putJson(url, { param: settings });
-    return getApiResponsePayload(res);
+    const url = `/users/${userId}/preferences`;
+    const res = await this.private.apiV5.putJson(
+      url,
+      { email: settings, objectId: String(userId) },
+    );
+    return res;
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ Object {`
`166`	`166`	`},`
`167`	`167`	`},`
`168`	`168`	`"handle": "tcscoder",`
	`169`	`+ "preferences": Object {},`
`169`	`170`	`},`
`170`	`171`	`"type": "PROFILE/SAVE_EMAIL_PREFERENCES_DONE",`
`171`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ function saveEmailPreferencesInit() {}`
`397`	`397`	`function saveEmailPreferencesDone(profile, tokenV3, preferences) {`
`398`	`398`	`const service = getUserService(tokenV3);`
`399`	`399`	`return service.saveEmailPreferences(profile, preferences)`
`400`		`- .then(res => ({ data: res, handle: profile.handle }));`
	`400`	`+ .then(res => ({ data: res, handle: profile.handle, preferences }));`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -434,13 +434,13 @@ function onSaveEmailPreferencesDone(state, { payload, error }) {`
`434`	`434`	`return newState;`
`435`	`435`	`}`
`436`	`436`
`437`		`- if (newState.profileForHandle !== payload.handle \|\| !payload.data) {`
	`437`	`+ if (newState.profileForHandle !== payload.handle) {`
`438`	`438`	`return newState;`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`return {`
`442`	`442`	`...newState,`
`443`		`- emailPreferences: payload.data.subscriptions,`
	`443`	`+ emailPreferences: payload.preferences,`
`444`	`444`	`};`
`445`	`445`	`}`
`446`	`446`