Merge pull request #258 from Mosquito-Alert/auto_executive_validation

Move executive validation into ExpertReportAnnotation save()

Author: epou

tigacrafting/models.py

@@ -1,5 +1,8 @@
+import copy
+
 from django.db import models
-from django.contrib.auth.models import User
+from django.db.utils import IntegrityError
+from django.contrib.auth import get_user_model
 from datetime import datetime, timedelta
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.utils import timezone
@@ -9,6 +12,8 @@
 import tigacrafting.html_utils as html_utils
 import pytz
 
+User = get_user_model()
+
 def score_computation(n_total, n_yes, n_no, n_unknown = 0, n_undefined =0):
     return float(n_yes - n_no)/n_total
 
@@ -420,6 +425,49 @@ def save(self, *args, **kwargs):
 
         super(ExpertReportAnnotation, self).save(*args, **kwargs)
 
+        if self.validation_complete and self.validation_complete_executive:
+            cloned_instance = copy.deepcopy(self)
+            cloned_instance.simplified_annotation = True
+            cloned_instance.tiger_certainty_notes = 'exec_auto'
+            cloned_instance.validation_complete = True
+            cloned_instance.validation_complete_executive = False
+            cloned_instance.best_photo = None
+            cloned_instance.edited_user_notes = "" 
+            cloned_instance.message_for_user = ""
+            cloned_instance.revise = False
+
+            for dummy_user in User.objects.filter(username__in=["innie", "minnie"]):
+                try:
+                    cloned_instance.pk = None
+                    cloned_instance.user = dummy_user
+                    cloned_instance.save()
+                except IntegrityError:
+                    # Case unique constraint raises
+                    pass
+
+            try:
+                ExpertReportAnnotation.objects.update_or_create(
+                    user=User.objects.get(username="super_reritja"),
+                    report=self.report,
+                    defaults={
+                        "validation_complete": True
+                    }
+                )
+            except User.DoesNotExist:
+                pass
+
+    def delete(self, *args, **kwargs):
+        if self.validation_complete_executive:
+            ExpertReportAnnotation.objects.filter(
+                report=self.report,
+                validation_complete=True,
+                validation_complete_executive=False
+            ).filter(
+                models.Q(user__username__in=["innie", "minnie"]) 
+                | models.Q(user__username="super_reritja", revise=False)
+            ).delete()
+
+        return super().delete(*args, **kwargs)
 
 class UserStat(models.Model):
     user = models.OneToOneField(User, primary_key=True, on_delete=models.CASCADE, )

tigacrafting/views.py

@@ -793,36 +793,6 @@ def report_expiration(request, country_id=None):
         return HttpResponse("You need to be logged in as superexpert to view this page. If you have have been recruited as an expert and have lost your log-in credentials, please contact MoveLab.")
 
 
-def executive_auto_validate(annotation, request):
-    users = []
-    report = annotation.report
-    users.append(User.objects.get(username="innie"))
-    users.append(User.objects.get(username="minnie"))
-    super_reritja = User.objects.get(username="super_reritja")
-    for u in users:
-        if not ExpertReportAnnotation.objects.filter(report=report).filter(user=u).exists():
-            new_annotation = ExpertReportAnnotation(report=report, user=u)
-            new_annotation.simplified_annotation = True
-            new_annotation.tiger_certainty_notes = 'exec_auto'
-            new_annotation.tiger_certainty_category = annotation.tiger_certainty_category
-            new_annotation.aegypti_certainty_category = annotation.aegypti_certainty_category
-            new_annotation.status = annotation.status
-            new_annotation.category = annotation.category
-            new_annotation.complex = annotation.complex
-            new_annotation.validation_value = annotation.validation_value
-            new_annotation.other_species = annotation.other_species
-            new_annotation.validation_complete = True
-            new_annotation.save()
-    try:
-        roger_annotation = ExpertReportAnnotation.objects.get(user=super_reritja, report=report)
-    except ExpertReportAnnotation.DoesNotExist:
-        roger_annotation = ExpertReportAnnotation(user=super_reritja, report=report)
-
-    roger_annotation.validation_complete = True
-    roger_annotation.save()
-    current_domain = get_current_domain(request)
-    issue_notification(roger_annotation, current_domain)
-
 @transaction.atomic
 @login_required
 def expert_report_annotation(request, scroll_position='', tasks_per_page='10', note_language='es', load_new_reports='F', year='all', orderby='date', tiger_certainty='all', site_certainty='all', pending='na', checked='na', status='all', final_status='na', max_pending=5, max_given=3, version_uuid='na', linked_id='na', ns_exec='all', edit_mode='off', tags_filter='na',loc='na'):
@@ -880,8 +850,6 @@ def expert_report_annotation(request, scroll_position='', tasks_per_page='10', n
                             one_form.status = 0
                         one_form.save()
                         f.save_m2m()
-                        if one_form.validation_complete_executive:
-                            executive_auto_validate(one_form, request)
                         if(this_user_is_reritja and one_form.validation_complete == True):
                             issue_notification(one_form,current_domain)
                         if auto_flag: