Remove more dead code

Author: epou

tigaserver_app/management/commands/update_coverage_month_model.py

@@ -1,27 +1,107 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from tigaserver_app.models import CoverageAreaMonth, Fix, Report
-from tigaserver_app.views import get_latest_reports_qs, lat_function, lat_function_m0, lat_function_y0
 import pytz
 from datetime import datetime
 from django.conf import settings
 from django.db.models import Q
 
 
+def lon_function(this_lon, these_lons, this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time):
+    n_fixes = len([l for l in these_lons if l == this_lon])
+    if CoverageAreaMonth.objects.filter(lat=this_lat[0], lon=this_lon[0], year=this_lat[1],month=this_lat[2]).count() > 0:
+        this_coverage_area = CoverageAreaMonth.objects.get(lat=this_lat[0], lon=this_lon[0], year=this_lat[1],month=this_lat[2])
+        this_coverage_area.n_fixes += n_fixes
+    else:
+        this_coverage_area = CoverageAreaMonth(lat=this_lat[0], lon=this_lon[0], year=this_lat[1],month=this_lat[2], n_fixes=n_fixes)
+    if fix_list and fix_list.count() > 0:
+        this_coverage_area.latest_fix_id = fix_list.order_by('id').last().id
+    else:
+        this_coverage_area.latest_fix_id = latest_fix_id
+    if report_list and report_list.count() > 0:
+        this_coverage_area.latest_report_server_upload_time = report_list.order_by('server_upload_time').last().server_upload_time
+    else:
+        this_coverage_area.latest_report_server_upload_time = latest_report_server_upload_time
+    this_coverage_area.save()
+
+
+def lon_function_m0(this_lon, these_lons_m0, this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time):
+    n_fixes = len([l for l in these_lons_m0 if l == this_lon])
+    if CoverageAreaMonth.objects.filter(lat=this_lat[0], lon=this_lon[0], year=this_lat[1], month=0).count() > 0:
+        this_coverage_area = CoverageAreaMonth.objects.get(lat=this_lat[0], lon=this_lon[0], year=this_lat[1], month=0)
+        this_coverage_area.n_fixes += n_fixes
+    else:
+        this_coverage_area = CoverageAreaMonth(lat=this_lat[0], lon=this_lon[0], year=this_lat[1], month=0, n_fixes=n_fixes)
+    if fix_list and fix_list.count() > 0:
+        this_coverage_area.latest_fix_id = fix_list.order_by('id').last().id
+    else:
+        this_coverage_area.latest_fix_id = latest_fix_id
+    if report_list and report_list.count() > 0:
+        this_coverage_area.latest_report_server_upload_time = report_list.order_by('server_upload_time').last().server_upload_time
+    else:
+        this_coverage_area.latest_report_server_upload_time = latest_report_server_upload_time
+    this_coverage_area.save()
+
+
+def lon_function_y0(this_lon, these_lons_y0, this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time):
+    n_fixes = len([l for l in these_lons_y0 if l == this_lon])
+    if CoverageAreaMonth.objects.filter(lat=this_lat[0], lon=this_lon[0], month=this_lat[1], year=0).count() > 0:
+        this_coverage_area = CoverageAreaMonth.objects.get(lat=this_lat[0], lon=this_lon[0], month=this_lat[1], year=0)
+        this_coverage_area.n_fixes += n_fixes
+    else:
+        this_coverage_area = CoverageAreaMonth(lat=this_lat[0], lon=this_lon[0], month=this_lat[1], year=0, n_fixes=n_fixes)
+    if fix_list and fix_list.count() > 0:
+        this_coverage_area.latest_fix_id = fix_list.order_by('id').last().id
+    else:
+        this_coverage_area.latest_fix_id = latest_fix_id
+    if report_list and report_list.count() > 0:
+        this_coverage_area.latest_report_server_upload_time = report_list.order_by('server_upload_time').last().server_upload_time
+    else:
+        this_coverage_area.latest_report_server_upload_time = latest_report_server_upload_time
+    this_coverage_area.save()
+
+
+def lat_function(this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time):
+    these_lons = [(f.masked_lon, f.fix_time.year, f.fix_time.month) for f in fix_list if (f.masked_lat == this_lat[0] and f.fix_time.year == this_lat[1] and f.fix_time.month == this_lat[2])] + [(r.masked_lon, r.creation_time.year, r.creation_time.month) for r in report_list if (r.masked_lat is not None and r.masked_lat == this_lat and r.creation_time.year == this_lat[1] and r.creation_time.month == this_lat[2])]
+    unique_lons = set(these_lons)
+    [lon_function(this_lon, these_lons, this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time) for this_lon in unique_lons]
+
+
+def lat_function_m0(this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time):
+    these_lons_m0 = [(f.masked_lon, f.fix_time.year) for f in fix_list if (f.masked_lat == this_lat[0] and f.fix_time.year == this_lat[1])] + [(r.masked_lon, r.creation_time.year) for r in report_list if (r.masked_lat is not None and r.masked_lat == this_lat and r.creation_time.year == this_lat[1])]
+    unique_lons_m0 = set(these_lons_m0)
+    [lon_function_m0(this_lon, these_lons_m0, this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time) for this_lon in unique_lons_m0]
+
+
+def lat_function_y0(this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time):
+    these_lons_y0 = [(f.masked_lon, f.fix_time.month) for f in fix_list if (f.masked_lat == this_lat[0] and f.fix_time.month == this_lat[1])] + [(r.masked_lon, r.creation_time.month) for r in report_list if (r.masked_lat is not None and r.masked_lat == this_lat and r.creation_time.month == this_lat[1])]
+    unique_lons_y0 = set(these_lons_y0)
+    [lon_function_y0(this_lon, these_lons_y0, this_lat, fix_list, latest_fix_id, report_list, latest_report_server_upload_time) for this_lon in unique_lons_y0]
+
+
 class Command(BaseCommand):
     args = ''
     help = 'Updates coverage month model data based on background location and report location data'
 
     def handle(self, *args, **options):
         updated = False
