From 229e39facf75354d78093bb40c38601a5cb967cf Mon Sep 17 00:00:00 2001 From: kartik adur Date: Sat, 6 Jan 2018 00:59:38 +0530 Subject: [PATCH] Other user checkins: user profile modal checkin count (#9646) * add loginIncentives to public fields to show non-loggedin user checkins * update integration tests for update in api response --- .../v3/integration/groups/GET-groups_groupId_members.test.js | 4 ++-- test/api/v3/integration/members/GET-members_id.test.js | 2 +- website/server/models/user/index.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js index 126cedaf5e..863a80c98d 100644 --- a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js +++ b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js @@ -72,7 +72,7 @@ describe('GET /groups/:groupId/members', () => { expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party', - 'backer', 'contributor', 'auth', 'items', 'inbox', + 'backer', 'contributor', 'auth', 'items', 'inbox', 'loginIncentives', ]); expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ @@ -93,7 +93,7 @@ describe('GET /groups/:groupId/members', () => { expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party', - 'backer', 'contributor', 'auth', 'items', 'inbox', + 'backer', 'contributor', 'auth', 'items', 'inbox', 'loginIncentives', ]); expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ diff --git a/test/api/v3/integration/members/GET-members_id.test.js b/test/api/v3/integration/members/GET-members_id.test.js index fa34fac096..15e3fa9f56 100644 --- a/test/api/v3/integration/members/GET-members_id.test.js +++ b/test/api/v3/integration/members/GET-members_id.test.js @@ -32,7 +32,7 @@ describe('GET /members/:memberId', () => { let memberRes = await user.get(`/members/${member._id}`); expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party', - 'backer', 'contributor', 'auth', 'items', 'inbox', + 'backer', 'contributor', 'auth', 'items', 'inbox', 'loginIncentives', ]); expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ diff --git a/website/server/models/user/index.js b/website/server/models/user/index.js index 0b3af02fdf..4731d7d6aa 100644 --- a/website/server/models/user/index.js +++ b/website/server/models/user/index.js @@ -8,7 +8,7 @@ require('./methods'); // A list of publicly accessible fields (not everything from preferences because there are also a lot of settings tha should remain private) export let publicFields = `preferences.size preferences.hair preferences.skin preferences.shirt preferences.chair preferences.costume preferences.sleep preferences.background preferences.tasks profile stats - achievements party backer contributor auth.timestamps items inbox.optOut`; + achievements party backer contributor auth.timestamps items inbox.optOut loginIncentives`; // The minimum amount of data needed when populating multiple users export let nameFields = 'profile.name';