From c629f41269d0a4b5d16dc9652ad68fe6b64498c2 Mon Sep 17 00:00:00 2001
From: Thomas Maurel <maurel@ebi.ac.uk>
Date: Mon, 11 May 2020 14:52:53 +0100
Subject: [PATCH] Updated API requestjob, requestjob_detail, transfer_log
 endpoints to use the model properties to get accurate copy status. Endpoints
 now match informations displayed on the interface

---
 ensembl_dbcopy/api/serializers.py | 42 ++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/ensembl_dbcopy/api/serializers.py b/ensembl_dbcopy/api/serializers.py
index c17f13e..7a7a236 100644
--- a/ensembl_dbcopy/api/serializers.py
+++ b/ensembl_dbcopy/api/serializers.py
@@ -66,13 +66,31 @@ class Meta:
             'end_date',
             'size',
             'retries',
-            'message')
+            'message',
+            'table_status')
 
 
 class RequestJobListSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = RequestJob
-        fields = '__all__'
+        fields = (
+            'url',
+            'src_host',
+            'src_incl_db',
+            'src_skip_db',
+            'src_incl_tables',
+            'src_skip_tables',
+            'tgt_host',
+            'tgt_db_name',
+            'tgt_directory',
+            'skip_optimize',
+            'wipe_target',
+            'convert_innodb',
+            'email_list',
+            'start_date',
+            'end_date',
+            'user',
+            'overall_status')
         extra_kwargs = {
             'url': {'view_name': 'requestjob-detail', 'lookup_field': 'job_id'},
         }
@@ -81,7 +99,25 @@ class Meta:
 class RequestJobDetailSerializer(BaseUserTimestampSerializer):
     class Meta:
         model = RequestJob
-        fields = '__all__'
+        fields = (
+            'transfer_log',
+            'src_host',
+            'src_incl_db',
+            'src_skip_db',
+            'src_incl_tables',
+            'src_skip_tables',
+            'tgt_host',
+            'tgt_db_name',
+            'tgt_directory',
+            'skip_optimize',
+            'wipe_target',
+            'convert_innodb',
+            'email_list',
+            'start_date',
+            'end_date',
+            'user',
+            'overall_status',
+            'detailed_status')
 
     transfer_log = TransferLogSerializer(many=True, source='transfer_logs', read_only=True)