From 1c66ffd4701e9da16d462efb8823d722f6cdd747 Mon Sep 17 00:00:00 2001
From: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
Date: Fri, 16 Mar 2018 12:09:03 -0300
Subject: [PATCH] Created task to import from dspace based on user handle
---
app/builders/learning_object_builder.rb | 14 ++++---
app/models/learning_object.rb | 1 +
.../dspace/learning_object_importer.rb | 8 ++--
app/services/learning_object_publisher.rb | 6 ++-
lib/tasks/import/learning_objects.rake | 42 +++++++++++++++++++
5 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/app/builders/learning_object_builder.rb b/app/builders/learning_object_builder.rb
index 9428e079..8b5dcc07 100644
--- a/app/builders/learning_object_builder.rb
+++ b/app/builders/learning_object_builder.rb
@@ -18,7 +18,7 @@
# along with portalmec. If not, see <http://www.gnu.org/licenses/>.
class LearningObjectBuilder
- def self.build_from_dspace(item)
+ def self.build_from_dspace(item, publisher)
lo = LearningObject.new(
name: item.name,
id_dspace: item.id,
@@ -27,16 +27,18 @@ class LearningObjectBuilder
)
lo.curator = lo.get_metadata_value_of('dc.curator')
- institution = lo.get_metadata_value_of('dc.creator')
- institution = 'Desconhecido' if institution.blank?
- lo.publisher = Institution.where(name: institution).first_or_create
+ # institution = lo.get_metadata_value_of('dc.creator')
+ # institution = 'Desconhecido' if institution.blank?
+ # lo.publisher = Institution.where(name: institution).first_or_create
+ lo.publisher = publisher
object_type = lo.get_metadata_value_of('dc.type')
object_type = 'Desconhecido' if object_type.blank?
lo.object_type = ObjectType.where(name: object_type).first_or_create
- date = lo.get_metadata_value_of('dc.date.issued')
- lo.published_at = Time.iso8601(date) unless date.nil?
+ # date = lo.get_metadata_value_of('dc.date.issued')
+ # lo.published_at = Time.iso8601(date) unless date.nil?
+ lo.published_at = Time.current
code = lo.get_metadata_value_of('dc.language')
code = 'pt' if code.blank?
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index 5b0b8426..5b1e65ad 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -141,6 +141,7 @@ class LearningObject < ApplicationRecord
return thumbnail unless thumbnail.blank?
return nil if attachments.blank?
return default_attachment.thumbnail unless default_attachment.thumbnail.blank?
+ ThumbnailGenerateWorker.perform_async(default_attachment.id)
attachments.each { |a| return a.thumbnail unless a.thumbnail.blank? }
nil
end
diff --git a/app/services/dspace/learning_object_importer.rb b/app/services/dspace/learning_object_importer.rb
index 10311966..5b200c69 100644
--- a/app/services/dspace/learning_object_importer.rb
+++ b/app/services/dspace/learning_object_importer.rb
@@ -19,8 +19,9 @@
class Dspace::LearningObjectImporter
- def initialize(items)
+ def initialize(items, publisher)
@items = items
+ @publisher = publisher
end
def import
@@ -28,14 +29,14 @@ class Dspace::LearningObjectImporter
@items.each do |item|
next if item_exists? item
- learning_object = LearningObjectBuilder.build_from_dspace(item)
+ learning_object = LearningObjectBuilder.build_from_dspace(item, @publisher)
next if learning_object.blank?
create_attachments(learning_object, item.bit_streams)
items << learning_object
yield(learning_object) if block_given?
end
- LearningObject.import items, recursive: true
+ LearningObject.import items, recursive: true unless items.empty?
end
private
@@ -44,6 +45,7 @@ class Dspace::LearningObjectImporter
bitstreams = JSON.parse bitstreams if bitstreams.class == String
bitstreams.each do |bitstream|
learning_object.attachments.new ::Dspace::AttachmentMapper.call(bitstream)
+ ThumbnailGenerateWorker.perform_async(learning_object.attachments.last)
end
end
diff --git a/app/services/learning_object_publisher.rb b/app/services/learning_object_publisher.rb
index 5b455433..4d1b439e 100644
--- a/app/services/learning_object_publisher.rb
+++ b/app/services/learning_object_publisher.rb
@@ -51,7 +51,11 @@ class LearningObjectPublisher
learning_object.state = LearningObject.states[:published]
learning_object.published_at = Time.current
- ThumbnailGenerateWorker.perform_async learning_object.id, learning_object.link if learning_object.link?
+ if learning_object.link?
+ att = LearningObject::Attachment.new
+ ThumbnailGenerateWorker.perform_async(att.id, learning_object.link)
+ end
+ # ThumbnailGenerateWorker.perform_async learning_object.id, learning_object.link if learning_object.link?
learning_object.save
end
diff --git a/lib/tasks/import/learning_objects.rake b/lib/tasks/import/learning_objects.rake
index 0b9ae558..9b094708 100644
--- a/lib/tasks/import/learning_objects.rake
+++ b/lib/tasks/import/learning_objects.rake
@@ -17,9 +17,51 @@
# You should have received a copy of the GNU Affero General Public License
# along with portalmec. If not, see <http://www.gnu.org/licenses/>.
+require 'openssl'
+
namespace :import do
desc 'import learning objects from dspace'
+ task :sync_learning_objects => :environment do
+ desc 'Synchronize Learning Objects with DSpace Items'
+ OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
+ # IDEA: create DSpace collections once dspace_sets are updated
+ # and then search for items based on the collection id
+ # TODO: Deal with already existing item/LO
+ # TODO: Deal with deleted items
+ params = {
+ q: "search.resourcetype:2", # AND location.coll:4
+ fq: "dc.date.accessioned_dt:[NOW-1DAY TO NOW]",
+ wt: "json",
+ indent: "true"
+ }
+ uri = URI(DspaceService.link + "/solr/search/select")
+
+ users = User.joins(:roles).where(roles: {name: "partner"}).where.not(dspace_url: [nil, ""], dspace_handle: [nil, ""])
+ users.each do |user|
+ user_params = params
+ user_params[:q] += " AND handle: #{user.dspace_handle}/*"
+
+ uri.query = URI.encode_www_form(user_params)
+ response = JSON.parse(Net::HTTP.get(uri))
+ items = []
+ response["response"]["docs"].each do |doc|
+ item = dspace_client.items.find(
+ id: doc["search.resourceid"],
+ expand: "metadata,bitstreams,parentCollection"
+ )
+ if items.is_a? String
+ logger.warn "Received a string instead of item: #{item}"
+ next
+ end
+ items << item
+ end
+ importer = Dspace::LearningObjectImporter.new(items, user)
+ importer.import
+ end
+ end
+
task :learning_object, [:log] => [:environment] do |_t, args|
desc 'Importing Learning Objects from Dspace items'
--
GitLab