Fixes #251- Implement the delete function and migrate to SHARE versio… #426

hweng · 2018-03-29T22:38:34Z

…n 2 API.

Fixes #251 ; refs #251

Changes proposed in this pull request:

Migrated to SHARE version 2 API.
Implemented delete a record from SHARE function.

@ucsdlib/developers - please review

…n 2 API.

houndci-bot · 2018-03-29T22:38:45Z

app/controllers/dams_resource_controller.rb

+        }
+      @route = "#{share_config.fetch('host')}api/v2/normalizeddata/" 
+      @body = ShareNotify::Graph.new(document).to_share_v2.to_json
+      @response = with_timeout { HTTParty.post(@route, body: @body, headers: @headers)}


Layout/SpaceInsideBlockBraces: Space missing inside }.

houndci-bot · 2018-03-29T22:38:45Z

app/controllers/dams_resource_controller.rb

+        'Authorization' => "Bearer #{share_config.fetch('token')}",
+        'Content-Type'  => 'application/vnd.api+json'
+        }
+      @route = "#{share_config.fetch('host')}api/v2/normalizeddata/" 


Layout/TrailingWhitespace: Trailing whitespace detected.

houndci-bot · 2018-03-29T22:38:45Z

app/controllers/dams_resource_controller.rb

+      @headers = {
+        'Authorization' => "Bearer #{share_config.fetch('token')}",
+        'Content-Type'  => 'application/vnd.api+json'
+        }


Layout/IndentHash: Indent the right brace the same as the start of the line where the left brace is.

houndci-bot · 2018-03-29T22:38:46Z

app/controllers/dams_resource_controller.rb

    osf_contributors(@document).each do |contributor|
      document.add_contributor(contributor)
    end
-
+    


Layout/TrailingWhitespace: Trailing whitespace detected.

houndci-bot · 2018-03-29T22:38:46Z

app/controllers/dams_resource_controller.rb

+    document.title = osf_title(@document)
+    document.delete
+    share_upload(document)
+    redirect_to dams_collection_path(params[:id]), notice: "Your record has been deleted from OSF Share."


Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.

houndci-bot · 2018-03-29T22:38:46Z

app/controllers/dams_resource_controller.rb

@@ -205,33 +205,44 @@ def osf_data
    render :json => @document
  end

+  def osf_delete
+    @document = get_single_doc_via_search(1, {:q => "id:#{params[:id]}"} )


Layout/SpaceInsideHashLiteralBraces: Space inside { missing.
Style/BracesAroundHashParameters: Redundant curly braces around a hash parameter.
Style/HashSyntax: Use the new Ruby 1.9 hash syntax.
Layout/SpaceInsideHashLiteralBraces: Space inside } missing.
Layout/SpaceInsideParens: Space inside parentheses detected.

houndci-bot · 2018-03-29T22:46:13Z

app/controllers/dams_resource_controller.rb

+
+  def share_config
+    env = Rails.env || 'test'
+    @config ||= YAML.safe_load(ERB.new(IO.read(File.join(Rails.root, 'config', 'share_notify.yml'))).result)[env].with_indifferent_access


Rails/FilePath: Please use Rails.root.join('path', 'to') instead.

houndci-bot · 2018-03-29T22:46:13Z

app/controllers/dams_resource_controller.rb

-    def with_timeout(&_block)
-      Timeout.timeout(5) { yield }
-    end
+  def share_upload(document)


Layout/IndentationWidth: Use 2 (not 0) spaces for rails indentation.

houndci-bot · 2018-03-29T22:46:13Z

app/controllers/dams_resource_controller.rb

+      collection_names.collect! { |name| "\"#{solr_escape(name)}\"" }
+      solr_param_q = collection_names.join ' OR '
+      solr_params = { q: "type_tesim:Collection AND title_tesim:(#{solr_param_q})", rows: collection_names.count }
+      cols_response, col_documents = get_search_results(solr_params, spellcheck: 'false')


Lint/UselessAssignment: Useless assignment to variable - col_documents. Use _ or _col_documents as a variable name to indicate that it won't be used.

houndci-bot · 2018-03-29T22:46:13Z

app/controllers/dams_resource_controller.rb

+          relatedResourceData = collectionDoc['related_resource_json_tesim'] unless collectionDoc.nil?
+          next if relatedResourceData.nil?
+          relatedResourceData.each do |datum|
+            relatedResource = JSON.parse(datum)


Naming/VariableName: Use snake_case for variable names.

houndci-bot · 2018-03-29T22:46:14Z

app/controllers/dams_resource_controller.rb

+          collectionDoc = get_single_doc_via_search(1, q: "id:#{collection['id']}")
+          relatedResourceData = collectionDoc['related_resource_json_tesim'] unless collectionDoc.nil?
+          next if relatedResourceData.nil?
+          relatedResourceData.each do |datum|


Lint/ShadowingOuterLocalVariable: Shadowing outer local variable - datum.

houndci-bot · 2018-03-29T22:46:14Z

app/controllers/dams_resource_controller.rb

-	    end
-	  end
+          collectionDoc = get_single_doc_via_search(1, q: "id:#{collection['id']}")
+          relatedResourceData = collectionDoc['related_resource_json_tesim'] unless collectionDoc.nil?


Naming/VariableName: Use snake_case for variable names.

houndci-bot · 2018-03-29T22:46:14Z

app/controllers/dams_resource_controller.rb

-		  end
-	    end
-	  end
+          collectionDoc = get_single_doc_via_search(1, q: "id:#{collection['id']}")


Naming/VariableName: Use snake_case for variable names.

houndci-bot · 2018-03-29T22:46:14Z

app/controllers/dams_resource_controller.rb

-	  if !collectionData.nil? and collectionData.length > 0
-	  	collectionData.each do |datum|
+      collectionData = @document['collection_json_tesim']
+      @collectionDocArray = []


Naming/VariableName: Use snake_case for variable names.

houndci-bot · 2018-03-29T22:46:14Z

app/controllers/dams_resource_controller.rb

-	  @collectionDocArray = Array.new
-	  if !collectionData.nil? and collectionData.length > 0
-	  	collectionData.each do |datum|
+      collectionData = @document['collection_json_tesim']


Naming/VariableName: Use snake_case for variable names.

houndci-bot · 2018-03-29T22:46:14Z

app/controllers/dams_resource_controller.rb

+      facet_collection_names = []
+      @facet_collections = @facet_collection_resp[0].facet_counts['facet_fields']['collection_sim']
+      if @facet_collections.present?
+        @facet_collections.each_slice(2) do |collectionName, *_|


Naming/VariableName: Use snake_case for variable names.

houndci-bot · 2018-03-29T23:01:22Z

app/controllers/dams_resource_controller.rb

+    def share_upload(document)
+      @headers = 
+        {
+        'Authorization' => "Bearer #{share_config.fetch('token')}",


Layout/IndentHash: Use 2 spaces for indentation in a hash, relative to the start of the line where the left curly brace is.

houndci-bot · 2018-03-29T23:01:22Z

app/controllers/dams_resource_controller.rb

      redirect_to dams_collection_path(params[:id]), notice: "Your record has been pushed to OSF Share."
    else
      redirect_to dams_collection_path(params[:id]), alert: "Your record is not valid."
    end
  end

  private
+    def share_upload(document)
+      @headers = 


Layout/TrailingWhitespace: Trailing whitespace detected.

houndci-bot · 2018-03-29T23:05:27Z

app/controllers/dams_resource_controller.rb

+        'Authorization' => "Bearer #{share_config.fetch('token')}",
+        'Content-Type'  => 'application/vnd.api+json'
+      }
+      @route = "#{share_config.fetch('host')}api/v2/normalizeddata/" 


Layout/TrailingWhitespace: Trailing whitespace detected.

VivianChu · 2018-04-05T17:58:20Z

👍

lsitu · 2018-04-05T19:58:42Z

👍

hweng · 2018-04-19T21:56:48Z

@ucsdlib/developers Can anyone merge this PR please? Another ticket #270 is depending on it. Thanks!

hweng · 2018-04-19T22:05:18Z

Thank you @ucsdlib/developers for reviewing and @mcritchlow for merged it.

Fixes #251- Implement the delete function and migrate to SHARE versio…

7bb5359

…n 2 API.

houndci-bot reviewed Mar 29, 2018

View reviewed changes

hweng force-pushed the feature/update_share branch from a777b12 to 7bb5359 Compare March 29, 2018 22:51

houndci-bot reviewed Mar 29, 2018

View reviewed changes

Fxing rubocop offensive.

c6056f2

hweng force-pushed the feature/update_share branch from 4ab185d to c6056f2 Compare March 29, 2018 23:09

mcritchlow merged commit 84da581 into develop Apr 19, 2018

mcritchlow deleted the feature/update_share branch April 19, 2018 21:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #251- Implement the delete function and migrate to SHARE versio… #426

Fixes #251- Implement the delete function and migrate to SHARE versio… #426

hweng commented Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

houndci-bot Mar 29, 2018

VivianChu commented Apr 5, 2018

lsitu commented Apr 5, 2018

hweng commented Apr 19, 2018

hweng commented Apr 19, 2018

Fixes #251- Implement the delete function and migrate to SHARE versio… #426

Fixes #251- Implement the delete function and migrate to SHARE versio… #426

Conversation

hweng commented Mar 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VivianChu commented Apr 5, 2018

lsitu commented Apr 5, 2018

hweng commented Apr 19, 2018

hweng commented Apr 19, 2018