feat #3168 Fix logic that manages affiliations

Author: joemull

src/core/models.py

@@ -581,6 +581,18 @@ def is_preprint_editor(self, request):
     def is_reader(self, request):
         return self.check_role(request.journal, 'reader', staff_override=False)
 
+    def snapshot_affiliations(self, frozen_author):
+        """
+        Delete any outdated affiliations on the frozen author and then
+        assign copies of account affiliations to the frozen author.
+        """
+        frozen_author.affiliations.delete()
+        for affiliation in self.affiliations:
+            affiliation.pk = None
+            affiliation.account = None
+            affiliation.frozen_author = frozen_author
+            affiliation.save()
+
     def snapshot_self(self, article, force_update=True):
         frozen_dict = {
             'name_prefix': self.name_prefix,
@@ -596,9 +608,8 @@ def snapshot_self(self, article, force_update=True):
         if frozen_author and force_update:
             for k, v in frozen_dict.items():
                 setattr(frozen_author, k, v)
-            frozen_author.institution = self.institution
-            frozen_author.department = self.department
             frozen_author.save()
+            self.snapshot_affiliations(frozen_author)
 
         else:
             try:
@@ -617,9 +628,7 @@ def snapshot_self(self, article, force_update=True):
                 defaults=dict(order=order_object.order, **frozen_dict)
             )
             if created:
-                frozen_author.institution = self.institution
-                frozen_author.department = self.department
-                frozen_author.save()
+                self.snapshot_affiliations(frozen_author)
 
     def frozen_author(self, article):
         try:
@@ -2087,6 +2096,13 @@ def location(self):
         """
         return self.locations.first() if self.locations else None
 
+    @property
+    def country(self):
+        """
+        Return the country of the first location.
+        """
+        return self.location.country if self.location else None
+
     @property
     def names(self):
         """

src/review/logic.py

@@ -834,12 +834,12 @@ def process_reviewer_csv(path, request, article, form):
                     'is_active': True,
                 }
             )
-            if row.get('department', ''):
-                reviewer.department = row.get('department', '')
-                reviewer.save()
-            if row.get('institution', ''):
-                reviewer.institution = row.get('institution', '')
-                reviewer.save()
+            if row.get('institution', '') or row.get('department', ''):
+                core_models.Affiliation.naive_get_or_create(
+                    institution=row.get('institution', ''),
+                    department=row.get('department', ''),
+                    account=reviewer,
+                )
 
             try:
                 review_interests = row.get('interests')

src/submission/models.py

@@ -2165,6 +2165,12 @@ def affiliation(self, obj=False, date=None):
             date=date,
         )
 
+    @property
+    def affiliations(self):
+        return core_models.Affiliation.objects.filter(
+            frozen_author=self
+        ).order_by('-is_primary')
+
     @property
     def is_correspondence_author(self):
         # early return if no email address available

src/utils/testing/helpers.py

@@ -173,6 +173,28 @@ def create_peer_reviewer(journal, **kwargs):
     return reviewer
 
 
+def create_affiliation(
+    institution='',
+    department='',
+    account=None,
+    frozen_author=None,
+    preprint_author=None,
+):
+    organization = core_models.Organization.objects.create()
+    core_models.OrganizationName.objects.create(
+        value=institution,
+        custom_label_for=organization,
+    )
+    affiliation = core_models.Affiliation.objects.create(
+        organization=organization,
+        department=department,
+        account=account,
+        frozen_author=frozen_author,
+        preprint_author=preprint_author,
+    )
+    return affiliation
+
+
 def create_author(journal, **kwargs):
     roles = kwargs.pop('roles', ['author'])
     email = kwargs.pop('email', "[email protected]")
@@ -189,10 +211,13 @@ def create_author(journal, **kwargs):
         journal=journal,
         **attrs,
     )
-    author.institution = "Author institution"
-    author.department = "Author Department"
     author.is_active = True
     author.save()
+    create_affiliation(
+        institution="Author institution",
+        department="Author Department",
+        account=author,
+    )
     return author
 
 
@@ -355,8 +380,10 @@ def create_preprint(repository, author, subject, title='This is a Test Preprint'
         order=1,
     )
     preprint_author.save()
-    preprint_author.affiliation = 'Made Up University'
-    preprint_author.save()
+    create_affiliation(
+        institution="Made Up University",
+        preprint_author=preprint_author,
+    )
     return preprint