[#2370] Merging persons: display & merge consents

carpentries · Apr 16, 2023 · 6a59289 · 6a59289
1 parent e78fed1
commit 6a59289
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/amy/templates/workshops/persons_merge.html b/amy/templates/workshops/persons_merge.html
@@ -152,8 +152,22 @@
   </tr>
   <tr>
     <th>Consents</th>
-    <td></td>
-    <td></td>
+    <td>
+      <dl>
+      {% for consent in obj_a_consents.values %}
+        <dt>{{ consent.term.content}}</dt>
+        <dd>{{ consent.term_option|default:"Unset" }}</dd>
+      {% endfor %}
+      </dl>
+    </td>
+    <td>
+      <dl>
+      {% for consent in obj_b_consents.values %}
+        <dt>{{ consent.term.content}}</dt>
+        <dd>{{ consent.term_option|default:"Unset" }}</dd>
+      {% endfor %}
+      </dl>
+    </td>
     <th>{% include "includes/merge_radio.html" with field=form.consent_set %}</th>
   </tr>
 </table>

diff --git a/amy/workshops/forms.py b/amy/workshops/forms.py
@@ -1003,7 +1003,7 @@ class PersonsMergeForm(forms.Form):
         widget=forms.RadioSelect,
     )
     consent_set = forms.ChoiceField(
-        choices=THREE,
+        choices=TWO,
         initial=DEFAULT,
         widget=forms.RadioSelect,
     )

diff --git a/amy/workshops/tests/test_person.py b/amy/workshops/tests/test_person.py
@@ -906,7 +906,7 @@ def setUp(self):
             "trainingprogress_set": "combine",
             "comment_comments": "combine",  # made by this person
             "comments": "combine",  # regarding this person
-            "consent_set": "combine",
+            "consent_set": "obj_a",
         }
         base_url = reverse("persons_merge")
         query = urlencode({"person_a": self.person_a.pk, "person_b": self.person_b.pk})
@@ -937,6 +937,7 @@ def test_form_invalid_values(self):
             "occupation": "combine",
             "orcid": "combine",
             "is_active": "combine",
+            "consent_set": "combine",
         }
         # fields additionally accepting "combine"
         passing = {
@@ -948,7 +949,6 @@ def test_form_invalid_values(self):
             "trainingprogress_set": "combine",
             "comment_comments": "combine",
             "comments": "combine",
-            "consent_set": "combine",
         }
         data = hidden.copy()
         data.update(failing)
@@ -1113,25 +1113,6 @@ def test_merging_comments_strategy3(self):
             set(comments),
         )
 
-    def test_merging_consents_combine(self):
-        """Ensure consents regarding persons are correctly merged using
-        `merge_objects`.
-        This test uses strategy 1 (combine)."""
-        self.strategy["consent_set"] = "combine"
-        expected_consents = list(
-            Consent.objects.filter(person__in=[self.person_a, self.person_b])
-        )
-        rv = self.client.post(self.url, data=self.strategy)
-        self.assertEqual(rv.status_code, 302)
-        self.person_b.refresh_from_db()
-        self.assertCountEqual(
-            [
-                (c.term, c.term_option, c.person)
-                for c in Consent.objects.filter(person=self.person_b)
-            ],
-            [(c.term, c.term_option, self.person_b) for c in expected_consents],
-        )
-
     def test_merging_consents_obj_a(self):
         """Ensure consents regarding persons are correctly merged using
         `merge_objects`.

diff --git a/amy/workshops/utils/merge.py b/amy/workshops/utils/merge.py
@@ -2,8 +2,6 @@
 from django.db import IntegrityError, transaction
 from django_comments.models import Comment
 
-from workshops.utils.consents import archive_least_recent_active_consents
-
 
 def merge_objects(
     object_a, object_b, easy_fields, difficult_fields, choices, base_a=True
@@ -108,8 +106,6 @@ def merge_objects(
 
             elif value == "combine":
                 to_add = None
-                if attr == "consent_set":
-                    archive_least_recent_active_consents(object_a, object_b, base_obj)
 
                 if manager == related_a:
                     to_add = related_b.all()

diff --git a/amy/workshops/views.py b/amy/workshops/views.py
@@ -876,6 +876,18 @@ def persons_merge(request):
         "form": form,
         "obj_a": obj_a,
         "obj_b": obj_b,
+        "obj_a_consents": {
+            consent.term.key: consent
+            for consent in Consent.objects.select_related("term", "term_option").filter(
+                person=obj_a
+            )
+        },
+        "obj_b_consents": {
+            consent.term.key: consent
+            for consent in Consent.objects.select_related("term", "term_option").filter(
+                person=obj_b
+            )
+        },
     }
     return render(request, "workshops/persons_merge.html", context)