SAK-33596 Assignments Unique Constraint on submission and submitter (s…

…akaiproject#4998)

assignment/api/src/java/org/sakaiproject/assignment/api/model/AssignmentSubmissionSubmitter.java

@@ -15,15 +15,38 @@
  */
 package org.sakaiproject.assignment.api.model;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+/**
+ * Defines a relation between a submission and the submission's submitters.
+ * <br/> - A submitter can have its own grade separate from the grade of the submission,
+ * useful in providing user with different grades in group submissions.
+ * <br/> - A submitter can have its own feedback separate from the feedback of the submission,
+ * useful when different feedback is needed in group submissions
+ * <p>
+ * <b>Constraints</b>
+ * <br/>- submission and submitter are unique,
+ * meaning a user can't be a submitter more than once on a submission.
+ * Notice that equals and hashcode also reflect this relationship.
+ */
 @Entity
-@Table(name = "ASN_SUBMISSION_SUBMITTER")
+@Table(name = "ASN_SUBMISSION_SUBMITTER",
+        uniqueConstraints = @UniqueConstraint(columnNames = {"SUBMISSION_ID", "SUBMITTER"}))
 @Data
 @NoArgsConstructor
 @ToString(exclude = {"submission"})

assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java

@@ -1323,7 +1323,7 @@ private Map<User, AssignmentSubmission> getUserSubmissionMap(Assignment assignme
                         User user = userDirectoryService.getUser(submitter.getSubmitter());
                         userSubmissionMap.put(user, submission);
                     } catch (UserNotDefinedException e) {
-                        log.warn("Could not find user: {}, that is a submitter for submission: {}", submitter.getId(), submission.getId());
+                        log.warn("Could not find user: {}, that is a submitter for submission: {}", submitter.getSubmitter(), submission.getId());
                     }
                 }
             }

assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java

@@ -308,7 +308,6 @@ public void addAndGetSubmission() {
             Assert.assertEquals(1, submitters.size());
             AssignmentSubmissionSubmitter submitter = submitters.stream().findAny().get();
             Assert.assertNotNull(submitter);
-            Assert.assertNotNull(submitter.getId());
             Assert.assertEquals(submitterId, submitter.getSubmitter());
         } catch (Exception e) {
             Assert.fail("Could not create submission, " + e.getMessage());