-        if CoverageAreaMonth.objects.all().count() > 0:
-            latest_report_server_upload_time = CoverageAreaMonth.objects.order_by('latest_report_server_upload_time').last().latest_report_server_upload_time
+
+        last_coverage = CoverageAreaMonth.objects.all().order_by('latest_report_server_upload_time').last()
+        if last_coverage:
+            latest_report_server_upload_time = last_coverage.latest_report_server_upload_time
             latest_fix_id = CoverageAreaMonth.objects.order_by('latest_fix_id').last().latest_fix_id
         else:
             latest_report_server_upload_time = pytz.utc.localize(datetime(1970, 1, 1))
             latest_fix_id = 0
-        if CoverageAreaMonth.objects.all().count() == 0 or latest_report_server_upload_time < Report.objects.order_by('server_upload_time').last().server_upload_time or latest_fix_id < Fix.objects.order_by('id').last().id:
-            report_list = get_latest_reports_qs(Report.objects.exclude(hide=True).filter(Q(package_name='Tigatrapp',  creation_time__gte=settings.IOS_START_TIME) | Q(package_name='ceab.movelab.tigatrapp', package_version__gt=3)).filter(server_upload_time__gt=latest_report_server_upload_time))
+
+        last_report = Report.objects.order_by('server_upload_time').last()
+        last_fix = Fix.objects.order_by('id').last()
+        if not last_coverage or latest_report_server_upload_time < last_report.server_upload_time or latest_fix_id < last_fix.id:
+            report_list = Report.objects.exclude(hide=True).filter(
+                Q(package_name='Tigatrapp',  creation_time__gte=settings.IOS_START_TIME)
+                | Q(package_name='ceab.movelab.tigatrapp', package_version__gt=3)
+            ).filter(server_upload_time__gt=latest_report_server_upload_time)
             fix_list = Fix.objects.filter(fix_time__gt=settings.START_TIME, id__gt=latest_fix_id)
+
             full_lat_list = [(f.masked_lat, f.fix_time.year, f.fix_time.month) for f in fix_list] + [(r.masked_lat, r.creation_time.year, r.creation_time.month) for r in report_list if r.masked_lat is not None]
             full_lat_list_m0 = [(f.masked_lat, f.fix_time.year) for f in fix_list] + [(r.masked_lat, r.creation_time.year) for r in report_list if r.masked_lat is not None]
             full_lat_list_y0 = [(f.masked_lat, f.fix_time.month) for f in fix_list] + [(r.masked_lat, r.creation_time.month) for r in report_list if r.masked_lat is not None]

