to_spotlight 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc3e37bf423a699fa57b0be84458a76c686728ba2a03e9c77568038e23f5182
-  data.tar.gz: f7afd69a08db348741e5bdfed68a600bfadfc7538af0334417efabacf8618578
+  metadata.gz: 723cfc28349b5d450764bd91b70871ea4b2b326245a26b54ce84473263fb6ee3
+  data.tar.gz: 3f8170875f2b4fc728ea963d505ead581cc9270d2e14f358b102df1780016994
 SHA512:
-  metadata.gz: d4bf67bc61638150beb70abc78e6a2f91575824e777c7c983a5eda3ce07ef2617544ef03c38c05d51fbb19d9894d3ecce29496f028877d51b4bd8e3a305ab3ae
-  data.tar.gz: b8f4385cd08ed6a9de0afa4598c966665e85d9c287e3162c08c9bd05260c3eefadb3d5aee52f9f99e9563eda600a52dc9869aa84796accc7e320577834796b8b
+  metadata.gz: babde70f0e14fc18baacaa81069ca4ae66b4dda99eb5840f2ce7e9746f1a4f614548a78056641fb4be5d08371c76accef48ebdb4a47d4858cc56d728c97ce32a
+  data.tar.gz: b7a3a177ed371b5393008b8cf9d1b2c4a5e5508fd6085c0e349ea3af9aece78931d7363b34246c1971fa6ee2563f73a6afa5f1e43b8a317656a199a141b8fd5d

data/app/controllers/to_spotlight/spotlight_transfer_controller.rb

@@ -21,14 +21,8 @@ module ToSpotlight
 
     def receive
       return unless params[:token]
-      user = params.permit!.to_h[:user]
-      mappings = params.permit!.to_h[:mappings]
-      collection_id = params.permit!.to_h[:collection_id]
-      exhibit_id = params.permit!.to_h[:exhibit_id]
-      @transfer = ToSpotlight::SpotlightTransfer.new user: user,
-                                                     mappings: mappings,
-                                                     collection_id: collection_id,
-                                                     exhibit_id: exhibit_id
+      @transfer = ToSpotlight::SpotlightTransfer.new get_transfer_attributes
+      @transfer.mappings = params[:mappings]
       if @transfer.save
         render plain: 'Transfer Request Received'
       else
@@ -45,13 +39,12 @@ module ToSpotlight
       transfer = ToSpotlight::SpotlightTransfer.find params[:transfer_id]
       works = ::ActiveFedora::Base.where member_of_collection_ids_ssim: transfer.collection_id
       mappings = mapping_invert transfer.mappings
-      SpotlightTransferJob.perform_later(works.to_a, mappings) if now
-      SpotlightTransferJob.set(wait_until: Date.today.end_of_day).perform_later(works.to_a, mappings) unless now
-      #@res = ::Net::HTTP.post URI('http://localhost:3000/from_hyrax/receive'),
-      #                        { transfer: transfer.attributes,
-      #                          now: now,
-      #                          token: 'secret_token' }.to_json,
-      #                        'Content-Type' => 'application/json'
+      if now
+        SpotlightTransferJob.perform_later(works.to_a, mappings, transfer)
+      else
+        SpotlightTransferJob.set(wait_until: Date.today.end_of_day)
+                            .perform_later(works.to_a, mappings, transfer)
+      end
 
     end
 
@@ -118,5 +111,12 @@ module ToSpotlight
       eval a_of_a.map{|a| a.inspect}.join(' & ')
     end
 
+    def get_transfer_attributes
+      params.require(:transfer).permit(:user,
+                                       :exhibit_id,
+                                       :collection_id,
+                                       :spotlight_url)
+    end
+
   end
 end

data/app/jobs/to_spotlight/spotlight_transfer_job.rb

@@ -2,7 +2,7 @@ module ToSpotlight
   class SpotlightTransferJob < ActiveJob::Base
     queue_as :default
 
