api: Add list archive fields

Add the new list archive fields to the API. As this is a
backwards-compatible change, this requires only a minor version increment
to v1.2.

Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Daniel Axtens <dja@axtens.net>

diff --git a/patchwork/api/comment.py b/patchwork/api/comment.py
index 57b37111c30b948ebc74f4ccc2178b14bd19031b..290b9cd3f3cecb85dda7fcd20c505c2be56ac2ce 100644 (file)
--- a/patchwork/api/comment.py
+++ b/patchwork/api/comment.py
@@ -47,11 +47,12 @@ class CommentListSerializer(BaseHyperlinkedModelSerializer):
 
     class Meta:
         model = Comment
-        fields = ('id', 'web_url', 'msgid', 'date', 'subject', 'submitter',
-                  'content', 'headers')
+        fields = ('id', 'web_url', 'msgid', 'list_archive_url', 'date',
+                  'subject', 'submitter', 'content', 'headers')
         read_only_fields = fields
         versioned_fields = {
             '1.1': ('web_url', ),
+            '1.2': ('list_archive_url',),
         }
 
 

diff --git a/patchwork/api/cover.py b/patchwork/api/cover.py
index 7a663226ade84799549d8e82189c4793bceb33ac..caf9a386efa5b8fcc1e4b19e9cf23219cffc3f7c 100644 (file)
--- a/patchwork/api/cover.py
+++ b/patchwork/api/cover.py
@@ -50,11 +50,13 @@ class CoverLetterListSerializer(BaseHyperlinkedModelSerializer):
 
     class Meta:
         model = CoverLetter
