Skip to content

Commit

Permalink
SAK-39993 Fix problems in assignment conversion job. (sakaiproject#5606)
Browse files Browse the repository at this point in the history
  • Loading branch information
@juanjmerono
juanjmerono authored May 17, 2018
1 parent 63b4764 commit 7120a4b
Show file tree
Hide file tree
Showing 9 changed files with 382 additions and 3 deletions.
34 changes: 32 additions & 2 deletions ...src/java/org/sakaiproject/assignment/impl/conversion/AssignmentConversionServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,15 @@
import org.sakaiproject.assignment.api.model.AssignmentSubmission;
import org.sakaiproject.assignment.api.model.AssignmentSubmissionSubmitter;
import org.sakaiproject.assignment.api.persistence.AssignmentRepository;
import org.sakaiproject.authz.api.Member;
import org.sakaiproject.component.api.ServerConfigurationService;
import org.sakaiproject.site.api.SiteService;
import org.sakaiproject.entity.api.ResourceProperties;
import org.sakaiproject.hibernate.AssignableUUIDGenerator;
import org.sakaiproject.site.api.Site;
import org.sakaiproject.site.api.Group;
import org.sakaiproject.util.BasicConfigItem;
import static org.sakaiproject.assignment.api.AssignmentServiceConstants.*;

@Slf4j
public class AssignmentConversionServiceImpl implements AssignmentConversionService {
Expand All @@ -67,6 +72,7 @@ public class AssignmentConversionServiceImpl implements AssignmentConversionServ
@Setter private AssignmentRepository assignmentRepository;
@Setter private AssignmentDataProvider dataProvider;
@Setter private ServerConfigurationService serverConfigurationService;
@Setter private SiteService siteService;

private Predicate<String> attachmentFilter = Pattern.compile("attachment\\d+").asPredicate();
private Predicate<String> submitterFilter = Pattern.compile("submitter\\d+").asPredicate();
Expand Down Expand Up @@ -421,12 +427,16 @@ private AssignmentSubmission submissionReintegration(Assignment assignment, O11S
s.setReturned(submission.getReturned());
s.setSubmitted(submission.getSubmitted());
s.setSubmittedText(decodeBase64(submission.getSubmittedtextHtml()));
s.setUserSubmission(submission.getIsUserSubmission());
s.setUserSubmission(submission.getIsUserSubmission()!=null?submission.getIsUserSubmission():
StringUtils.isNotBlank(s.getSubmittedText())
|| Arrays.stream(submissionAnyKeys).filter(submittedAttachmentFilter).collect(Collectors.toSet()).size() > 0
|| assignment.getTypeOfSubmission() == Assignment.SubmissionType.NON_ELECTRONIC_ASSIGNMENT_SUBMISSION);

Set<AssignmentSubmissionSubmitter> submitters = s.getSubmitters();
if (assignment.getIsGroup()) {
// submitterid is the group
if (StringUtils.isNotBlank(submission.getSubmitterid())) {
if (StringUtils.isNotBlank(submission.getSubmitterid())
&& assignment.getGroups().contains("/site/"+assignment.getContext()+"/group/"+submission.getSubmitterid())) {
s.setGroupId(submission.getSubmitterid());
} else {
// the submitterid must not be blank for a group submission
Expand All @@ -435,6 +445,26 @@ private AssignmentSubmission submissionReintegration(Assignment assignment, O11S

// support for a list of submitter0, grade0
Set<String> submitterKeys = Arrays.stream(submissionAnyKeys).filter(submitterFilter).collect(Collectors.toSet());
// Maybe the xml has no submitterN attributes, check the group members
if (submitterKeys.size() == 0) {
// Maybe submitter keys are missing check group members
try {
Site assignmentSite = siteService.getSite(assignment.getContext());
Group submissionGroup = assignmentSite.getGroup(s.getGroupId());
int k=0;
for (Member member : submissionGroup.getMembers()) {
if (!member.getRole().isAllowed(SECURE_ADD_ASSIGNMENT)
&& !member.getRole().isAllowed(SECURE_GRADE_ASSIGNMENT_SUBMISSION)) {
submissionAny.put("submitter"+k, member.getUserId());
submitterKeys.add("submitter"+k);
k++;
}
}
} catch (Exception ex) {
log.warn("Error looking for real group members in submission: {} site: {} group: {}",s.getId(),assignment.getContext(),s.getGroupId());
}
}

for (String submitterKey : submitterKeys) {
AssignmentSubmissionSubmitter submitter = new AssignmentSubmissionSubmitter();
String submitterId = (String) submissionAny.get(submitterKey);
Expand Down
2 changes: 1 addition & 1 deletion assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/O11Submission.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class O11Submission {
// id="aa5d91c4-eeb0-4b51-aaae-3b27991fdac2"
private String id;
// isUserSubmission="true"
private Boolean isUserSubmission = Boolean.FALSE;
private Boolean isUserSubmission = null;
// lastmod="20171215211945307"
private String lastmod;
// pledgeflag="true"
Expand Down
189 changes: 189 additions & 0 deletions assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentConversionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,19 @@
import org.sakaiproject.assignment.impl.conversion.O11Submission;
import org.sakaiproject.assignment.api.persistence.AssignmentRepository;
import org.sakaiproject.component.api.ServerConfigurationService;
import org.sakaiproject.exception.IdUnusedException;
import org.sakaiproject.hibernate.AssignableUUIDGenerator;
import org.sakaiproject.site.api.Group;
import org.sakaiproject.authz.api.Member;
import org.sakaiproject.authz.api.Role;
import org.sakaiproject.site.api.Site;
import org.sakaiproject.site.api.SiteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.util.ReflectionTestUtils;
import static org.sakaiproject.assignment.api.AssignmentServiceConstants.*;

@Slf4j
@RunWith(SpringJUnit4ClassRunner.class)
Expand All @@ -63,6 +70,7 @@ public class AssignmentConversionTest extends AbstractTransactionalJUnit4SpringC
@Autowired private AssignmentConversionService conversion;
@Autowired private AssignmentRepository assignmentRepository;
@Autowired private ServerConfigurationService serviceConfigurationService;
@Autowired private SiteService siteService;

private AssignmentDataProvider mockDataProvider;

Expand All @@ -74,6 +82,41 @@ public void setup() {
.thenReturn(new String[] {"org.sakaiproject.assignment.api.model.Assignment", "org.sakaiproject.assignment.api.model.AssignmentSubmission"});
Mockito.when(serviceConfigurationService.getConfigItem(AssignableUUIDGenerator.HIBERNATE_ASSIGNABLE_ID_CLASSES)).thenReturn(null);
AssignableUUIDGenerator.setServerConfigurationService(serviceConfigurationService);
try {
Site site = (Site) Mockito.mock(Site.class);
Mockito.when(siteService.getSite("2614_G_2015_N_N")).thenReturn(site);
Group group1 = (Group) Mockito.mock(Group.class);
Mockito.when(site.getGroup("3d53024d-0f55-44fc-b1dc-acc03ff53b2b")).thenReturn(group1);
Group group2 = (Group) Mockito.mock(Group.class);
Mockito.when(site.getGroup("53453ae9-afa2-4983-996b-aeda741bf14b")).thenReturn(group2);
Role student = (Role) Mockito.mock(Role.class);
Mockito.when(student.isAllowed(SECURE_ADD_ASSIGNMENT)).thenReturn(false);
Mockito.when(student.isAllowed(SECURE_GRADE_ASSIGNMENT_SUBMISSION)).thenReturn(false);
Role instructor = (Role) Mockito.mock(Role.class);
Mockito.when(instructor.isAllowed(SECURE_ADD_ASSIGNMENT)).thenReturn(true);
Mockito.when(instructor.isAllowed(SECURE_GRADE_ASSIGNMENT_SUBMISSION)).thenReturn(true);
Set<Member> members = new HashSet<>();
Member m1 = (Member) Mockito.mock(Member.class);
members.add(m1);
Mockito.when(m1.getRole()).thenReturn(student);
Mockito.when(m1.getUserId()).thenReturn("bd67eb80-721c-44dd-9fee-599be7086ad4");
Member m2 = (Member) Mockito.mock(Member.class);
members.add(m2);
Mockito.when(m2.getRole()).thenReturn(student);
Mockito.when(m2.getUserId()).thenReturn("cef95910-fbd7-4e3c-bdb9-623061c23686");
Member m3 = (Member) Mockito.mock(Member.class);
members.add(m3);
Mockito.when(m3.getRole()).thenReturn(student);
Mockito.when(m3.getUserId()).thenReturn("97597bf2-80b1-41ee-a298-d4e0944dc9dc");
Member m4 = (Member) Mockito.mock(Member.class);
members.add(m4);
Mockito.when(m4.getRole()).thenReturn(instructor);
Mockito.when(m4.getUserId()).thenReturn("aaa7eb80-721c-44dd-9fee-599be7086ad4");
Mockito.when(group1.getMembers()).thenReturn(members);
Mockito.when(group2.getMembers()).thenReturn(members);
} catch (IdUnusedException iue) {
log.warn("IdUnusedException: ",iue);
}
}

@Test
Expand Down Expand Up @@ -452,6 +495,152 @@ public void groupAssignmentConversion() {
);
}

@Test
public void incompleteAssignmentConversion() {
List<String> aList = Arrays.asList("0fe0293a-dbd4-4f8c-ba12-cbb60c3d88b5");
String aXml = readResourceToString("/incomplete_asn.xml");
String cXml = readResourceToString("/incomplete_asn_content.xml");
List<String> sXml = Arrays.asList(new String[] {
readResourceToString("/incomplete_asn_submission1.xml"),
readResourceToString("/incomplete_asn_submission0.xml"),
readResourceToString("/incomplete_asn_submission2.xml")});

Mockito.when(mockDataProvider.fetchAssignmentsToConvert()).thenReturn(aList);
Mockito.when(mockDataProvider.fetchAssignment("0fe0293a-dbd4-4f8c-ba12-cbb60c3d88b5")).thenReturn(aXml);
Mockito.when(mockDataProvider.fetchAssignmentContent("0fd801dc-91a8-46d5-80f4-5964a7a4360c")).thenReturn(cXml);
Mockito.when(mockDataProvider.fetchAssignmentSubmissions("0fe0293a-dbd4-4f8c-ba12-cbb60c3d88b5")).thenReturn(sXml);

conversion.runConversion(0, 0);

Map<String, String> assignmentPropertiesToCheck = new HashMap<>();
assignmentPropertiesToCheck.put("CHEF:creator", AssignmentConversionServiceImpl.decodeBase64("MDBkNGE4NDAtMDEyYy00NzQ5LWJlNjUtNmJmYzM0ODA2NTE1"));
assignmentPropertiesToCheck.put("CHEF:modifiedby", AssignmentConversionServiceImpl.decodeBase64("MDBkNGE4NDAtMDEyYy00NzQ5LWJlNjUtNmJmYzM0ODA2NTE1"));
assignmentPropertiesToCheck.put("new_assignment_add_to_gradebook", AssignmentConversionServiceImpl.decodeBase64("bm8="));
assignmentPropertiesToCheck.put("assignment_releasereturn_notification_value", AssignmentConversionServiceImpl.decodeBase64("YXNzaWdubWVudF9yZWxlYXNlcmV0dXJuX25vdGlmaWNhdGlvbl9ub25l"));
assignmentPropertiesToCheck.put("DAV:getlastmodified", AssignmentConversionServiceImpl.decodeBase64("MjAxNTEwMTgyMTA3Mjk3NTA="));
assignmentPropertiesToCheck.put("prop_new_assignment_add_to_gradebook", null);
assignmentPropertiesToCheck.put("DAV:creationdate", AssignmentConversionServiceImpl.decodeBase64("MjAxNTEwMTgxOTQxMTkxMDE="));
assignmentPropertiesToCheck.put("new_assignment_check_auto_announce", AssignmentConversionServiceImpl.decodeBase64("ZmFsc2U="));
assignmentPropertiesToCheck.put("new_assignment_check_add_due_date", AssignmentConversionServiceImpl.decodeBase64("ZmFsc2U="));
assignmentPropertiesToCheck.put("assignment_releasegrade_notification_value", AssignmentConversionServiceImpl.decodeBase64("YXNzaWdubWVudF9yZWxlYXNlZ3JhZGVfbm90aWZpY2F0aW9uX25vbmU="));
assignmentPropertiesToCheck.put("assignment_instructor_notifications_value", AssignmentConversionServiceImpl.decodeBase64("YXNzaWdubWVudF9pbnN0cnVjdG9yX25vdGlmaWNhdGlvbnNfZWFjaA=="));
assignmentPropertiesToCheck.put("new_assignment_check_anonymous_grading", null);

Set<String> attachmentsToCheck = new HashSet<>();
attachmentsToCheck.add("/content/attachment/2614_G_2015_N_N/Tareas/6bad591a-b529-4a8d-89e0-fbe41e069589/Tareas para grupos de Seminario S1.pdf");

Set<String> groupsToCheck = new HashSet<>();
groupsToCheck.add("/site/2614_G_2015_N_N/group/3d53024d-0f55-44fc-b1dc-acc03ff53b2b");
groupsToCheck.add("/site/2614_G_2015_N_N/group/53453ae9-afa2-4983-996b-aeda741bf14b");

assignmentVerification(
"0fe0293a-dbd4-4f8c-ba12-cbb60c3d88b5",
true,
false,
"20151031225500000",
false,
"2614_G_2015_N_N",
"20151018194119092",
"20151018194119092",
false,
"20151030225500000",
"20151030225500000",
false,
false,
false,
AssignmentConversionServiceImpl.decodeBase64("PHA+R3JvdXAgQXNzaWdubWVudCBGb3IgR3JvdXBzPC9wPiAgPHA+U2luZ2xlIHN1Ym1pc3Npb24gZm9yIGdyb3VwcyBSZWQgR3JlZW4gYW5kIEJsdWUuPC9wPg=="),
true,
0,
"20151018100000000",
true,
null,
"20151025161000000",
1,
true,
0,
false,
10,
null,
"Group Assignment For Groups",
Assignment.Access.GROUP,
Assignment.GradeType.UNGRADED_GRADE_TYPE,
Assignment.SubmissionType.TEXT_AND_ATTACHMENT_ASSIGNMENT_SUBMISSION,
null,
groupsToCheck,
attachmentsToCheck,
assignmentPropertiesToCheck
);

Set<String> submissionAttachmentsToCheck = new HashSet<>();
submissionAttachmentsToCheck.add("/content/attachment/2614_G_2015_N_N/Assignments/76907fe8-d843-4397-9d16-3b0c73d25553/Intervención quirúrgica. S1 G1.docx");

Map<String, String> submissionPropertiesToCheck = new HashMap<>();
submissionPropertiesToCheck.put("CHEF:creator", AssignmentConversionServiceImpl.decodeBase64("YmQ2N2ViODAtNzIxYy00NGRkLTlmZWUtNTk5YmU3MDg2YWQ0"));
submissionPropertiesToCheck.put("CHEF:modifiedby", AssignmentConversionServiceImpl.decodeBase64("YmQ2N2ViODAtNzIxYy00NGRkLTlmZWUtNTk5YmU3MDg2YWQ0"));
submissionPropertiesToCheck.put("DAV:getlastmodified", AssignmentConversionServiceImpl.decodeBase64("MjAxNTEwMzAxMzAyMDg0ODM="));
submissionPropertiesToCheck.put("DAV:creationdate", AssignmentConversionServiceImpl.decodeBase64("MjAxNTEwMzAxMzAyMDgxMzk="));

Map<String, String> submissionPropertiesToCheck2 = new HashMap<>();
submissionPropertiesToCheck2.put("CHEF:creator", AssignmentConversionServiceImpl.decodeBase64("Y2VmOTU5MTAtZmJkNy00ZTNjLWJkYjktNjIzMDYxYzIzNjg2"));
submissionPropertiesToCheck2.put("CHEF:modifiedby", AssignmentConversionServiceImpl.decodeBase64("Y2VmOTU5MTAtZmJkNy00ZTNjLWJkYjktNjIzMDYxYzIzNjg2"));
submissionPropertiesToCheck2.put("DAV:getlastmodified", AssignmentConversionServiceImpl.decodeBase64("MjAxNTEwMzAxNDM5MjAyMzA="));
submissionPropertiesToCheck2.put("DAV:creationdate", AssignmentConversionServiceImpl.decodeBase64("MjAxNTEwMzAxNDM5MTk5NTE="));

Set<String> submittersToCheck = new HashSet<>();
submittersToCheck.add("bd67eb80-721c-44dd-9fee-599be7086ad4");
submittersToCheck.add("cef95910-fbd7-4e3c-bdb9-623061c23686");
submittersToCheck.add("97597bf2-80b1-41ee-a298-d4e0944dc9dc");

submissionVerification(
"631c4955-8f90-486d-bf26-e6987f8a1af2",
"20151030130208483",
null,
"20151030130208481",
null,
null,
null,
false,
null,
false,
false,
false,
false,
true,
AssignmentConversionServiceImpl.decodeBase64("PHA+MjAwMjQxMjI2IGFzZGZhc2xmanNhbGpsYWRqbGFkamxhc2Q8L3A+ICA8cD5hc2RsZmtqYXNsZGpsc2RqYTwvcD4gIDxwPsKgPC9wPg=="),
true,
"3d53024d-0f55-44fc-b1dc-acc03ff53b2b",
submittersToCheck,
submissionAttachmentsToCheck,
submissionPropertiesToCheck
);
submissionVerification(
"6a484d18-49f9-4987-9a88-d8ee17c7fc1c",
"20151030143920230",
null,
"20151030143920227",
null,
null,
null,
false,
null,
false,
false,
false,
false,
true,
AssignmentConversionServiceImpl.decodeBase64("PHA+MjAwMjQxMjI2IGFzZGZhc2xmanNhbGpsYWRqbGFkamxhc2Q8L3A+ICA8cD5hc2RsZmtqYXNsZGpsc2RqYTwvcD4gIDxwPsKgPC9wPg=="),
true,
"53453ae9-afa2-4983-996b-aeda741bf14b",
submittersToCheck,
submissionAttachmentsToCheck,
submissionPropertiesToCheck2
);
// Submission0 is not valid doesn't belong to any assignment group
AssignmentSubmission submission = assignmentRepository.findSubmission("xxxc4955-8f90-486d-bf26-e6987f8a1af2");
assertEquals(submission,null);

}

private void assignmentVerification(String aId,
Boolean cAllowAttachments,
Boolean aAllowPeerAssessment,
Expand Down
47 changes: 47 additions & 0 deletions assignment/impl/src/test/resources/incomplete_asn.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<assignment access="grouped" allowpeerassessment="false"
assignmentcontent="/assignment/c/2614_G_2015_N_N/0fd801dc-91a8-46d5-80f4-5964a7a4360c"
closedate="20151031225500000" context="2614_G_2015_N_N" draft="false"
dropdeaddate="20151030225500000" duedate="20151030225500000"
group="true" hideduedate="false"
id="0fe0293a-dbd4-4f8c-ba12-cbb60c3d88b5" numberofauthors="0"
opendate="20151018100000000" peerassessmentanoneval="true"
peerassessmentinstructions="" peerassessmentnumreviews="1"
peerassessmentperiodtime="20151025161000000"
peerassessmentstudentviewreviews="true" position_order="0" section=""
title="Group Assignment For Groups" visibledate="">
<group
authzGroup="/site/2614_G_2015_N_N/group/3d53024d-0f55-44fc-b1dc-acc03ff53b2b" />
<group
authzGroup="/site/2614_G_2015_N_N/group/53453ae9-afa2-4983-996b-aeda741bf14b" />
<properties>
<property enc="BASE64" name="CHEF:creator"
value="MDBkNGE4NDAtMDEyYy00NzQ5LWJlNjUtNmJmYzM0ODA2NTE1" />
<property enc="BASE64" name="CHEF:modifiedby"
value="MDBkNGE4NDAtMDEyYy00NzQ5LWJlNjUtNmJmYzM0ODA2NTE1" />
<property enc="BASE64" name="new_assignment_add_to_gradebook"
value="bm8=" />
<property enc="BASE64"
name="assignment_releasereturn_notification_value"
value="YXNzaWdubWVudF9yZWxlYXNlcmV0dXJuX25vdGlmaWNhdGlvbl9ub25l" />
<property enc="BASE64" name="DAV:getlastmodified"
value="MjAxNTEwMTgyMTA3Mjk3NTA=" />
<property enc="BASE64"
name="prop_new_assignment_add_to_gradebook" value="" />
<property enc="BASE64"
name="new_assignment_check_add_due_date" value="ZmFsc2U=" />
<property enc="BASE64" name="DAV:creationdate"
value="MjAxNTEwMTgxOTQxMTkxMDE=" />
<property enc="BASE64"
name="new_assignment_check_auto_announce" value="ZmFsc2U=" />
<property enc="BASE64" name="newAssignment" value="ZmFsc2U=" />
<property enc="BASE64"
name="assignment_releasegrade_notification_value"
value="YXNzaWdubWVudF9yZWxlYXNlZ3JhZGVfbm90aWZpY2F0aW9uX25vbmU=" />
<property enc="BASE64"
name="assignment_instructor_notifications_value"
value="YXNzaWdubWVudF9pbnN0cnVjdG9yX25vdGlmaWNhdGlvbnNfZWFjaA==" />
<property enc="BASE64"
name="new_assignment_check_anonymous_grading" value="" />
</properties>
</assignment>
Loading

0 comments on commit 7120a4b

Please sign in to comment.