Revert duration field (#38)

quyenlq · web-flow · commit 59f3dee2edee · 2020-01-24T12:03:48.000+02:00
Revert duration field to integer field
diff --git a/events/factories.py b/events/factories.py
@@ -1,5 +1,3 @@
-from datetime import timedelta
-
 import factory
 import pytz
 
@@ -9,7 +7,7 @@
 
 class EventFactory(factory.django.DjangoModelFactory):
     name = factory.Faker("text", max_nb_chars=64)
-    duration = factory.Faker("time_delta", end_datetime=timedelta(minutes=60))
+    duration = factory.Faker("random_int", max=300)
     short_description = factory.Faker("text", max_nb_chars=64)
     description = factory.Faker("text")
     image = factory.Faker("file_name", extension="jpg")
diff --git a/events/migrations/0005_delete_old_duration_field.py b/events/migrations/0005_delete_old_duration_field.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.2.9 on 2020-01-24 08:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0004_event_duration"),
+    ]
+
+    operations = [
+        migrations.RemoveField(model_name="event", name="duration",),
+        migrations.AddField(
+            model_name="event",
+            name="duration",
+            field=models.PositiveSmallIntegerField(
+                blank=True, null=True, verbose_name="duration", help_text="In minutes"
+            ),
+        ),
+    ]
diff --git a/events/models.py b/events/models.py
@@ -27,7 +27,9 @@ class Event(TimestampedModel, TranslatableModel):
         choices=PARTICIPANT_AMOUNT_CHOICES,
         verbose_name=_("participants per invite"),
     )
-    duration = models.DurationField(verbose_name=_("duration"), blank=True, null=True)
+    duration = models.PositiveSmallIntegerField(
+        verbose_name=_("duration"), blank=True, null=True, help_text=_("In minutes")
+    )
     capacity_per_occurrence = models.PositiveSmallIntegerField(
         verbose_name=_("capacity per occurrence")
     )
diff --git a/events/schema.py b/events/schema.py
@@ -32,9 +32,6 @@ def get_queryset(cls, queryset, info):
     def get_node(cls, info, id):
         return super().get_node(info, id)
 
-    def resolve_duration(self, info):
-        return self.duration.total_seconds()
-
 
 class OccurrenceNode(DjangoObjectType):
     venue = graphene.Field(VenueNode)
diff --git a/events/tests/snapshots/snap_test_api.py b/events/tests/snapshots/snap_test_api.py
@@ -14,7 +14,7 @@
                     "node": {
                         "capacityPerOccurrence": 805,
                         "createdAt": "2020-12-12T00:00:00+00:00",
-                        "duration": 1450.0,
+                        "duration": 181,
                         "image": "spring.jpg",
                         "occurrences": {
                             "edges": [
@@ -58,7 +58,7 @@
         "event": {
             "capacityPerOccurrence": 805,
             "createdAt": "2020-12-12T00:00:00+00:00",
-            "duration": 3041.0,
+            "duration": 197,
             "image": "spring.jpg",
             "occurrences": {"edges": []},
             "participantsPerInvite": "FAMILY",
@@ -69,7 +69,7 @@
 Agree room laugh prevent make. Our very television beat at success decade.""",
                     "languageCode": "FI",
                     "name": "Free heart significant machine try.",
-                    "shortDescription": "Fall long respond draw military dog.",
+                    "shortDescription": "Perform in weight success answer.",
                 }
             ],
             "updatedAt": "2020-12-12T00:00:00+00:00",
@@ -85,7 +85,7 @@
                     "node": {
                         "event": {
                             "capacityPerOccurrence": 805,
-                            "duration": 1450.0,
+                            "duration": 181,
                             "image": "spring.jpg",
                             "participantsPerInvite": "FAMILY",
                             "publishedAt": "1986-02-27T01:22:35+00:00",
@@ -129,7 +129,7 @@
         "occurrence": {
             "event": {
                 "capacityPerOccurrence": 805,
-                "duration": 1450.0,
+                "duration": 181,
                 "image": "spring.jpg",
                 "participantsPerInvite": "FAMILY",
                 "publishedAt": "1986-02-27T01:22:35+00:00",
diff --git a/venues/tests/snapshots/snap_test_api.py b/venues/tests/snapshots/snap_test_api.py
@@ -18,7 +18,7 @@
                                     "node": {
                                         "event": {
                                             "capacityPerOccurrence": 805,
-                                            "duration": 1450.0,
+                                            "duration": 181,
                                             "image": "spring.jpg",
                                             "participantsPerInvite": "FAMILY",
                                             "publishedAt": "1986-02-27T01:22:35+00:00",
@@ -68,7 +68,7 @@
                         "node": {
                             "event": {
                                 "capacityPerOccurrence": 805,
-                                "duration": 1450.0,
+                                "duration": 181,
                                 "image": "spring.jpg",
                                 "participantsPerInvite": "FAMILY",
                                 "publishedAt": "1986-02-27T01:22:35+00:00",

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ class Event(TimestampedModel, TranslatableModel):`
`27`	`27`	`choices=PARTICIPANT_AMOUNT_CHOICES,`
`28`	`28`	`verbose_name=_("participants per invite"),`
`29`	`29`	`)`
`30`		`- duration = models.DurationField(verbose_name=_("duration"), blank=True, null=True)`
	`30`	`+ duration = models.PositiveSmallIntegerField(`
	`31`	`+ verbose_name=_("duration"), blank=True, null=True, help_text=_("In minutes")`
	`32`	`+ )`
`31`	`33`	`capacity_per_occurrence = models.PositiveSmallIntegerField(`
`32`	`34`	`verbose_name=_("capacity per occurrence")`
`33`	`35`	`)`