-        fields = ('id', 'url', 'web_url', 'project', 'msgid', 'date', 'name',
-                  'submitter', 'mbox', 'series', 'comments')
+        fields = ('id', 'url', 'web_url', 'project', 'msgid',
+                  'list_archive_url', 'date', 'name', 'submitter', 'mbox',
+                  'series', 'comments')
         read_only_fields = fields
         versioned_fields = {
             '1.1': ('web_url', 'mbox', 'comments'),
+            '1.2': ('list_archive_url',),
         }
         extra_kwargs = {
             'url': {'view_name': 'api-cover-detail'},

diff --git a/patchwork/api/embedded.py b/patchwork/api/embedded.py
index 60fb9a4e970103558c3a4818bfb91ce94aa21fdb..968cb7f91f10565ffee5991e2f36f312fc598d05 100644 (file)
--- a/patchwork/api/embedded.py
+++ b/patchwork/api/embedded.py
@@ -108,10 +108,12 @@ class CoverLetterSerializer(SerializedRelatedField):
 
         class Meta:
             model = models.CoverLetter
-            fields = ('id', 'url', 'web_url', 'msgid', 'date', 'name', 'mbox')
+            fields = ('id', 'url', 'web_url', 'msgid', 'list_archive_url',
+                      'date', 'name', 'mbox')
             read_only_fields = fields
             versioned_fields = {
                 '1.1': ('web_url', 'mbox', ),
+                '1.2': ('list_archive_url',),
             }
             extra_kwargs = {
                 'url': {'view_name': 'api-cover-detail'},
@@ -124,10 +126,12 @@ class PatchSerializer(SerializedRelatedField):
 
         class Meta:
             model = models.Patch
-            fields = ('id', 'url', 'web_url', 'msgid', 'date', 'name', 'mbox')
+            fields = ('id', 'url', 'web_url', 'msgid', 'list_archive_url',
+                      'date', 'name', 'mbox')
             read_only_fields = fields
             versioned_fields = {
                 '1.1': ('web_url', ),
+                '1.2': ('list_archive_url',),
             }
             extra_kwargs = {
                 'url': {'view_name': 'api-patch-detail'},
@@ -158,11 +162,15 @@ class ProjectSerializer(SerializedRelatedField):
         class Meta:
             model = models.Project
             fields = ('id', 'url', 'name', 'link_name', 'list_id',
-                      'list_email', 'web_url', 'scm_url', 'webscm_url')
+                      'list_email', 'web_url', 'scm_url', 'webscm_url',
+                      'list_archive_url', 'list_archive_url_format')
             read_only_fields = fields
             extra_kwargs = {
                 'url': {'view_name': 'api-project-detail'},
             }
+            versioned_fields = {
+                '1.2': ('list_archive_url', 'list_archive_url_format'),
+            }
 
 
 class SeriesSerializer(SerializedRelatedField):

diff --git a/patchwork/api/patch.py b/patchwork/api/patch.py
index 05f6cea84c4559f96b415a6323dacaffeb0d4e52..c9360308a56a465a54b3487a44e101a063e58cb3 100644 (file)
--- a/patchwork/api/patch.py
+++ b/patchwork/api/patch.py
@@ -121,15 +121,16 @@ class PatchListSerializer(BaseHyperlinkedModelSerializer):
 
     class Meta:
         model = Patch
-        fields = ('id', 'url', 'web_url', 'project', 'msgid', 'date', 'name',
-                  'commit_ref', 'pull_url', 'state', 'archived', 'hash',
-                  'submitter', 'delegate', 'mbox', 'series', 'comments',
-                  'check', 'checks', 'tags')
-        read_only_fields = ('web_url', 'project', 'msgid', 'date', 'name',
-                            'hash', 'submitter', 'mbox', 'series', 'comments',
-                            'check', 'checks', 'tags')
+        fields = ('id', 'url', 'web_url', 'project', 'msgid',
+                  'list_archive_url', 'date', 'name', 'commit_ref', 'pull_url',
+                  'state', 'archived', 'hash', 'submitter', 'delegate', 'mbox',
+                  'series', 'comments', 'check', 'checks', 'tags')
+        read_only_fields = ('web_url', 'project', 'msgid', 'list_archive_url',
+                            'date', 'name', 'hash', 'submitter', 'mbox',
+                            'series', 'comments', 'check', 'checks', 'tags')
         versioned_fields = {
             '1.1': ('comments', 'web_url'),
+            '1.2': ('list_archive_url',),
         }
         extra_kwargs = {
             'url': {'view_name': 'api-patch-detail'},

diff --git a/patchwork/api/project.py b/patchwork/api/project.py
index d7bb1f21cd093026ab8f1c873d2ae05b4f1bbdbf..62a8c3e73efe330f6b09752320b090b2624ccc76 100644 (file)
--- a/patchwork/api/project.py
+++ b/patchwork/api/project.py
@@ -26,11 +26,13 @@ class ProjectSerializer(BaseHyperlinkedModelSerializer):
         model = Project
         fields = ('id', 'url', 'name', 'link_name', 'list_id', 'list_email',
                   'web_url', 'scm_url', 'webscm_url', 'maintainers',
-                  'subject_match')
+                  'subject_match', 'list_archive_url',
+                  'list_archive_url_format')
         read_only_fields = ('name', 'link_name', 'list_id', 'list_email',
                             'maintainers', 'subject_match')
         versioned_fields = {
             '1.1': ('subject_match', ),
+            '1.2': ('list_archive_url', 'list_archive_url_format'),
         }
         extra_kwargs = {
             'url': {'view_name': 'api-project-detail'},
@@ -68,7 +70,8 @@ class ProjectList(ProjectMixin, ListAPIView):
     """List projects."""
 
     search_fields = ('link_name', 'list_id', 'list_email', 'web_url',
-                     'scm_url', 'webscm_url')
+                     'scm_url', 'webscm_url', 'list_archive_url',
+                     'list_archive_url_format')
     ordering_fields = ('id', 'name', 'link_name', 'list_id')
     ordering = 'id'
 

diff --git a/patchwork/urls.py b/patchwork/urls.py
index cfcf04dc3b71320cf34f36239999b61da9f4d9a1..c24bf55ee83f7bd39e26c6f324583c2c28d4f144 100644 (file)
--- a/patchwork/urls.py
+++ b/patchwork/urls.py
@@ -234,8 +234,8 @@ if settings.ENABLE_REST_API:
     ]
 
     urlpatterns += [
-        url(r'^api/(?:(?P<version>(1.0|1.1))/)?', include(api_patterns)),
-        url(r'^api/(?:(?P<version>1.1)/)?', include(api_1_1_patterns)),
+        url(r'^api/(?:(?P<version>(1.0|1.1|1.2))/)?', include(api_patterns)),
+        url(r'^api/(?:(?P<version>(1.1|1.2))/)?', include(api_1_1_patterns)),
 
         # token change
         url(r'^user/generate-token/$', user_views.generate_token,