Add last_used and currently_active to Sports model, Views, and Tests

unisportomat/quiz/migrations/0007_auto_20210626_1130.py

+# Generated by Django 3.2 on 2021-06-26 11:30
+
+import datetime
+from django.db import migrations, models
+import quiz.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("quiz", "0006_auto_20210612_1230"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sport",
+            name="currently_active",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name="sport",
+            name="last_used",
+            field=models.DateField(default=datetime.date(2021, 6, 26)),
+        ),
+        migrations.AlterField(
+            model_name="criterionrating",
+            name="rating",
+            field=models.IntegerField(validators=[quiz.models.validate_rating]),
+        ),
+    ]

unisportomat/quiz/migrations/0008_alter_sport_last_used.py

+# Generated by Django 3.2 on 2021-06-26 11:32
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("quiz", "0007_auto_20210626_1130"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sport",
+            name="last_used",
+            field=models.DateField(
+                default=datetime.datetime(2021, 6, 26, 11, 32, 52, 231135, tzinfo=utc)
+            ),
+        ),
+    ]

unisportomat/quiz/migrations/0009_alter_sport_last_used.py

+# Generated by Django 3.2 on 2021-06-26 11:33
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("quiz", "0008_alter_sport_last_used"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sport",
+            name="last_used",
+            field=models.DateField(
+                default=datetime.datetime(2021, 6, 26, 11, 33, 26, 967602, tzinfo=utc)
+            ),
+        ),
+    ]

unisportomat/quiz/migrations/0010_alter_sport_last_used.py

+# Generated by Django 3.2 on 2021-06-26 11:39
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("quiz", "0009_alter_sport_last_used"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sport",
+            name="last_used",
+            field=models.DateTimeField(
+                default=datetime.datetime(2021, 6, 26, 11, 39, 12, 106108, tzinfo=utc)
+            ),
+        ),
+    ]

unisportomat/quiz/migrations/0011_alter_sport_last_used.py

+# Generated by Django 3.2 on 2021-06-26 11:39
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("quiz", "0010_alter_sport_last_used"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sport",
+            name="last_used",
+            field=models.DateField(default=django.utils.timezone.now),
+        ),
+    ]

unisportomat/quiz/models.py

@@ -2,6 +2,7 @@
 
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.utils import timezone
 
 
 def validate_rating(value):
@@ -44,6 +45,8 @@ class SportManager(models.Manager):
         Creates new Sport Object and every CriterionRating for it
         """
         sport = self.create(**kwargs)
+        sport.currently_active = True
+        sport.last_used = timezone.localdate()
 
         for crit in Criterion.objects.iterator():
             sport.rate(crit, -1)
@@ -62,6 +65,13 @@ class Sport(models.Model):
     url = models.URLField()
     criteria_ratings = models.ManyToManyField("Criterion", through="CriterionRating")
 
+    # The Date Field last_used is set to now-time everytime a sport is activated
+    # either through manual activation or activation through the scraper
+    last_used = models.DateField(default=timezone.localdate)
+
+    # Boolean currently_active states whether the sport is in the archive or not
+    currently_active = models.BooleanField(default=True)
+
     objects = SportManager()
 
     def __str__(self):
@@ -93,6 +103,13 @@ class Sport(models.Model):
 
         return True
 
+    def reactivate(self):
+        """
+        Sets currently_active to True and updates the last_used Date
+        """
+        self.currently_active = True
+        self.last_used = timezone.localdate()
+
 
 class CriterionManager(models.Manager):
     """

unisportomat/quiz/serializers.py

@@ -76,6 +76,8 @@ class SingleSportSerializer(serializers.BaseSerializer):
         serialized_data["id"] = sport.pk
         serialized_data["name"] = sport.name
         serialized_data["url"] = sport.url
+        serialized_data["currently_active"] = sport.currently_active
+        serialized_data["last_used"] = sport.last_used
 
         criteria = []
 
@@ -113,6 +115,9 @@ class SingleSportSerializer(serializers.BaseSerializer):
         if "url" in request.data.keys():
             sport_dictionary["url"] = request.data["url"]
 
+        if "currently_active" in request.data.keys():
+            sport_dictionary["currently_active"] = request.data["currently_active"]
+
         # If the Sport is only now created with a POST-Request, no Criteria can be filled out for it
         # This is because the Admin Frontend doesn't have a list of Criteria ready
         if "criteria" in request.data.keys():

unisportomat/quiz/tests.py

@@ -7,6 +7,7 @@ import tempfile
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management import call_command
 from django.utils.translation import get_language, activate
+from django.utils import timezone
 from django.urls import reverse
 from django.test import TestCase, override_settings
 from rest_framework.test import APITestCase
