Merge pull request #1005 from HDRUK/preprod

SUPP-1367,GAT-2105: GAT API Release -v4.0.2
HDRUK · Mar 29, 2023 · b744961 · b744961
2 parents 3473b5e + 80fb53a
commit b744961
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1 +1 @@
-v4.0.1
+v4.0.2
diff --git a/src/resources/team/team.controller.js b/src/resources/team/team.controller.js
@@ -41,7 +41,6 @@ const getTeamById = async (req, res) => {
 // GET api/v1/teams/:id/members
 const getTeamMembers = async (req, res) => {
 	try {
-		// 1. Get the team from the database
 		const team = await TeamModel.findOne({ _id: req.params.id }).populate({
 			path: 'users',
 			populate: {
@@ -82,8 +81,9 @@ const formatTeamUsers = team => {
 				id,
 				_id,
 				email,
-				additionalInfo: { organisation, bio, showOrganisation, showBio },
+				additionalInfo,
 			} = user;
+			let { organisation = '', bio = '', showOrganisation = true, showBio = true } = { ...additionalInfo };
 			let userMember = team.members.find(el => el.memberid.toString() === user._id.toString());
 			let { roles = [] } = userMember;
 			return {

diff --git a/src/services/hubspot/hubspot.js b/src/services/hubspot/hubspot.js
@@ -10,7 +10,7 @@ import { logger } from '../../resources/utilities/logger';
 const apiKey = process.env.HUBSPOT_API_KEY;
 const logCategory = 'Hubspot Integration';
 let hubspotClient;
-if (apiKey) hubspotClient = new Client({ apiKey, numberOfApiCallRetries: NumberOfRetries.Three });
+if (apiKey) hubspotClient = new Client({ accessToken: apiKey, numberOfApiCallRetries: NumberOfRetries.Three });
 
 /**
  * Sync A Single Gateway User With Hubspot