Added EuropeCountry.reports_can_be_published

Author: epou

tigaserver_app/migrations/0083_europecountry_reports_can_be_published.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2025-07-04 14:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tigaserver_app', '0082_remove_iascore'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='europecountry',
+            name='reports_can_be_published',
+            field=models.BooleanField(default=True),
+        ),
+    ]

tigaserver_app/models.py

@@ -662,6 +662,8 @@ class EuropeCountry(models.Model):
     pending_crisis_reports = models.IntegerField(blank=True, null=True, help_text='Number of reports in country assignable to non-supervisors')
     last_crisis_report_n_update = models.DateTimeField(help_text="Last time count was updated", null=True, blank=True)
 
+    reports_can_be_published = models.BooleanField(default=True)
+
     class Meta:
         managed = True
         ordering = ['name_engl']
@@ -2069,10 +2071,7 @@ def save(self, *args, **kwargs):
                 getattr(self, fname) for fname in bite_fieldnames
             )
 
-        if self.type not in self.PUBLISHABLE_TYPES:
-            self.published_at = None
-
-        if not self.is_browsable:
+        if (self.type not in self.PUBLISHABLE_TYPES) or (not self.is_browsable) or (self.country and not self.country.reports_can_be_published):
             self.published_at = None
 
         super(Report, self).save(*args, **kwargs)

tigaserver_app/tests/tests.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+import pytest
 import uuid
 
 # Create your tests here.
@@ -2027,6 +2028,29 @@ def test_bite_is_published_on_create(self):
         self.assertEqual(report.published_at, timezone.now())
         self.assertEqual(report.published, True)
 
+    @time_machine.travel("2024-01-01 00:00:00", tick=False)
+    def test_bite_is_not_published_if_country_does_not_allow_public_on_create(self):
+        disabled_publish_country = EuropeCountry.objects.create(
+            cntr_id="RD", name_engl="Random", iso3_code="RND", fid="RD",
+            geom=MultiPolygon(Polygon.from_bbox((-10.0, 35.0, 3.5, 44.0))),
+            reports_can_be_published=False,
+        )
+        point_on_surface = disabled_publish_country.geom.point_on_surface
+        report = Report.objects.create(
+            user=TigaUser.objects.create(),
+            report_id='1234',
+            phone_upload_time=timezone.now(),
+            creation_time=timezone.now(),
+            version_time=timezone.now(),
+            type=Report.TYPE_BITE,
+            location_choice=Report.LOCATION_CURRENT,
+            current_location_lon=point_on_surface.x,
+            current_location_lat=point_on_surface.y,
+        )
+        self.assertEqual(report.country, disabled_publish_country)
+        self.assertIsNone(report.published_at)
+        self.assertEqual(report.published, False)
+
     def test_breeding_site_with_picture_is_published_in_two_days_on_create(self):
         with time_machine.travel("2024-01-01 00:00:00", tick=False) as traveller:
             report = Report.objects.create(
@@ -2065,6 +2089,29 @@ def test_breeding_site_without_picture_is_published_on_create(self):
         self.assertEqual(report.published_at, timezone.now())
         self.assertEqual(report.published, True)
 
+    @time_machine.travel("2024-01-01 00:00:00", tick=False)
+    def test_breeding_site_without_picture_is_not_published_if_country_does_not_allow_public_on_create(self):
+        disabled_publish_country = EuropeCountry.objects.create(
+            cntr_id="RD", name_engl="Random", iso3_code="RND", fid="RD",
+            geom=MultiPolygon(Polygon.from_bbox((-10.0, 35.0, 3.5, 44.0))),
+            reports_can_be_published=False,
+        )
+        point_on_surface = disabled_publish_country.geom.point_on_surface
+        report = Report.objects.create(
+            user=TigaUser.objects.create(),
+            report_id='1234',
+            phone_upload_time=timezone.now(),
+            creation_time=timezone.now(),
+            version_time=timezone.now(),
+            type=Report.TYPE_SITE,
+            location_choice=Report.LOCATION_CURRENT,
+            current_location_lon=point_on_surface.x,
+            current_location_lat=point_on_surface.y,
+        )
+        self.assertEqual(report.country, disabled_publish_country)
+        self.assertIsNone(report.published_at)
+        self.assertEqual(report.published, False)
+
     def test_adult_without_picture_is_published_on_create(self):
         report = Report.objects.create(
             user=TigaUser.objects.create(),
@@ -2079,6 +2126,29 @@ def test_adult_without_picture_is_published_on_create(self):
         )
         self.assertEqual(report.published, True)
 
+    @time_machine.travel("2024-01-01 00:00:00", tick=False)
+    def test_adult_without_picture_is_not_published_if_country_does_not_allow_public_on_create(self):
+        disabled_publish_country = EuropeCountry.objects.create(
+            cntr_id="RD", name_engl="Random", iso3_code="RND", fid="RD",
+            geom=MultiPolygon(Polygon.from_bbox((-10.0, 35.0, 3.5, 44.0))),
+            reports_can_be_published=False,
+        )
+        point_on_surface = disabled_publish_country.geom.point_on_surface
+        report = Report.objects.create(
+            user=TigaUser.objects.create(),
+            report_id='1234',
+            phone_upload_time=timezone.now(),
+            creation_time=timezone.now(),
+            version_time=timezone.now(),
+            type=Report.TYPE_ADULT,
+            location_choice=Report.LOCATION_CURRENT,
+            current_location_lon=point_on_surface.x,
+            current_location_lat=point_on_surface.y,
+        )
+        self.assertEqual(report.country, disabled_publish_country)
+        self.assertIsNone(report.published_at)
+        self.assertEqual(report.published, False)
+
     def test_adult_with_picture_is_not_published_on_create(self):
         report = Report.objects.create(
             user=TigaUser.objects.create(),

util_scripts/make_data_euro_newmap.py

@@ -214,6 +214,17 @@ def move_masked_location_report_to_trash_layer(cursor):
         cursor.execute("""UPDATE map_aux_reports_newmap set private_webmap_layer='trash_layer' WHERE version_uuid=%s;""",
                        (uuid,))
 
+def move_not_publsihed_report_to_trash_layer(cursor):
+    cursor.execute("""
+        UPDATE map_aux_reports_newmap 
+        SET private_webmap_layer = 'trash_layer' 
+        WHERE version_uuid IN (
+            SELECT "version_UUID"
+            FROM tigaserver_app_report 
+            WHERE published_at IS NULL OR published_at > NOW()
+        );
+    """)
+
 def add_photo_to_not_yet_filtered_adults(cursor):
     cursor.execute(
         """SELECT m.version_uuid,p.photo FROM map_aux_reports_newmap m,tigaserver_app_photo p WHERE p.report_id = m.version_uuid and private_webmap_layer='not_yet_validated' and n_photos > 0 and photo_url='' and p.hide=false;""")
@@ -764,6 +775,7 @@ def get_storm_drain_status(report_responses):
 add_photo_to_not_yet_filtered_adults(cursor)
 move_hidden_adult_report_to_trash_layer(cursor)
 move_masked_location_report_to_trash_layer(cursor)
+move_not_publsihed_report_to_trash_layer(cursor)
 
 cursor.execute(
     """UPDATE map_aux_reports_newmap set validation=1 where expert_validated=1;""")