Merge pull request #5607 from SandhraSokhal/PLFM-9543

SandhraSokhal · web-flow · commit 5f6fcf2aa911 · 2026-04-27T15:17:16.000-07:00
PLFM-9543 new API to get thread, submission and permission
diff --git a/client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseClient.java b/client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseClient.java
@@ -124,6 +124,7 @@
 import org.sagebionetworks.repo.model.dataaccess.AccessApprovalSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessApprovalSearchResponse;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResponse;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementStatus;
@@ -2959,6 +2960,21 @@ void updateVerificationState(long verificationId,
 	 */
 	DiscussionThreadBundle getThread(String threadId) throws SynapseException;
 
+	/**
+	 * Get the discussion thread for a given submission.
+	 */
+	DiscussionThreadBundle getThreadForSubmission(String submissionId) throws SynapseException;
+
+	/**
+	 * Get the submission associated with a given thread.
+	 */
+	org.sagebionetworks.repo.model.dataaccess.Submission getSubmissionForThread(String threadId) throws SynapseException;
+
+	/**
+	 * Get the caller's permissions for a given access requirement.
+	 */
+	AccessRequirementPermissions getAccessRequirementPermissions(String requirementId) throws SynapseException;
+
 	/**
 	 * Get threads for a given forum
 	 * 
diff --git a/client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseClientImpl.java b/client/synapseJavaClient/src/main/java/org/sagebionetworks/client/SynapseClientImpl.java
@@ -153,6 +153,7 @@
 import org.sagebionetworks.repo.model.dataaccess.AccessApprovalSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessApprovalSearchResponse;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResponse;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementStatus;
@@ -280,7 +281,6 @@
 import org.sagebionetworks.repo.model.grid.GridQueryJobResponse;
 import org.sagebionetworks.repo.model.grid.GridUpdateJobRequest;
 import org.sagebionetworks.repo.model.grid.GridUpdateJobResponse;
-import org.sagebionetworks.repo.model.grid.query.QueryRequest;
 import org.sagebionetworks.repo.model.limits.ProjectStorageUsage;
 import org.sagebionetworks.repo.model.message.MessageBundle;
 import org.sagebionetworks.repo.model.message.MessageRecipientSet;
@@ -5225,6 +5225,24 @@ public DiscussionThreadBundle getThread(String threadId) throws SynapseException
 		return getJSONEntity(getRepoEndpoint(), url, DiscussionThreadBundle.class);
 	}
 
+	@Override
+	public DiscussionThreadBundle getThreadForSubmission(String submissionId) throws SynapseException {
+		ValidateArgument.required(submissionId, "submissionId");
+		return getJSONEntity(getRepoEndpoint(), THREAD+"/submission/"+submissionId, DiscussionThreadBundle.class);
+	}
+
+	@Override
+	public org.sagebionetworks.repo.model.dataaccess.Submission getSubmissionForThread(String threadId) throws SynapseException {
+		ValidateArgument.required(threadId, "threadId");
+		return getJSONEntity(getRepoEndpoint(), "/dataAccessSubmission/thread/"+threadId, org.sagebionetworks.repo.model.dataaccess.Submission.class);
+	}
+
+	@Override
+	public AccessRequirementPermissions getAccessRequirementPermissions(String requirementId) throws SynapseException {
+		ValidateArgument.required(requirementId, "requirementId");
+		return getJSONEntity(getRepoEndpoint(), ACCESS_REQUIREMENT+"/"+requirementId+"/permissions", AccessRequirementPermissions.class);
+	}
+
 	@Override
 	public PaginatedResults<DiscussionThreadBundle> getThreadsForForum(
 			String forumId, Long limit, Long offset, DiscussionThreadOrder order,
diff --git a/integration-test/src/test/java/org/sagebionetworks/ITDataAccessTest.java b/integration-test/src/test/java/org/sagebionetworks/ITDataAccessTest.java
@@ -58,6 +58,7 @@
 import org.sagebionetworks.repo.model.dataaccess.AccessApprovalSearchSort;
 import org.sagebionetworks.repo.model.dataaccess.AccessApprovalSortField;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResponse;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementStatus;
@@ -1187,7 +1188,7 @@ public void testForumAndThreadCreatedForManagedAR() throws Exception {
 		assertNotNull(thread.getForumId());
 		assertEquals(forum.getId(), thread.getForumId());
 
-		//create a reply
+		//call under test. Create a reply
 		CreateDiscussionReply replyToCreate = new CreateDiscussionReply();
 		replyToCreate.setThreadId(thread.getId());
 		String message = "This is test message";
@@ -1197,5 +1198,21 @@ public void testForumAndThreadCreatedForManagedAR() throws Exception {
 		assertEquals(thread.getId(), replyBundle.getThreadId());
 		assertEquals(managedAR.getId().toString(), replyBundle.getObjectId());
 		assertEquals(ForumObjectType.ACCESS_REQUIREMENT, replyBundle.getObjectType());
+
+		//call under test. Get thread for submission
+		DiscussionThreadBundle threadForSubmission = adminSynapse.getThreadForSubmission(submissionId);
+		assertNotNull(threadForSubmission);
+		assertEquals(thread.getId(), threadForSubmission.getId());
+		assertEquals("submissionId:" + submissionId, threadForSubmission.getTitle());
+
+		//call under test. Get submission for thread
+		org.sagebionetworks.repo.model.dataaccess.Submission submissionForThread = adminSynapse.getSubmissionForThread(thread.getId());
+		assertNotNull(submissionForThread);
+		assertEquals(submissionId, submissionForThread.getId());
+
+		//call under test. Get permission on AR
+		AccessRequirementPermissions permissions = adminSynapse.getAccessRequirementPermissions(managedAR.getId().toString());
+		assertNotNull(permissions);
+		assertTrue(permissions.getCanReviewSubmissions());
 	}
 }
diff --git a/lib/jdomodels/src/main/java/org/sagebionetworks/repo/model/dbo/dao/discussion/DBODiscussionReplyDAOImpl.java b/lib/jdomodels/src/main/java/org/sagebionetworks/repo/model/dbo/dao/discussion/DBODiscussionReplyDAOImpl.java
@@ -63,7 +63,7 @@ public DiscussionReplyBundle mapRow(ResultSet rs, int rowNum)
 			String objectType = rs.getString(COL_FORUM_OBJECT_TYPE);
 			dto.setObjectType(ForumObjectType.valueOf(objectType));
 			dto.setObjectId(rs.getString(COL_FORUM_OBJECT_ID));
-			if ("ENTITY".equals(objectType)) {
+			if (ForumObjectType.ENTITY == ForumObjectType.valueOf(objectType)) {
 				dto.setProjectId(KeyFactory.keyToString(rs.getLong(COL_FORUM_OBJECT_ID)));
 			}
 			dto.setMessageKey(rs.getString(COL_DISCUSSION_REPLY_MESSAGE_KEY));
diff --git a/lib/jdomodels/src/main/java/org/sagebionetworks/repo/model/dbo/dao/discussion/DBODiscussionThreadDAOImpl.java b/lib/jdomodels/src/main/java/org/sagebionetworks/repo/model/dbo/dao/discussion/DBODiscussionThreadDAOImpl.java
@@ -91,7 +91,7 @@ public DiscussionThreadBundle mapRow(ResultSet rs, int rowNum)
 			String objectType = rs.getString(COL_FORUM_OBJECT_TYPE);
 			dto.setObjectId(objectId);
 			dto.setObjectType(ForumObjectType.valueOf(objectType));
-			if ("ENTITY".equals(objectType)) {
+			if (ForumObjectType.ENTITY == ForumObjectType.valueOf(objectType)) {
 				dto.setProjectId(KeyFactory.keyToString(Long.valueOf(objectId)));
 			}
 			Blob titleBlob = rs.getBlob(COL_DISCUSSION_THREAD_TITLE);
diff --git a/lib/lib-auto-generated/src/main/resources/schema/org/sagebionetworks/repo/model/dataaccess/AccessRequirementPermissions.json b/lib/lib-auto-generated/src/main/resources/schema/org/sagebionetworks/repo/model/dataaccess/AccessRequirementPermissions.json
@@ -0,0 +1,9 @@
+{
+	"description": "The permissions a user has on an access requirement.",
+	"properties": {
+		"canReviewSubmissions": {
+			"type": "boolean",
+			"description": "Can the user review submissions for this access requirement."
+		}
+	}
+}
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/AccessRequirementManager.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/AccessRequirementManager.java
@@ -7,6 +7,7 @@
 import org.sagebionetworks.repo.model.AccessControlList;
 import org.sagebionetworks.repo.model.AccessRequirement;
 import org.sagebionetworks.repo.model.ConflictingUpdateException;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.DatastoreException;
 import org.sagebionetworks.repo.model.InvalidModelException;
 import org.sagebionetworks.repo.model.LockAccessRequirement;
@@ -150,4 +151,13 @@ RestrictableObjectDescriptorResponse getSubjects(String accessRequirementId,
 	 */
 	void setDynamicallyBoundAccessRequirementsForSubject(RestrictableObjectDescriptor subject, Set<Long> newArIds);
 
+	/**
+	 * Get the caller's permissions for the given access requirement.
+	 *
+	 * @param user
+	 * @param requirementId
+	 * @return
+	 */
+	AccessRequirementPermissions getPermissions(UserInfo user, String requirementId);
+
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/AccessRequirementManagerImpl.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/AccessRequirementManagerImpl.java
@@ -45,6 +45,7 @@
 import org.sagebionetworks.repo.model.UserInfo;
 import org.sagebionetworks.repo.model.dao.NotificationEmailDAO;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResponse;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResult;
@@ -688,5 +689,14 @@ void sendChangeMessage(Long userId, ChangeType changeType, Long id, Long version
 					.setObjectVersion(versionNumber)
 		);
 	}
-	
+
+	@Override
+	public AccessRequirementPermissions getPermissions(UserInfo user, String requirementId) {
+		ValidateArgument.required(user, "user");
+		ValidateArgument.required(requirementId, "requirementId");
+		return new AccessRequirementPermissions()
+				.setCanReviewSubmissions(daAuthManager.canReviewAccessRequirementSubmissions(user, requirementId).isAuthorized());
+
+	}
+
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/SubmissionManager.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/SubmissionManager.java
@@ -109,6 +109,15 @@ public interface SubmissionManager {
 	 */
 	Submission getSubmission(UserInfo userInfo, String submissionId);
 
+	/**
+	 * Fetch a submission by threadId, if the user is not part of ACT they must be validated and assigned as reviewers of the AR submissions in order to fetch the submission.
+	 *
+	 * @param user
+	 * @param threadId
+	 * @return
+	 */
+	Submission getSubmissionForThread(UserInfo user, String threadId);
+
 	/**
 	 * Fetch their own access approval information specific to a submission, as long as the user is an accessor in the submission.
 	 *
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/SubmissionManagerImpl.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/dataaccess/SubmissionManagerImpl.java
@@ -68,6 +68,7 @@
 import org.sagebionetworks.repo.model.message.TransactionalMessenger;
 import org.sagebionetworks.repo.model.subscription.SubscriptionObjectType;
 import org.sagebionetworks.repo.transactions.WriteTransaction;
+import org.sagebionetworks.repo.web.NotFoundException;
 import org.sagebionetworks.util.ValidateArgument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -477,6 +478,16 @@ public Submission getSubmission(UserInfo userInfo, String submissionId) {
 		return submission;
 	}
 
+	@Override
+	public Submission getSubmissionForThread(UserInfo user, String threadId) {
+		ValidateArgument.required(user, "user");
+		ValidateArgument.required(threadId, "threadId");
+		String submissionId = threadDao.getSubmissionIdForThread(threadId).orElseThrow(() ->
+				new NotFoundException("Submission for thread '" + threadId + "' does not exist"));
+		return getSubmission(user, submissionId);
+	}
+
+
 	@Override
 	public AccessApproval getUserAccessApproval(UserInfo userInfo, String submissionId) {
 		ValidateArgument.required(userInfo, "userInfo");
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/discussion/DiscussionThreadManager.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/discussion/DiscussionThreadManager.java
@@ -167,4 +167,13 @@ public PaginatedResults<DiscussionThreadBundle> getThreadsForEntity(UserInfo use
 	 * @return
 	 */
 	public PaginatedIds getModerators(UserInfo user, String forumId, Long limit, Long offset);
+
+	/**
+	 * Get the discussion thread for a given submission.
+	 *
+	 * @param user
+	 * @param submissionId
+	 * @return
+	 */
+	DiscussionThreadBundle getThreadForSubmission(UserInfo user, String submissionId);
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/discussion/DiscussionThreadManagerImpl.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/discussion/DiscussionThreadManagerImpl.java
@@ -392,4 +392,15 @@ public PaginatedIds getModerators(UserInfo userInfo, String forumId, Long limit,
 		results.setTotalNumberOfResults(groupMembersDao.getIndividualCount(principalIds));
 		return results;
 	}
+
+	@Override
+	public DiscussionThreadBundle getThreadForSubmission(UserInfo user, String submissionId) {
+		ValidateArgument.required(submissionId, "submissionId");
+		UserInfo.validateUserInfo(user);
+		DiscussionThreadBundle thread = threadDao.getThreadForSubmission(submissionId)
+				.orElseThrow(() -> new NotFoundException("Thread for submission '" + submissionId + "' does not exist"));
+		subscriptionAndDiscussionAuthorizationManager.canAccessObjectType(user, thread.getObjectType(), thread.getObjectId(), ACCESS_TYPE.READ)
+				.checkAuthorizationOrElseThrow();
+		return thread;
+	}
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/AccessRequirementService.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/AccessRequirementService.java
@@ -8,6 +8,7 @@
 import org.sagebionetworks.repo.model.RestrictableObjectDescriptorResponse;
 import org.sagebionetworks.repo.model.UnauthorizedException;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResponse;
 import org.sagebionetworks.repo.web.NotFoundException;
@@ -50,4 +51,6 @@ void deleteAccessRequirements(Long userId, String requirementId)
 
 	AccessRequirementSearchResponse searchAccessRequirements(AccessRequirementSearchRequest request);
 
+	AccessRequirementPermissions getPermissions(Long userId, String requirementId);
+
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/AccessRequirementServiceImpl.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/AccessRequirementServiceImpl.java
@@ -13,6 +13,7 @@
 import org.sagebionetworks.repo.model.UnauthorizedException;
 import org.sagebionetworks.repo.model.UserInfo;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchResponse;
 import org.sagebionetworks.repo.transactions.WriteTransaction;
@@ -120,4 +121,10 @@ public AccessRequirementSearchResponse searchAccessRequirements(AccessRequiremen
 		return accessRequirementManager.searchAccessRequirements(request);
 	}
 
+	@Override
+	public AccessRequirementPermissions getPermissions(Long userId, String requirementId) {
+		UserInfo userInfo = userManager.getUserInfo(userId);
+		return accessRequirementManager.getPermissions(userInfo, requirementId);
+	}
+
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/dataaccess/DataAccessService.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/dataaccess/DataAccessService.java
@@ -57,6 +57,8 @@ public interface DataAccessService {
 
 	Submission getSubmission(Long userId, String submissionId);
 
+	Submission getSubmissionForThread(Long userId, String threadId);
+
 	AccessApproval getUserAccessApproval(Long userId, String submissionId);
 
 	UserSubmissionSearchResponse searchUserSubmissions(Long userId, UserSubmissionSearchRequest request);
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/dataaccess/DataAccessServiceImpl.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/dataaccess/DataAccessServiceImpl.java
@@ -142,6 +142,12 @@ public Submission getSubmission(Long userId, String submissionId) {
 		return dataAccessSubmissionManager.getSubmission(user, submissionId);
 	}
 
+	@Override
+	public Submission getSubmissionForThread(Long userId, String threadId) {
+		UserInfo user = userManager.getUserInfo(userId);
+		return dataAccessSubmissionManager.getSubmissionForThread(user, threadId);
+	}
+
 	@Override
 	public AccessApproval getUserAccessApproval(Long userId, String submissionId) {
 		UserInfo user = userManager.getUserInfo(userId);
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/discussion/DiscussionService.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/discussion/DiscussionService.java
@@ -271,4 +271,13 @@ public PaginatedResults<DiscussionThreadBundle> getThreadsForEntity(Long userId,
 	 * @return
 	 */
 	DiscussionSearchResponse search(Long userId, String forumId, DiscussionSearchRequest request);
+
+	/**
+	 * Get the discussion thread for a given submission.
+	 *
+	 * @param userId
+	 * @param submissionId
+	 * @return
+	 */
+	DiscussionThreadBundle getThreadForSubmission(Long userId, String submissionId);
 }
diff --git a/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/discussion/DiscussionServiceImpl.java b/services/repository-managers/src/main/java/org/sagebionetworks/repo/service/discussion/DiscussionServiceImpl.java
@@ -213,4 +213,10 @@ public DiscussionSearchResponse search(Long userId, String forumId, DiscussionSe
 		UserInfo user = userManager.getUserInfo(userId);
 		return searchManager.search(user, Long.valueOf(forumId), request);
 	}
+
+	@Override
+	public DiscussionThreadBundle getThreadForSubmission(Long userId, String submissionId) {
+		UserInfo user = userManager.getUserInfo(userId);
+		return threadManager.getThreadForSubmission(user, submissionId);
+	}
 }
diff --git a/services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/dataaccess/AccessRequirementManagerImplUnitTest.java b/services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/dataaccess/AccessRequirementManagerImplUnitTest.java
@@ -19,7 +19,6 @@
 import static org.mockito.Mockito.when;
 import static org.sagebionetworks.repo.manager.dataaccess.AccessRequirementManagerImpl.DEFAULT_LIMIT;
 import static org.sagebionetworks.repo.manager.dataaccess.AccessRequirementManagerImpl.DEFAULT_OFFSET;
-import static org.sagebionetworks.repo.model.AuthorizationConstants.DEFAULT_REALM_ID;
 import static org.sagebionetworks.repo.model.AuthorizationConstants.BOOTSTRAP_PRINCIPAL;
 
 import java.util.ArrayList;
@@ -51,9 +50,7 @@
 import org.sagebionetworks.repo.manager.UserInfoTestHelper;
 import org.sagebionetworks.repo.model.ACCESS_TYPE;
 import org.sagebionetworks.repo.model.ACTAccessRequirement;
-import org.sagebionetworks.repo.model.AccessApprovalDAO;
 import org.sagebionetworks.repo.model.AccessControlList;
-import org.sagebionetworks.repo.model.AccessControlListDAO;
 import org.sagebionetworks.repo.model.AccessRequirement;
 import org.sagebionetworks.repo.model.AccessRequirementDAO;
 import org.sagebionetworks.repo.model.dbo.dao.discussion.ForumDAO;
@@ -77,6 +74,7 @@
 import org.sagebionetworks.repo.model.UnauthorizedException;
 import org.sagebionetworks.repo.model.UserInfo;
 import org.sagebionetworks.repo.model.auth.AuthorizationStatus;
+import org.sagebionetworks.repo.model.dataaccess.AccessRequirementPermissions;
 import org.sagebionetworks.repo.model.dao.NotificationEmailDAO;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementConversionRequest;
 import org.sagebionetworks.repo.model.dataaccess.AccessRequirementSearchRequest;
@@ -2110,4 +2108,21 @@ public void testSetDynamicallyBoundAccessRequirementsForSubjectWithAddAndRemove(
 		verifyZeroInteractions(mockTransactionalMessenger);
 	}
 
+	@Test
+	public void testGetPermissionsWithReviewAccess() {
+		when(mockDaAuthManager.canReviewAccessRequirementSubmissions(userInfo, "123"))
+				.thenReturn(AuthorizationStatus.authorized());
+		// call under test
+		AccessRequirementPermissions result = arm.getPermissions(userInfo, "123");
+		assertTrue(result.getCanReviewSubmissions());
+	}
+
+	@Test
+	public void testGetPermissionsWithoutReviewAccess() {
+		when(mockDaAuthManager.canReviewAccessRequirementSubmissions(userInfo, "123"))
+				.thenReturn(AuthorizationStatus.accessDenied("no"));
+		// call under test
+		AccessRequirementPermissions result = arm.getPermissions(userInfo, "123");
+		assertFalse(result.getCanReviewSubmissions());
+	}
 }
diff --git a/services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/dataaccess/SubmissionManagerImplTest.java b/services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/dataaccess/SubmissionManagerImplTest.java
diff --git a/services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/discussion/DiscussionThreadManagerImplTest.java b/services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/discussion/DiscussionThreadManagerImplTest.java
diff --git a/services/repository/src/main/java/org/sagebionetworks/repo/web/UrlHelpers.java b/services/repository/src/main/java/org/sagebionetworks/repo/web/UrlHelpers.java
diff --git a/services/repository/src/main/java/org/sagebionetworks/repo/web/controller/AccessRequirementController.java b/services/repository/src/main/java/org/sagebionetworks/repo/web/controller/AccessRequirementController.java
diff --git a/services/repository/src/main/java/org/sagebionetworks/repo/web/controller/DataAccessController.java b/services/repository/src/main/java/org/sagebionetworks/repo/web/controller/DataAccessController.java
diff --git a/services/repository/src/main/java/org/sagebionetworks/repo/web/controller/DiscussionController.java b/services/repository/src/main/java/org/sagebionetworks/repo/web/controller/DiscussionController.java

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public DiscussionReplyBundle mapRow(ResultSet rs, int rowNum)`
`63`	`63`	`String objectType = rs.getString(COL_FORUM_OBJECT_TYPE);`
`64`	`64`	`dto.setObjectType(ForumObjectType.valueOf(objectType));`
`65`	`65`	`dto.setObjectId(rs.getString(COL_FORUM_OBJECT_ID));`
`66`		`- if ("ENTITY".equals(objectType)) {`
	`66`	`+ if (ForumObjectType.ENTITY == ForumObjectType.valueOf(objectType)) {`
`67`	`67`	`dto.setProjectId(KeyFactory.keyToString(rs.getLong(COL_FORUM_OBJECT_ID)));`
`68`	`68`	`}`
`69`	`69`	`dto.setMessageKey(rs.getString(COL_DISCUSSION_REPLY_MESSAGE_KEY));`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public DiscussionThreadBundle mapRow(ResultSet rs, int rowNum)`
`91`	`91`	`String objectType = rs.getString(COL_FORUM_OBJECT_TYPE);`
`92`	`92`	`dto.setObjectId(objectId);`
`93`	`93`	`dto.setObjectType(ForumObjectType.valueOf(objectType));`
`94`		`- if ("ENTITY".equals(objectType)) {`
	`94`	`+ if (ForumObjectType.ENTITY == ForumObjectType.valueOf(objectType)) {`
`95`	`95`	`dto.setProjectId(KeyFactory.keyToString(Long.valueOf(objectId)));`
`96`	`96`	`}`
`97`	`97`	`Blob titleBlob = rs.getBlob(COL_DISCUSSION_THREAD_TITLE);`