Merge pull request breatheco-de#1218 from gustavomm19/delivered_at

add delivered_at to tasks
jefer94 · Dec 14, 2023 · fb46d32 · fb46d32
2 parents c252581 + 1a30d2a
commit fb46d32
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 12 deletions.
diff --git a/breathecode/activity/tests/urls/v2/tests_academy_activity.py b/breathecode/activity/tests/urls/v2/tests_academy_activity.py
@@ -18,7 +18,7 @@
 UTC_NOW = timezone.now()
 
 
-def bigquery_client_mock(self, n=1, user_id=1, kind=None):
+def bigquery_client_mock(self, n=1, user_id=1, kind=None, date_start=None, date_end=None):
     rows_to_insert = [{
         'id': uuid4().hex,
         'user_id': user_id,
@@ -51,6 +51,8 @@ def bigquery_client_mock(self, n=1, user_id=1, kind=None):
             WHERE user_id = @user_id
                 AND meta.academy = @academy_id
                 {'AND kind = @kind' if kind else ''}
+                {'AND timestamp >= @date_start' if date_start else ''}
+                {'AND timestamp <= @date_end' if date_end else ''}
             ORDER BY id DESC
             LIMIT @limit
             OFFSET @offset

diff --git a/breathecode/admissions/tests/urls/tests_academy_cohort_user.py b/breathecode/admissions/tests/urls/tests_academy_cohort_user.py
@@ -916,17 +916,31 @@ def test__with_data__with_cohorts_get_tasks_with_no_tasks(self):
                 'phone': model['profile_academy'].phone,
             },
             'tasks': [{
-                'id': model['task'].id,
-                'associated_slug': model['task'].associated_slug,
-                'description': model['task'].description,
-                'github_url': model['task'].github_url,
-                'live_url': model['task'].live_url,
-                'task_type': model['task'].task_type,
-                'task_status': model['task'].task_status,
-                'revision_status': model['task'].revision_status,
-                'created_at': re.sub(r'\+00:00$', 'Z', model['task'].created_at.isoformat()),
-                'updated_at': re.sub(r'\+00:00$', 'Z', model['task'].updated_at.isoformat()),
-                'title': model['task'].title,
+                'id':
+                model['task'].id,
+                'associated_slug':
+                model['task'].associated_slug,
+                'description':
+                model['task'].description,
+                'github_url':
+                model['task'].github_url,
+                'live_url':
+                model['task'].live_url,
+                'task_type':
+                model['task'].task_type,
+                'task_status':
+                model['task'].task_status,
+                'revision_status':
+                model['task'].revision_status,
+                'created_at':
+                re.sub(r'\+00:00$', 'Z', model['task'].created_at.isoformat()),
+                'updated_at':
+                re.sub(r'\+00:00$', 'Z', model['task'].updated_at.isoformat()),
+                'delivered_at':
+                re.sub(r'\+00:00$', 'Z', model['task'].delivered_at.isoformat())
+                if model['task'].delivered_at is not None else None,
+                'title':
+                model['task'].title,
             }],
             'cohort': {
                 'id': model['cohort_user'].cohort.id,

diff --git a/breathecode/assignments/migrations/0016_task_delivered_at.py b/breathecode/assignments/migrations/0016_task_delivered_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2023-12-14 00:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assignments', '0015_auto_20231017_0605'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='delivered_at',
+            field=models.DateTimeField(blank=True, db_index=True, default=None, null=True),
+        ),
+    ]
diff --git a/breathecode/assignments/models.py b/breathecode/assignments/models.py
@@ -68,6 +68,7 @@ class Task(models.Model):
     live_url = models.CharField(max_length=150, blank=True, default=None, null=True)
     description = models.TextField(max_length=450, blank=True)
     opened_at = models.DateTimeField(null=True, blank=True, default=None, db_index=True)
+    delivered_at = models.DateTimeField(null=True, blank=True, default=None, db_index=True)
 
     subtasks = models.JSONField(
         default=None,

diff --git a/breathecode/assignments/serializers.py b/breathecode/assignments/serializers.py
@@ -44,6 +44,7 @@ class TaskGETSerializer(serpy.Serializer):
     task_type = serpy.Field()
     user = UserSmallSerializer()
     opened_at = serpy.Field()
+    delivered_at = serpy.Field()
 
     created_at = serpy.Field()
     updated_at = serpy.Field()
@@ -61,6 +62,7 @@ class TaskGETSmallSerializer(serpy.Serializer):
     github_url = serpy.Field()
     live_url = serpy.Field()
     task_type = serpy.Field()
+    delivered_at = serpy.Field()
 
     created_at = serpy.Field()
     updated_at = serpy.Field()

diff --git a/breathecode/assignments/tests/urls/tests_task.py b/breathecode/assignments/tests/urls/tests_task.py
@@ -27,6 +27,8 @@ def get_serializer(self, task, user):
         'title': task.title,
         'description': task.description,
         'opened_at': self.bc.datetime.to_iso_string(task.opened_at) if task.opened_at else task.opened_at,
+        'delivered_at':
+        self.bc.datetime.to_iso_string(task.delivered_at) if task.delivered_at else task.delivered_at,
         'user': {
             'first_name': user.first_name,
             'id': user.id,

diff --git a/breathecode/assignments/tests/urls/tests_task_id.py b/breathecode/assignments/tests/urls/tests_task_id.py
@@ -24,6 +24,8 @@ def get_serializer(self, task, user):
         'title': task.title,
         'description': task.description,
         'opened_at': self.bc.datetime.to_iso_string(task.opened_at) if task.opened_at else task.opened_at,
+        'delivered_at':
+        self.bc.datetime.to_iso_string(task.delivered_at) if task.delivered_at else task.delivered_at,
         'user': {
             'first_name': user.first_name,
             'id': user.id,
@@ -51,6 +53,8 @@ def put_serializer(self, task, data={}):
         'title': task.title,
         'rigobot_repository_id': task.rigobot_repository_id,
         'opened_at': self.bc.datetime.to_iso_string(task.opened_at) if task.opened_at else task.opened_at,
+        'delivered_at':
+        self.bc.datetime.to_iso_string(task.delivered_at) if task.delivered_at else task.delivered_at,
         **data,
     }
 
@@ -70,6 +74,8 @@ def task_row(self, task, data={}):
         'user_id': task.user.id,
         'subtasks': task.subtasks,
         'opened_at': self.bc.datetime.to_iso_string(task.opened_at) if task.opened_at else task.opened_at,
+        'delivered_at':
+        self.bc.datetime.to_iso_string(task.delivered_at) if task.delivered_at else task.delivered_at,
         'rigobot_repository_id': task.rigobot_repository_id,
         **data,
     }

diff --git a/breathecode/assignments/tests/urls/tests_user_me_task.py b/breathecode/assignments/tests/urls/tests_user_me_task.py
@@ -53,6 +53,8 @@ def get_serializer(self, task, user):
         'title': task.title,
         'description': task.description,
         'opened_at': self.bc.datetime.to_iso_string(task.opened_at) if task.opened_at else task.opened_at,
+        'delivered_at':
+        self.bc.datetime.to_iso_string(task.delivered_at) if task.delivered_at else task.delivered_at,
         'user': {
             'first_name': user.first_name,
             'id': user.id,
@@ -78,6 +80,8 @@ def put_serializer(self, task, data={}):
         'attachments': [],
         'subtasks': task.subtasks,
         'opened_at': self.bc.datetime.to_iso_string(task.opened_at) if task.opened_at else task.opened_at,
+        'delivered_at':
+        self.bc.datetime.to_iso_string(task.delivered_at) if task.delivered_at else task.delivered_at,
         **data,
     }