Merge lp:~jelmer/launchpad/bug371693 into lp:launchpad/db-devel

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

= Summary =
Export IPublishing.requestDeletion() as web API. (bug371693)

== Proposed fix ==

== Pre-implementation notes ==

== Implementation details ==

== Tests ==

./bin/test -ct xx-source-package-publishing

== Demo and Q/A ==

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2009-12-10 13:38:23 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2009-12-10 13:38:26 +0000
@@ -39,9 +39,8 @@
 
 from lazr.restful.fields import Reference
 from lazr.restful.declarations import (
-    export_as_webservice_entry, export_read_operation, exported,
-    operation_returns_collection_of)
-
+    export_as_webservice_entry, export_read_operation, export_write_operation,
+    exported, operation_parameters, operation_returns_collection_of)
 
 #
 # Exceptions
@@ -283,6 +282,10 @@
             `IBinaryPackagePublishingHistory`.
         """
 
+    @operation_parameters(
+        removed_by=Reference(schema=IPerson, title=_("Removed by")),
+        removal_comment=TextLine(title=_("Removal comment"), required=False))
+    @export_write_operation()
     def requestDeletion(removed_by, removal_comment=None):
         """Delete this publication.
 

=== modified file 'lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt'
--- lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2009-12-07 14:47:54 +0000
+++ lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2009-12-10 13:38:26 +0000
@@ -38,7 +38,7 @@
     iceweasel 1.0 in warty
     pmount 0.1-1 in warty
 
-getPublishedSources() can accept some optional filtering paramters to reduce
+getPublishedSources() can accept some optional filtering parameters to reduce
 the number of returned publications.
 
 Search by name and version using an exact match:
@@ -162,6 +162,35 @@
     >>> print pubs['entries'][0]['package_signer_link']
     None
 
+Package deletion
+================
+
+A user can request a package to be deleted:
+
+    >>> cprov = webservice.get("/~cprov").jsonBody()
+    >>> pubs = webservice.named_get(
+    ...     cprov_archive['self_link'], 'getPublishedSources',
+    ...     source_name="testwebservice", version="666",
+    ...     exact_match=True).jsonBody()
+    >>> print pubs['total_size']
+    1
+    >>> package = pubs['entries'][0]['self_link']
+    >>> response = webservice.named_post(
+    ...     package, 'requestDeletion', removed_by=cprov['self_link'],
+    ...     removal_comment="No longer needed")
+    >>> print response 
+    HTTP/1.1 200 Ok
+    ...
+
+After removal, the package is marked as such:
+
+    >>> pubs = webservice.named_get(
+    ...     cprov_archive['self_link'], 'getPublishedSources',
+    ...     source_name="testwebservice", version="666",
+    ...     exact_match=True).jsonBody()
+    >>> print pubs['entries'][0]['removal_comment']
+    No longer needed
+
 Privacy
 =======