Merge pull request #3559 from webkom/remove-contact-tracing

Remove contact tracing from event model

Author: AdrianAndersen

lego/apps/events/fixtures/test_events.yaml

@@ -151,7 +151,6 @@
     end_time: "2118-09-01T15:20:30+03:00"
     created_by: 1
     require_auth: False
-    use_contact_tracing: True
 
 - model: events.Event
   pk: 11

lego/apps/events/migrations/0039_remove_event_use_contact_tracing.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.0.10 on 2024-02-20 19:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("events", "0038_event_is_foreign_language"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="event",
+            name="use_contact_tracing",
+        ),
+    ]

lego/apps/events/models.py

@@ -16,7 +16,6 @@
 from lego.apps.events.exceptions import (
     EventHasClosed,
     EventNotReady,
-    NoPhoneNumber,
     NoSuchPool,
     NoSuchRegistration,
     NotRegisteredPhotoConsents,
@@ -99,7 +98,6 @@ def unregistration_close_time(self) -> date:
     youtube_url = CharField(
         max_length=200, default="", validators=[youtube_validator], blank=True
     )
-    use_contact_tracing = models.BooleanField(default=False)
     legacy_registration_count = models.PositiveIntegerField(default=0)
     mazemap_poi = models.PositiveIntegerField(null=True)
     responsible_users = ManyToManyField(User)
@@ -312,9 +310,6 @@ def register(self, registration: Registration) -> Registration:
         if self.registration_close_time < current_time:
             raise EventHasClosed()
 
-        if self.use_contact_tracing and user.phone_number is None:
-            raise NoPhoneNumber()
-
         current_semester = AUTUMN if self.start_time.month > 7 else SPRING
         if self.use_consent and not user.has_registered_photo_consents_for_semester(
             self.start_time.year,

lego/apps/events/serializers/events.py

@@ -19,15 +19,13 @@
 from lego.apps.events.models import Event, Pool, Registration
 from lego.apps.events.serializers.pools import (
     PoolAdministrateAllergiesSerializer,
-    PoolAdministrateExportSerializer,
     PoolAdministrateSerializer,
     PoolCreateAndUpdateSerializer,
     PoolReadAuthSerializer,
     PoolReadSerializer,
 )
 from lego.apps.events.serializers.registrations import (
     RegistrationReadDetailedAllergiesSerializer,
-    RegistrationReadDetailedExportSerializer,
     RegistrationReadDetailedSerializer,
     RegistrationReadSerializer,
 )
@@ -188,7 +186,6 @@ class Meta:
             "survey",
             "use_consent",
             "youtube_url",
-            "use_contact_tracing",
             "mazemap_poi",
             "responsible_users",
             "is_foreign_language",
@@ -339,19 +336,12 @@ class Meta(EventReadSerializer.Meta):
             "unregistered",
             "waiting_registrations",
             "use_consent",
-            "use_contact_tracing",
             "created_by",
             "feedback_required",
             "responsible_group",
         )
 
 
-class EventAdministrateExportSerializer(EventAdministrateSerializer):
-    pools = PoolAdministrateExportSerializer(many=True)
-    unregistered = RegistrationReadDetailedExportSerializer(many=True)
-    waiting_registrations = RegistrationReadDetailedExportSerializer(many=True)
-
-
 class EventAdministrateAllergiesSerializer(EventAdministrateSerializer):
     pools = PoolAdministrateAllergiesSerializer(many=True)
     waiting_registrations = RegistrationReadDetailedAllergiesSerializer(many=True)
@@ -412,7 +402,6 @@ class Meta:
             "registration_close_time",
             "unregistration_close_time",
             "youtube_url",
-            "use_contact_tracing",
             "mazemap_poi",
             "responsible_users",
             "is_foreign_language",
@@ -429,18 +418,6 @@ def validate(self, data):
                         "end_time": "User does not have the required permissions for time travel"
                     }
                 )
-        if (
-            self.instance is not None
-            and "use_contact_tracing" in data
-            and data["use_contact_tracing"] != self.instance.use_contact_tracing
-            and self.instance.registrations.exists()
-        ):
-            raise serializers.ValidationError(
-                {
-                    "use_contact_tracing": "Cannot change this field after registration has started"
-                }
-            )
-
         return data
 
     def create(self, validated_data):

lego/apps/events/tests/test_events_api.py

@@ -1362,60 +1362,6 @@ def test_without_group_permission(self):
         self.assertEqual(event_response.status_code, status.HTTP_403_FORBIDDEN)
 
 
-class ExportInfoTestCase(BaseAPITestCase):
-    fixtures = [
-        "test_abakus_groups.yaml",
-        "test_companies.yaml",
-        "test_users.yaml",
-        "test_events.yaml",
-    ]
-
-    def setUp(self):
-        self.abakus_user = User.objects.get(pk=1)
-        self.event = Event.objects.get(title="EXPORT_INFO_EVENT")
-        self.event.start_time = timezone.now() - timedelta(hours=7)
-        self.event.end_time = timezone.now() - timedelta(hours=3)
-        self.event.save()
-
-    def test_with_export_permission(self):
-        # Need to apply to the actual event (The one in the db)
-        AbakusGroup.objects.get(name="Bedkom").add_user(self.abakus_user)
-        self.client.force_authenticate(self.abakus_user)
-
-        event_response = self.client.get(
-            f"{_get_detail_url(self.event.id)}administrate/"
-        )
-
-        attendee_email = self.event.pools.first().registrations.first().user.email
-
-        self.assertEqual(self.event.use_contact_tracing, True)
-        self.assertEqual(event_response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            event_response.json()
-            .get("pools")[0]
-            .get("registrations")[0]
-            .get("user")
-            .get("email"),
-            attendee_email,
-        )
-
-    def test_without_export_permission(self):
-        user = User.objects.get(pk=2)
-        AbakusGroup.objects.get(name="Webkom").add_user(user)
-        self.client.force_authenticate(user)
-        event_response = self.client.get(
-            f"{_get_detail_url(self.event.id)}administrate/"
-        )
-
-        self.assertIsNone(
-            event_response.json()
-            .get("pools")[0]
-            .get("registrations")[0]
-            .get("user")
-            .get("email")
-        )
-
-
 class AllergiesTestCase(BaseAPITestCase):
     fixtures = [
         "test_abakus_groups.yaml",

lego/apps/events/views.py

@@ -36,7 +36,6 @@
 from lego.apps.events.permissions import EventTypePermission
 from lego.apps.events.serializers.events import (
     EventAdministrateAllergiesSerializer,
-    EventAdministrateExportSerializer,
     EventAdministrateSerializer,
     EventCreateAndUpdateSerializer,
     EventReadAuthUserDetailedSerializer,
@@ -236,12 +235,6 @@ def administrate(self, request, *args, **kwargs):
             ),
         )
         event = queryset.first()
-        if (
-            event.use_contact_tracing
-            and request.user == event.created_by
-            and timezone.now() <= event.end_time + timezone.timedelta(days=14)
-        ):
-            serializer = EventAdministrateExportSerializer
         event_data = serializer(event).data
         event_data = populate_event_registration_users_with_grade(event_data)
         return Response(event_data)