Merge branch 'master' of https://github.com/datacite/lupo

datacite · Sep 1, 2018 · d6137b1 · d6137b1
2 parents 91162ae + 660508f
commit d6137b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/controllers/dois_controller.rb b/app/controllers/dois_controller.rb
@@ -223,10 +223,12 @@ def update
     exists = @doi.present?
 
     if exists
-      if safe_params[:xml].present? || safe_params[:url].present? || safe_params[:event].present?
+      if params[:data][:attributes][:mode] == "transfer"
+        authorize! :transfer, @doi
+      elsif safe_params[:xml].present? || safe_params[:url].present? || safe_params[:event].present?
         authorize! :update, @doi
       else
-        authorize! :transfer, @doi
+        fail ActionController::ParameterMissing 
       end
 
       @doi.assign_attributes(safe_params.except(:doi))
@@ -391,7 +393,7 @@ def safe_params
       last_landing_page_status: p["last-landing-page-status"],
       last_landing_page_status_check: p["last-landing-page-status-check"],
       last_landing_page_content_type: p["last-landing-page-content-type"]
-    ).except("confirm-doi", :identifier, :prefix, :suffix, "resource-type-subtype", "metadata-version", "schema-version", :state, "is-active", :created, :registered, :updated, :mode, "last-landing-page", "last-landing-page-status", "last-landing-page-status-check", "last-landing-page-content-type")
+    ).except("confirm-doi", :identifier, :prefix, :suffix, "resource-type-subtype", "metadata-version", "schema-version", :state, :mode, "is-active", :created, :registered, :updated, "last-landing-page", "last-landing-page-status", "last-landing-page-status-check", "last-landing-page-content-type")
   end
 
   def underscore_str(str)

diff --git a/spec/fixtures/files/transfer.json b/spec/fixtures/files/transfer.json
@@ -31,8 +31,7 @@
       "event": null,
       "created": "2018-08-29T13:45:34.000Z",
       "registered": "2018-08-29T14:07:53.000Z",
-      "updated": "2018-08-29T14:07:53.000Z",
-      "mode": "transfer"
+      "updated": "2018-08-29T14:07:53.000Z"
     },
     "relationships": {
       "client": {

diff --git a/spec/requests/dois_spec.rb b/spec/requests/dois_spec.rb
@@ -405,6 +405,7 @@
           "data" => {
             "type" => "dois",
             "attributes" => {
+              "mode" => "transfer"
             },
             "relationships"=> {
               "client"=>  {