tigaserver_app/migrations/0088_auto_20251125_1328.py

@@ -31,4 +31,10 @@ class Migration(migrations.Migration):
         migrations.DeleteModel(
             name='MissionTrigger',
         ),
+        migrations.DeleteModel(
+            name='Configuration',
+        ),
+        migrations.DeleteModel(
+            name='CoverageArea',
+        ),
     ]

tigaserver_app/models.py

@@ -26,7 +26,7 @@
 from django.contrib.gis.measure import Distance as DistanceMeasure
 from django.core.validators import RegexValidator
 from django.db import transaction
-from django.db.models import Count, Q
+from django.db.models import Q
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.forms.models import model_to_dict
@@ -1122,10 +1122,6 @@ def country_label(self) -> str:
         else:
             return "Unassigned"
 
-    @property
-    def formatted_date(self) -> str:
-        return self.version_time.strftime("%d-%m-%Y %H:%M")
-
     @property
     def deleted(self) -> bool:
         return self.deleted_at is not None
@@ -1247,16 +1243,6 @@ def response_html(self) -> str:
             )
         return result
 
-    @property
-    def response_string(self) -> str:
-        these_responses = self.responses.all().order_by("question")
-        result = ""
-        for this_response in these_responses:
-            result = (
-                result + "{" + this_response.question + " " + this_response.answer + "}"
-            )
-        return result
-
     @property
     def tigaprob(self) -> float:
         response_score = 0
@@ -1353,17 +1339,6 @@ def movelab_annotation(self) -> Optional[dict]:
         result = {"edited_user_notes": self.get_final_public_note()}
         if self.get_final_photo_html():
             result["photo_html"] = self.get_final_photo_html().popup_image()
