[refs #114239] Fix PersonCompany integrity error on save on fetch_ecr

eea · Feb 13, 2020 · cd257a0 · cd257a0
1 parent e2e07db
commit cd257a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/notifications/management/commands/fetch_ecr.py b/notifications/management/commands/fetch_ecr.py
@@ -77,8 +77,12 @@ def parse_person_data(self, person):
 
     def set_current_user_true(self, company, persons):
         for person in persons:
-            person_company, _ = PersonCompany.objects.really_all().get_or_create(company=company, person=person)
-            person_company.current = True
+            try:
+                person_company = PersonCompany.objects.really_all().get(company=company, person=person)
+                person_company.delete()
+                person_company = PersonCompany.objects.create(company=company, person=person, current=True)
+            except PersonCompany.DoesNotExist:
+                person_company = PersonCompany.objects.create(company=company, person=person, current=True)
 
     def check_company_is_valid(self, company):
         if company['check_passed']:

diff --git a/notifications/templates/notifications/template/trigger.html b/notifications/templates/notifications/template/trigger.html
@@ -91,7 +91,7 @@ <h2>Review contacts</h2>
       </thead>
       <tbody>
       {% for company in companies %}
-        {% for person in company.users.all %}
+        {% for person in company.active_users %}
           <tr>
             <td>
               {{ company.external_id }}