-    def perform(works, mappings)
+    def perform(works, mappings, transfer)
       base_url = ::Account.where(tenant: Apartment::Tenant.current).first.cname
       csv_headers = %w[url full_title_tesim] + mappings.keys + %w[children]
       csv_array = [csv_headers.join(',')]
@@ -16,21 +16,21 @@ module ToSpotlight
         #  next if wk.file_set_ids.length>1
         #end
         #index += 1
-        comp = wk.file_set_ids.any?
+        comp = false #wk.file_set_ids.length > 1
         children = []
         if comp
           index = wk.ordered_file_set_ids.length * -1
           wk.ordered_file_set_ids.each do |f_id|
-            csv_array << empty_fs_line(f_id, csv_headers.length-1)
+            csv_array << empty_fs_line(f_id, csv_headers.length - 1)
             children << index
             index += 1
           end
         end
-        
+
         doc = ::SolrDocument.find wk.id
-        
+
         line_hash = {}
-        line_hash['url'] = "http://#{base_url}/downloads/#{wk.file_sets.first.id}?locale=en" #url
+        line_hash['url'] = "http://#{base_url}/concern/#{underscore_name(wk)}/#{wk.id}/manifest.json" #url
         line_hash['full_title_tesim'] = (doc.title.length > 1 ? doc.title.join('; ') : doc.title.first) #full_title_tesim
 
         mappings.each do |skey, field|
@@ -50,6 +50,13 @@ module ToSpotlight
       File.open(dir.join(filename), 'wb') do |file|
         file.write(csv_array.join("\n"))
       end
+      byebug
+      res = ::Net::HTTP.post URI("#{transfer.spotlight_url}/from_hyrax/receive"),
+                             { csv_url:    "https://#{base_url}/uploads/csvs/#{filename}",
+                               transfer:   transfer.attributes.except(:mappings), #only allow user+exhibit ??
+                               token:      'secret_token' }.to_json,
+                             'Content-Type' => 'application/json'
+
     end
 
     def base_url
@@ -57,7 +64,7 @@ module ToSpotlight
     end
 
     def empty_fs_line fs_id, commas
-      "http://#{base_url}downloads/#{fs_id}?locale=en" + (',' * commas)
+      "http://#{base_url}/downloads/#{fs_id}?locale=en" + (',' * commas)
     end
 
     def create_cell w, field
@@ -72,6 +79,10 @@ module ToSpotlight
       end
     end
 
+    def underscore_name work
+      work.class.to_s.underscore + 's'
+    end
+
     def get_location list
       output = []
       list.each do |loc|
@@ -83,11 +94,11 @@ module ToSpotlight
     def get_resource list
       output = []
       list.each do |url|
-        if url.include? 'http'
-          output << Hyrax::ResourceTypesService.label(url)
-        else
-          output << url
-        end
+        output << if url.include? 'http'
+                    Hyrax::ResourceTypesService.label(url)
+                  else
+                    url
+                  end
       end
       output.join('; ')
     end
@@ -95,11 +106,11 @@ module ToSpotlight
     def get_rights list
       output = []
       list.each do |url|
-        if url.include? 'http'
-          output << ::VaultRightsStatementsService.label(url)
-        else
-          output << url
-        end
+        output << if url.include? 'http'
+                    ::VaultRightsStatementsService.label(url)
+                  else
+                    url
+                  end
       end
       #output = list.map { |url| url.include? "http" ? IaffRightsStatementService.label(url) : url }
       output.join('; ')

data/db/migrate/20200310153953_create_to_spotlight_spotlight_transfers.rb

@@ -6,6 +6,7 @@ class CreateToSpotlightSpotlightTransfers < ActiveRecord::Migration[5.0]
       t.boolean :approved, default: false
       t.string :collection_id
       t.string :exhibit_id
+      t.string :spotlight_url
 
       t.timestamps
     end

data/lib/to_spotlight/version.rb

@@ -1,3 +1,3 @@
 module ToSpotlight
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_spotlight
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - sephirothkod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails