SAK-46567 Set correct evaluated_item_owner_id for group assignments (sakaiproject#10134)

https://sakaiproject.atlassian.net/browse/SAK-46567

Author: adrianfish

gradebookng/tool/pom.xml

@@ -70,6 +70,10 @@
 			<groupId>org.sakaiproject.edu-services.sections</groupId>
 			<artifactId>sections-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.sakaiproject.assignment</groupId>
+			<artifactId>sakai-assignment-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.rubrics</groupId>
 			<artifactId>rubrics-service-api</artifactId>

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BasePanel.java

@@ -24,6 +24,9 @@
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+
+import org.sakaiproject.assignment.api.AssignmentService;
+import org.sakaiproject.authz.api.AuthzGroupService;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.gradebookng.business.GbRole;
 import org.sakaiproject.gradebookng.business.GradebookNgBusinessService;
@@ -49,6 +52,12 @@ public abstract class BasePanel extends Panel {
 	@SpringBean(name = "org.sakaiproject.rubrics.logic.RubricsService")
 	protected RubricsService rubricsService;
 
+	@SpringBean(name = "org.sakaiproject.assignment.api.AssignmentService")
+	protected AssignmentService assignmentService;
+
+	@SpringBean(name = "org.sakaiproject.authz.api.AuthzGroupService")
+	protected AuthzGroupService authzGroupService;
+
 	@SpringBean(name = "org.sakaiproject.component.api.ServerConfigurationService")
 	protected ServerConfigurationService serverConfigService;
 

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java

@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
@@ -37,6 +38,9 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
+
+import org.sakaiproject.authz.api.AuthzGroup;
+import org.sakaiproject.authz.api.GroupNotDefinedException;
 import org.sakaiproject.gradebookng.business.GbRole;
 import org.sakaiproject.gradebookng.business.model.GbGradeInfo;
 import org.sakaiproject.gradebookng.business.util.FormatHelper;
@@ -382,7 +386,31 @@ public boolean isVisible() {
 								String[] bits = assignment.getExternalId().split("/");
 								if (bits != null && bits.length >= 1) {
 									String assignmentId = bits[bits.length-1];
-									String submissionId = rubricsService.getRubricEvaluationObjectId(assignmentId, studentUuid, RubricsConstants.RBCS_TOOL_ASSIGNMENT);
+									String ownerId = studentUuid;
+									try {
+										org.sakaiproject.assignment.api.model.Assignment assignmentsAssignment = assignmentService.getAssignment(assignmentId);
+										if (assignmentsAssignment.getIsGroup()) {
+											Optional<String> groupId = assignmentsAssignment.getGroups().stream().filter(g -> {
+
+												try {
+													AuthzGroup group = authzGroupService.getAuthzGroup(g);
+													return group.getMember(studentUuid) != null;
+												} catch (GroupNotDefinedException gnde) {
+													return false;
+												}
+											}).findAny();
+
+											if (groupId.isPresent()) {
+												ownerId = groupId.get();
+											} else {
+												log.error("Assignment {} is a group assignment, but {} was not in any of the groups", assignmentId, studentUuid);
+											}
+										}
+									} catch (Exception e) {
+										log.error("Failed to determine ownerId for submission", e);
+									}
+
+									String submissionId = rubricsService.getRubricEvaluationObjectId(assignmentId, ownerId, RubricsConstants.RBCS_TOOL_ASSIGNMENT);
 									sakaiRubricButton.add(AttributeModifier.append("entity-id", assignmentId));
 									sakaiRubricButton.add(AttributeModifier.append("evaluated-item-id", submissionId));
 								} else {

rubrics/impl/src/main/java/org/sakaiproject/rubrics/logic/RubricsServiceImpl.java

@@ -606,8 +606,6 @@ private Optional<EntityModel<ToolItemRubricAssociation>> getRubricAssociationRes
         return associationResource;
     }
 
-    //TODO generate a public String postRubricAssociation(String tool, String id, HashMap<String,String> params)
-
     public String getRubricEvaluationObjectId(String associationId, String userId, String toolId) {
         try {
             URI apiBaseUrl = new URI(serverConfigurationService.getServerUrl() + RBCS_SERVICE_URL_PREFIX);