fix(aapd-951): get user by email from session, ensure correct user

Planning-Inspectorate · Feb 15, 2024 · 89bc712 · 89bc712
1 parent 0bb0984
commit 89bc712
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/packages/common/src/view-model-maps/appeal-headline.js b/packages/common/src/view-model-maps/appeal-headline.js
@@ -1,10 +1,11 @@
+const { APPEAL_USER_ROLES } = require('@pins/common/src/constants');
 const { formatAddress } = require('../lib/format-address');
 
 /**
  * @param {import("../client/appeals-api-client").AppealCaseWithAppellant} caseData
- * @param {import('@pins/common/src/constants').AppealToUserRoles} userType
+ * @param {import('@pins/common/src/constants').AppealToUserRoles|string|null} userType
  */
-exports.formatHeadlineData = (caseData, userType = 'interestedParty') => {
+exports.formatHeadlineData = (caseData, userType = APPEAL_USER_ROLES.INTERESTED_PARTY) => {
 	const {
 		caseReference,
 		LPAName,

diff --git a/packages/forms-web-app/src/controllers/selected-appeal/selected-appeal.js b/packages/forms-web-app/src/controllers/selected-appeal/selected-appeal.js
@@ -16,20 +16,26 @@ exports.get = async (req, res) => {
 	//i.e '/appeals/' = appellant | agent
 	const userType = determineUser(userRouteUrl);
 
-	let caseData;
-
-	if (userType) {
-		// TODO: determine user ID (can get from API via email, in session)
-		caseData = await apiClient.getUsersAppealCase({
-			caseReference: appealNumber,
-			role: userType,
-			userId: ''
-		});
-	} else {
-		// TODO: handle LPA
-		caseData = await apiClient.getAppealCaseDataByCaseReference(appealNumber);
+	if (userType === null) {
+		throw new Error('Unknown role');
 	}
 
+	let userEmail;
+
+	if (req.session.lpaUser) {
+		userEmail = req.session.lpaUser.email;
+	} else if (req.session.email) {
+		userEmail = req.session.email;
+	}
+
+	const user = await apiClient.getUserByEmailV2(userEmail);
+
+	const caseData = await apiClient.getUsersAppealCase({
+		caseReference: appealNumber,
+		role: userType,
+		userId: user.id
+	});
+
 	const headlineData = formatHeadlineData(caseData, userType);
 
 	const viewContext = {

diff --git a/packages/forms-web-app/src/lib/determine-user.js b/packages/forms-web-app/src/lib/determine-user.js
@@ -11,8 +11,9 @@ const determineUser = (url) => {
 		return APPEAL_USER_ROLES.APPELLANT;
 	} else if (url.includes('/manage-appeals/')) {
 		return LPA_USER_ROLE;
+	} else {
+		return null;
 	}
-	return null;
 };
 
 module.exports = { determineUser };