@@ -400,6 +401,8 @@ class APITest(APITestCase):
             "id": 1,
             "name": "Jiu Jitsu",
             "url": "http://www.test.de",
+            "currently_active": True,
+            "last_used": timezone.localdate(),
             "criteria": [{"id": 1, "name": "Outdoorsport", "value": 1}],
         }
         self.assertDictEqual(response.data, sport_data)
@@ -411,6 +414,7 @@ class APITest(APITestCase):
         sport_data = {
             "name": "Karate",
             "url": "http://www.test2.de",
+            "currently_active": True,
             "criteria": [{"id": 1, "name": "Outdoorsport", "value": 1}],
         }
 
@@ -419,8 +423,12 @@ class APITest(APITestCase):
             data=sport_data,
             format="json",
         )
+
+        response = self.client.get(reverse("small-sport-list-detail", kwargs={"pk": 1}))
+
         self.assertEqual(response.data["name"], sport_data["name"])
         self.assertEqual(response.data["url"], sport_data["url"])
+        self.assertEqual(response.data["currently_active"], True)
         self.assertEqual(len(response.data["criteria"]), Criterion.objects.count())
         self.assertDictEqual(
             response.data["criteria"][0], {"id": 1, "name": "Outdoorsport", "value": 1}
@@ -439,6 +447,9 @@ class APITest(APITestCase):
             data=sport_data,
             format="json",
         )
+
+        response = self.client.get(reverse("small-sport-list-detail", kwargs={"pk": 1}))
+
         self.assertEqual(response.data["name"], "Jiu Jitsu")
         self.assertEqual(response.data["url"], "http://www.test.de")
         self.assertEqual(len(response.data["criteria"]), Criterion.objects.count())
@@ -520,3 +531,19 @@ class APITest(APITestCase):
         self.assertEqual(len(response.data), Criterion.objects.count())
         self.assertEqual(response.data[0]["number_of_sports_active"], 1)
         self.assertEqual(response.data[0]["sum_of_weights"], 7)
+
+    def test_currently_active(self):
+        """
+        Tests if PATCHing the "currently_active" value to false correctly changes the sport
+        """
+
+        # Set Up Values
+        response = self.client.patch(
+            reverse("small-sport-list-detail", kwargs={"pk": 1}),
+            data={"currently_active": False},
+            format="json",
+        )
+
+        response = self.client.get(reverse("small-sport-list-detail", kwargs={"pk": 1}))
+
+        self.assertEqual(response.data["currently_active"], False)

unisportomat/quiz/views.py

@@ -75,7 +75,7 @@ class SmallSportListView(viewsets.ViewSet):
 
         paginator = PageNumberWithPageSizePagination()
 
-        sports = Sport.objects.all().order_by("name")
+        sports = Sport.objects.filter(currently_active=True).order_by("name")
         sports = paginator.paginate_queryset(sports, request)
         is_filled_tuples = []
 
@@ -146,10 +146,18 @@ class SmallSportListView(viewsets.ViewSet):
         sport.name = request_data["name"]
         sport.url = request_data["url"]
 
+        if request_data["currently_active"] is True and sport.currently_active is False:
+            # If the Sport is just now being activated, update the Date
+            sport.reactivate()
+        else:
+            sport.currently_active = request_data["currently_active"]
+
         # Overwrite Criterion Ratings
         for criterion, value in request_data["criteria"]:
             sport.rate(criterion, value)
 
+        sport.save()
+
         # Re-Serialize changed Sport and Send it back
         response = SingleSportSerializer(sport)
 
@@ -179,9 +187,22 @@ class SmallSportListView(viewsets.ViewSet):
         if "url" in request_data.keys():
             sport.url = request_data["url"]
 
+        if "currently_active" in request_data.keys():
+            if (
+                request_data["currently_active"] is True
+                and sport.currently_active is False
+            ):
+                # If the Sport is just now being activated, update the Date
+                sport.reactivate()
+            else:
+                sport.currently_active = request_data["currently_active"]
+
         # Overwrite Criterion Ratings
-        for criterion, value in request_data["criteria"]:
-            sport.rate(criterion, value)
+        if "criteria" in request_data.keys():
+            for criterion, value in request_data["criteria"]:
+                sport.rate(criterion, value)
+
+        sport.save()
 
         # Re-Serialize changed Sport and Send it back
         response = SingleSportSerializer(sport)
@@ -222,7 +243,7 @@ class IncompleteSportView(APIView):
 
         incomplete_sport_list = []
 
-        for sport in queryset:
+        for sport in Sport.objects.filter(currently_active=True).iterator():
 
             if not sport.is_filled():
                 incomplete_sport_list.append(sport)