.

longs/models.py

@@ -28,7 +28,7 @@ from helpers.images import image_as_base64, pretty_print_dicom
 
 from anatomy.models import Modality
 
-from generic.models import CidUser, Examination, Condition, Sign, ExamBase, Plane, Contrast, QuestionNote
+from generic.models import CidUser, CidUserGroup, Examination, Condition, Sign, ExamBase, Plane, Contrast, QuestionNote, UserUserGroup
 
 # from generic.models import Examination, Site, Condition, Sign
 
@@ -601,6 +601,21 @@ class Exam(ExamBase):
         settings.AUTH_USER_MODEL, blank=True, related_name="user_longs_exams"
     )
 
+    cid_user_groups = models.ManyToManyField(
+        CidUserGroup,
+        blank=True,
+        help_text="These groups define which candidates are able to be added to the exams/collection.",
+        related_name="longs_cid_user_groups"
+
+    )
+
+    user_user_groups = models.ManyToManyField(
+        UserUserGroup,
+        blank=True,
+        help_text="These groups define which candidates are able to be added to the exams/collection.",
+        related_name="longs_user_user_groups"
+    )
+
     def get_exam_question_json(self, question_id):
         q = get_object_or_404(Long, pk=question_id)
 
@@ -722,6 +737,14 @@ class CidUserAnswer(models.Model):
         help_text="Candidate ID (limitied by BigIntegerField size)",
     )
 
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+        related_name="user_longs_user_answers",
+    )
+
     # Each user answer is associated with a particular exam
     exam = models.ForeignKey(
         Exam, related_name="cid_user_answers", on_delete=models.CASCADE, null=True