Merge pull request #6354 from hennevogel/bugfix/staging-workflow

Bugfix staging workflow

docs/api/api/api.txt

@@ -1932,13 +1932,15 @@ XmlResult: required_checks
 
 
 == Staging
+  WARNING: This API is currently in beta and unstable
 
 === Excluded Requests
 
 <project>: The name of the main project of a Staging, e.g. openSUSE_Tumbleweed
 <request>: The number of the request, e.g. 12345
+<description>: A string of text (url encoded)
 
-POST /staging_excluded_requests/<request>/<project>
+POST /staging_excluded_requests/<request>/<project>?description=<description>
   Exclude this request from this Staging
 
 DELETE /staging_excluded_requests/<request>

src/api/app/controllers/staging/staged_requests_controller.rb

@@ -13,7 +13,7 @@ def create
     result = ::Staging::StageRequests.new(
       request_numbers: request_numbers,
       staging_workflow: @staging_workflow,
-      staging_project_name: @staging_project.name
+      staging_project: @staging_project
     ).perform
 
     if result.valid?

src/api/app/models/staging/stage_requests.rb

@@ -1,6 +1,6 @@
 class Staging::StageRequests
   include ActiveModel::Model
-  attr_accessor :request_numbers, :staging_project_name, :staging_workflow
+  attr_accessor :request_numbers, :staging_project, :staging_workflow
 
   def perform
     add_request_not_found_errors
@@ -50,17 +50,18 @@ def requests
   def branch_package(bs_request_action)
     request = bs_request_action.bs_request
     BranchPackage.new(
-      target_project: staging_project_name,
+      target_project: staging_project.name,
       target_package: bs_request_action.target_package,
       project: bs_request_action.source_project,
       package: bs_request_action.source_package,
       extend_package_names: false
     ).branch
+    staging_project.staged_requests << request
     result << request
   rescue BranchPackage::DoubleBranchPackageError
     # we leave the package there and do not report as success
     # because packages might differ
-    errors << "Request '#{request.number}' already branched into '#{staging_project_name}'"
+    errors << "Request '#{request.number}' already branched into '#{staging_project.name}'"
   rescue APIError, Backend::Error => e
     errors << "Request '#{request.number}' branching failed: '#{e.message}'"
     Airbrake.notify(e, bs_request: request.number)

src/api/app/policies/staging/workflow_policy.rb

@@ -6,7 +6,7 @@ def initialize(user, record)
   end
 
   def create?
-    ProjectPolicy.new(@user, @record.project).create?
+    ProjectPolicy.new(@user, @record.project).update?
   end
 
   def update?