Ensure bit count are set to 0 on Bite reports + disable blank

epou · epou · commit 5d5cc1cdff4e · 2024-10-22T11:27:21.000+02:00
diff --git a/tigaserver_app/migrations/0045_report_responses_to_column.py b/tigaserver_app/migrations/0045_report_responses_to_column.py
@@ -13,91 +13,91 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='report',
             name='breeding_site_has_larvae',
-            field=models.BooleanField(blank=True, help_text='Either if the user perceived larvaes the breeding site.', null=True),
+            field=models.BooleanField(help_text='Either if the user perceived larvaes the breeding site.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='breeding_site_has_near_mosquitoes',
-            field=models.BooleanField(blank=True, help_text='Either if the user perceived mosquitoes near the breeding site (less than 10 meters).', null=True),
+            field=models.BooleanField(help_text='Either if the user perceived mosquitoes near the breeding site (less than 10 meters).', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='breeding_site_has_water',
-            field=models.BooleanField(blank=True, help_text='Either if the user perceived water in the breeding site.', null=True),
+            field=models.BooleanField(help_text='Either if the user perceived water in the breeding site.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='breeding_site_in_public_area',
-            field=models.BooleanField(blank=True, help_text='Either if the breeding site is found in a public area.', null=True),
+            field=models.BooleanField(help_text='Either if the breeding site is found in a public area.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='breeding_site_type',
-            field=models.CharField(blank=True, choices=[('basin', 'Basin'), ('bucket', 'Bucket'), ('fountain', 'Fountain'), ('small_container', 'Small container'), ('storm_drain', 'Storm Drain'), ('well', 'Well'), ('other', 'Other')], help_text='Breedign site tpye.', max_length=32, null=True),
+            field=models.CharField(choices=[('basin', 'Basin'), ('bucket', 'Bucket'), ('fountain', 'Fountain'), ('small_container', 'Small container'), ('storm_drain', 'Storm Drain'), ('well', 'Well'), ('other', 'Other')], help_text='Breeding site type.', max_length=32, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='chest_bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Number of bites reported in the chest.', null=True),
+            field=models.PositiveSmallIntegerField(help_text='Number of bites reported in the chest.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='event_environment',
-            field=models.CharField(blank=True, choices=[('indoors', 'Indoors'), ('outdoors', 'Outdoors'), ('vehicle', 'Inside vehicle')], help_text='The environment where the event took place.', max_length=16, null=True),
+            field=models.CharField(choices=[('indoors', 'Indoors'), ('outdoors', 'Outdoors'), ('vehicle', 'Inside vehicle')], help_text='The environment where the event took place.', max_length=16, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='event_moment',
-            field=models.CharField(blank=True, choices=[('now', 'Now'), ('last_morning', 'Last morning'), ('last_midday', 'Last midday'), ('last_afternoon', 'Last afternoon'), ('last_night', 'Last night')], help_text='The moment of the day when the event took place.', max_length=32, null=True),
+            field=models.CharField(choices=[('now', 'Now'), ('last_morning', 'Last morning'), ('last_midday', 'Last midday'), ('last_afternoon', 'Last afternoon'), ('last_night', 'Last night')], help_text='The moment of the day when the event took place.', max_length=32, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='head_bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Number of bites reported in the head.', null=True),
+            field=models.PositiveSmallIntegerField(help_text='Number of bites reported in the head.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='left_arm_bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Number of bites reported in the left arm.', null=True),
+            field=models.PositiveSmallIntegerField(help_text='Number of bites reported in the left arm.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='left_leg_bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Number of bites reported in the left leg.', null=True),
+            field=models.PositiveSmallIntegerField(help_text='Number of bites reported in the left leg.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='right_arm_bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Number of bites reported in the right arm.', null=True),
+            field=models.PositiveSmallIntegerField(help_text='Number of bites reported in the right arm.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='right_leg_bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Number of bites reported in the right leg.', null=True),
+            field=models.PositiveSmallIntegerField(help_text='Number of bites reported in the right leg.', null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='user_perceived_mosquito_abdomen',
-            field=models.CharField(blank=True, choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The species of mosquito that the abdomen resembles, according to the user.', max_length=16, null=True),
+            field=models.CharField(choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The species of mosquito that the abdomen resembles, according to the user.', max_length=16, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='user_perceived_mosquito_legs',
-            field=models.CharField(blank=True, choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The species of mosquito that the leg resembles, according to the user.', max_length=16, null=True),
+            field=models.CharField(choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The species of mosquito that the leg resembles, according to the user.', max_length=16, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='user_perceived_mosquito_thorax',
-            field=models.CharField(blank=True, choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The species of mosquito that the thorax resembles, according to the user.', max_length=16, null=True),
+            field=models.CharField(choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The species of mosquito that the thorax resembles, according to the user.', max_length=16, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='user_perceived_mosquito_specie',
-            field=models.CharField(blank=True, choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The mosquito specie perceived by the user.', max_length=16, null=True),
+            field=models.CharField(choices=[('albopictus', 'Aedes albopictus'), ('aegypti', 'Aedes aegypti'), ('japonicus', 'Aedes japonicus'), ('koreicus', 'Aedes koreicus'), ('culex', 'Culex pipiens'), ('other', 'Other')], help_text='The mosquito specie perceived by the user.', max_length=16, null=True),
         ),
         migrations.AddField(
             model_name='report',
             name='bite_count',
-            field=models.PositiveSmallIntegerField(blank=True, help_text='Total number of bites reported.', null=True),
+            field=models.PositiveSmallIntegerField(editable=False, help_text='Total number of bites reported.', null=True),
         ),
     ]
diff --git a/tigaserver_app/migrations/0046_populate_responses_column.py b/tigaserver_app/migrations/0046_populate_responses_column.py
@@ -14,7 +14,7 @@ def responses_list_to_Q(responses: Tuple[str, str], connector: str =models.Q.OR)
             ],
             _connector=connector
         )
-    
+
     # Loading models
     Report = apps.get_model("tigaserver_app", "Report")
     ReportResponse = apps.get_model("tigaserver_app", "ReportResponse")
@@ -566,6 +566,14 @@ def update_bite_body_part(apps, fieldname, answer_id):
             )}
         )
 
+        from tigaserver_app.models import Report as ModelReport
+
+        # Ensure bite report field are set to 0 as default.
+        Report.objects.filter(
+            type=ModelReport.TYPE_BITE,
+            **{f"{fieldname}__isnull": True}
+        ).update(**{f"{fieldname}": 0})
+
     # Loading models
     Report = apps.get_model("tigaserver_app", "Report")
 
diff --git a/tigaserver_app/models.py b/tigaserver_app/models.py
@@ -713,7 +713,7 @@ class Report(TimeZoneModelMixin, models.Model):
     )
 
     event_environment = models.CharField(
-        max_length=16, choices=EVENT_ENVIRONMENT_CHOICES, null=True, blank=True,
+        max_length=16, choices=EVENT_ENVIRONMENT_CHOICES, null=True,
         help_text=_("The environment where the event took place.")
     )
 
@@ -731,37 +731,37 @@ class Report(TimeZoneModelMixin, models.Model):
     )
 
     event_moment = models.CharField(
-        max_length=32, choices=EVENT_MOMENT_CHOICES, null=True, blank=True,
+        max_length=32, choices=EVENT_MOMENT_CHOICES, null=True,
         help_text=_("The moment of the day when the event took place.")
     )
 
     bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True, editable=False,
         help_text=_("Total number of bites reported.")
     )
 
     head_bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Number of bites reported in the head.")
     )
     left_arm_bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Number of bites reported in the left arm.")
     )
     right_arm_bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Number of bites reported in the right arm.")
     )
     chest_bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Number of bites reported in the chest.")
     )
     left_leg_bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Number of bites reported in the left leg.")
     )
     right_leg_bite_count = models.PositiveSmallIntegerField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Number of bites reported in the right leg.")
     )
 
@@ -782,20 +782,20 @@ class Report(TimeZoneModelMixin, models.Model):
     )
 
     user_perceived_mosquito_specie = models.CharField(
-        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True, blank=True,
+        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True,
         help_text=_("The mosquito specie perceived by the user.")
     )
 
     user_perceived_mosquito_thorax = models.CharField(
-        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True, blank=True,
+        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True,
         help_text=_("The species of mosquito that the thorax resembles, according to the user.")
     )
     user_perceived_mosquito_abdomen = models.CharField(
-        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True, blank=True,
+        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True,
         help_text=_("The species of mosquito that the abdomen resembles, according to the user.")
     )
     user_perceived_mosquito_legs = models.CharField(
-        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True, blank=True,
+        max_length=16, choices=MOSQUITO_SPECIE_CHOICES, null=True,
         help_text=_("The species of mosquito that the leg resembles, according to the user.")
     )
 
@@ -818,23 +818,23 @@ class Report(TimeZoneModelMixin, models.Model):
     )
 
     breeding_site_type = models.CharField(
-        max_length=32, choices=BREEDING_SITE_TYPE_CHOICES, null=True, blank=True,
-        help_text=_("Breedign site tpye.")
+        max_length=32, choices=BREEDING_SITE_TYPE_CHOICES, null=True,
+        help_text=_("Breeding site type.")
     )
     breeding_site_has_water = models.BooleanField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Either if the user perceived water in the breeding site.")
     )
     breeding_site_in_public_area = models.BooleanField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Either if the breeding site is found in a public area.")
     )
     breeding_site_has_near_mosquitoes = models.BooleanField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Either if the user perceived mosquitoes near the breeding site (less than 10 meters).")
     )
     breeding_site_has_larvae = models.BooleanField(
-        null=True, blank=True,
+        null=True,
         help_text=_("Either if the user perceived larvaes the breeding site.")
     )
     # Object Manager
@@ -1565,17 +1565,24 @@ def save(self, *args, **kwargs):
             self.user.language_iso2 = self.app_language
             self.user.save(update_fields=['language_iso2'])
 
-        bite_fields = [
-            self.head_bite_count,
-            self.left_arm_bite_count,
-            self.right_arm_bite_count,
-            self.chest_bite_count,
-            self.left_leg_bite_count,
-            self.right_leg_bite_count
+        bite_fieldnames = [
+            'head_bite_count',
+            'left_arm_bite_count',
+            'right_arm_bite_count',
+            'chest_bite_count',
+            'left_leg_bite_count',
+            'right_leg_bite_count'
         ]
-        self.bite_count = sum(
-            f for f in bite_fields if f is not None
-        ) if self.type == self.TYPE_BITE else None
+
+        if self.type == self.TYPE_BITE:
+            # Make sure all bites are set to 0 if none.
+            for bite_fieldname in bite_fieldnames:
+                if getattr(self, bite_fieldname) is None:
+                    setattr(self, bite_fieldname, 0)
+
+            self.bite_count = sum(
+                getattr(self, fname) for fname in bite_fieldnames
+            )
 
         super(Report, self).save(*args, **kwargs)
 
