Merge branch 'update-task-api' of 'https://github.com/sduenas/grimoirelab-core'

Merges #16
Closes #16

Author: sduenas

src/grimoirelab/core/scheduler/api.py

@@ -52,14 +52,20 @@ def get_paginated_response(self, data):
 
 class EventizerTaskListSerializer(serializers.ModelSerializer):
     status = serializers.CharField(source='get_status_display')
+    last_jobs = serializers.SerializerMethodField()
 
     class Meta:
         model = EventizerTask
         fields = [
-            'uuid', 'status', 'runs', 'failures', 'last_run',
-            'scheduled_at', 'datasource_type', 'datasource_category',
+            'uuid', 'status', 'runs', 'failures', 'last_run', 'last_jobs',
+            'scheduled_at', 'datasource_type', 'datasource_category'
         ]
 
+    def get_last_jobs(self, obj):
+        job_klass = get_registered_task_model('eventizer')[1]
+        jobs = job_klass.objects.filter(task=obj).order_by('-job_num')[:10]
+        return EventizerJobSummarySerializer(jobs, many=True).data
+
 
 class EventizerJobListSerializer(serializers.ModelSerializer):
     status = serializers.CharField(source='get_status_display')
@@ -80,7 +86,17 @@ class Meta:
         fields = [
             'uuid', 'status', 'runs', 'failures', 'last_run',
             'job_interval', 'scheduled_at',
-            'datasource_type', 'datasource_category'
+            'datasource_type', 'datasource_category',
+        ]
+
+
+class EventizerJobSummarySerializer(serializers.ModelSerializer):
+    status = serializers.CharField(source='get_status_display')
+
+    class Meta:
+        model = get_registered_task_model('eventizer')[1]
+        fields = [
+            'uuid', 'job_num', 'status', 'scheduled_at', 'finished_at'
         ]
 
 
@@ -121,7 +137,7 @@ def get_logs(self, obj):
 
 
 class EventizerTaskList(generics.ListAPIView):
-    queryset = EventizerTask.objects.all()
+    queryset = EventizerTask.objects.all().order_by('-scheduled_at')
     serializer_class = EventizerTaskListSerializer
     pagination_class = EventizerPaginator
 

src/grimoirelab/core/scheduler/views.py

@@ -37,8 +37,8 @@ def add_task(request):
     {
         'type': 'eventizer',
         'task_args': {
-            'backend": 'git',
-            'category": 'commit',
+            'datasource_type': 'git',
+            'datasource_category': 'commit',
             'backend_args': {
                 'uri': 'https://github.com/chaoss/grimoirelab.git'
             }
@@ -67,8 +67,8 @@ def add_task(request):
 
     task = schedule_task(
         task_type, task_args,
-        datasource_type=data['task_args']['backend'],
-        datasource_category=data['task_args']['category'],
+        datasource_type=data['task_args']['datasource_type'],
+        datasource_category=data['task_args']['datasource_category'],
         job_interval=job_interval,
         job_max_retries=job_max_retries
     )