-            if hasattr(self.get_final_photo_html(), "crowdcraftingtask"):
-                result[
-                    "crowdcrafting_score_cat"
-                ] = (
-                    self.get_final_photo_html().crowdcraftingtask.tiger_validation_score_cat
-                )
-                result[
-                    "crowdcrafting_n_response"
-                ] = (
-                    self.get_final_photo_html().crowdcraftingtask.crowdcrafting_n_responses
-                )
         if self.type == self.TYPE_ADULT:
             result["tiger_certainty_category"] = self.get_final_expert_score()
             result[
@@ -1994,42 +1969,6 @@ def get_photo_html_for_report_validation_completed(self):
             result += '<div id="' + str(photo.id) + '" style="border: ' + border_style + ';margin:1px;">' + photo.medium_image_for_validation_(show_prediction=True) + '</div><div>' + get_icon_for_blood_genre(photo.blood_genre) + '</div><br>'
         return result
 
-    def get_crowdcrafting_score(self):
-        if self.type not in (self.TYPE_SITE, self.TYPE_ADULT):
-            return None
-        these_photos = self.photos.visible().annotate(n_responses=Count('crowdcraftingtask__responses')).filter(n_responses__gte=30)
-        if these_photos.count() == 0:
-            return None
-        if self.type == self.TYPE_SITE:
-            scores = map(lambda x: x.crowdcraftingtask.site_validation_score, these_photos.iterator())
-        else:
-            scores = map(lambda x: x.crowdcraftingtask.tiger_validation_score, these_photos.iterator())
-        if scores is None or len(scores) == 0:
-            return None
-        else:
-            return max(scores)
-
-    def get_is_crowd_validated(self):
-        if self.get_crowdcrafting_score():
-            return self.get_crowdcrafting_score() > settings.CROWD_VALIDATION_CUTOFF
-        else:
-            return False
-
-    def get_is_crowd_contravalidated(self):
-        if self.get_crowdcrafting_score():
-            return self.get_crowdcrafting_score() <= settings.CROWD_VALIDATION_CUTOFF
-        else:
-            return False
-
-    def get_validated_photo_html(self):
-        result = ''
-        if self.type not in (self.TYPE_SITE, self.TYPE_ADULT):
-            return result
-        these_photos = self.photos.visible().annotate(n_responses=Count('crowdcraftingtask__responses')).filter(n_responses__gte=30)
-        for photo in these_photos:
-            result += '<br>' + photo.small_image_() + '<br>'
-        return result
-
     def get_mean_expert_adult_score_aegypti(self):
         sum_scores = 0
         mean_score = -3
@@ -2183,26 +2122,6 @@ def get_mean_expert_adult_classification_data(self):
 
         return status
 
-    def get_score_for_category_or_complex(self, category):
-        superexpert_annotations = ExpertReportAnnotation.objects.filter(report=self, user__groups__name='superexpert',validation_complete=True, revise=True, category=category)
-        expert_annotations = ExpertReportAnnotation.objects.filter(report=self, user__groups__name='expert',validation_complete=True, category=category)
-        mean_score = -1
-        if superexpert_annotations.count() > 0:
-            cumulative_score = 0
-            for ano in superexpert_annotations:
-                cumulative_score += ano.validation_value
-            mean_score = cumulative_score/float(superexpert_annotations.count())
-        else:
-            cumulative_score = 0
-            for ano in expert_annotations:
-                cumulative_score += ano.validation_value
-            mean_score = cumulative_score / float(expert_annotations.count())
-        if mean_score > 1.5:
-            return 2
-        else:
-            return 1
-        #return mean_score
-
     def get_html_color_for_label(self) -> str:
         identification_task = getattr(self, "identification_task", None)
 
@@ -2538,16 +2457,6 @@ def get_who_has(self):
 
         return ", ".join(result)
 
-    def get_expert_has_been_assigned_long_validation(self):
-        for ano in self.expert_report_annotations.all().select_related('user'):
-            if not ano.user.userstat.is_superexpert():
-                if ano.simplified_annotation == False:
-                    return True
-        return False
-
-    def get_who_has_count(self):
-        return self.expert_report_annotations.all().count()
-
     def get_expert_recipients(self):
         result = []
         for ano in self.expert_report_annotations.all().select_related('user'):
@@ -2840,15 +2749,6 @@ def __call__(self,instance,filename):
 
 make_image_uuid = MakeImageUUID('tigapics')
 
-'''
-def make_image_uuid(path):
-    def wrapper(instance, filename):
-        extension = filename.split('.')[-1]
-        filename = "%s.%s" % (uuid.uuid4(), extension)
-        return os.path.join(path, filename)
-    return wrapper
-'''
-
 class Photo(models.Model):
     """
     Photo uploaded by user.
@@ -3073,32 +2973,6 @@ class Meta:
         verbose_name_plural = "fixes"
 
 
-class Configuration(models.Model):
-    id = models.AutoField(primary_key=True, help_text='Auto-incremented primary key record ID.')
-    samples_per_day = models.IntegerField(help_text="Number of randomly-timed location samples to take per day.")
-    creation_time = models.DateTimeField(help_text='Date and time when this configuration was created by MoveLab. '
-                                                   'Automatically generated when record is saved.',
-                                         auto_now_add=True)
-
-    def __unicode__(self):
-        return str(self.samples_per_day)
-
-
-class CoverageArea(models.Model):
-    lat = models.FloatField()
-    lon = models.FloatField()
-    n_fixes = models.PositiveIntegerField()
-    last_modified = models.DateTimeField(auto_now=True)
-    latest_report_server_upload_time = models.DateTimeField()
-    latest_fix_id = models.PositiveIntegerField()
-
-    def __unicode__(self):
-        return str(self.id)
-
-    class Meta:
-        unique_together = ("lat", "lon")
-
-
 class CoverageAreaMonth(models.Model):
     lat = models.FloatField()
     lon = models.FloatField()
@@ -3192,7 +3066,6 @@ class Notification(models.Model):
     public = models.BooleanField(default=False, help_text='Whether the notification is shown in the public map or not')
     # The field 'acknowledged' is kept for backwards compatibility with the map notifications. It only has meaningful content on MAP NOTIFICATIONS
     acknowledged = models.BooleanField(default=False, help_text='This is set to True through the public API, when the user signals that the message has been received')
-    # map_notification = models.BooleanField(default=False, help_text='Flag field to help discriminate notifications which have been issued from the map')
 
     objects = NotificationManager()