Returning created attachment in the end of a file upload

Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>

app/controllers/v1/learning_objects/chunks_controller.rb

@@ -13,14 +13,11 @@ class V1::LearningObjects::ChunksController < ApplicationController
 
     if last_chunk?
       combine_file!
-      post_file!
-
-      # TODO render new attachment ID
-      render  status: 200
-      return
+      attachment = post_file!
+      render attachment, status: 200
+    else
+      render status: 200
     end
-
-    render status: 200
   rescue
     render status: 500
   end
@@ -34,17 +31,7 @@ class V1::LearningObjects::ChunksController < ApplicationController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def chunks_params
-    params.permit(
-			:id,
-			:file,
-			:_chunkNumber,
-			:_totalChunks,
-			:_chunkFilename,
-			:_chunkIdentifier,
-			:_chunkSize,
-			:_currentChunkSize,
-			:_totalSize
-		)
+    params.permit(:id, :file, :_chunkNumber, :_totalChunks, :_chunkFilename, :_chunkIdentifier, :_chunkSize, :_currentChunkSize, :_totalSize)
   end
 
   def post_file!

app/services/learning_object_publisher.rb

@@ -20,7 +20,9 @@ class LearningObjectPublisher
 
   # post *media_path* to *learning_object* on dspace
   def upload(learning_object, media_path)
-    DspaceUploadWorker.perform_async learning_object.id, media_path, learning_object.description
+    attachment = learning_object.attachments.create(name: File.basename(media_path))
+    DspaceUploadWorker.perform_async(learning_object.id, media_path, attachment.id, learning_object.description)
+    attachment
   end
 
   ## publish *learning_object*
@@ -29,7 +31,7 @@ class LearningObjectPublisher
     return true if learning_object.published?
 
     learning_object.state = LearningObject.states[:published]
-    learning_object.published_at = Time.now
+    learning_object.published_at = Time.current
     ThumbnailGenerateWorker.perform_async learning_object.id, learning_object.link if learning_object.link?
     learning_object.save
   end

app/workers/dspace_upload_worker.rb

+require_dependency 'dspace'
+
 class DspaceUploadWorker
   include Sidekiq::Worker
 
   @@dspace = nil
 
-  def perform(learning_object_id, media_path, description = nil)
+  def perform(learning_object_id, media_path, attachment_id = nil, description = nil)
     # find learning object
     learning_object = LearningObject.find learning_object_id
 
@@ -12,13 +14,24 @@ class DspaceUploadWorker
     # create attachment
     file = File.new(media_path, 'r')
     bitstream = dspace.items.add_bitstream(file, id: learning_object.id_dspace, name: File.basename(media_path), description: description)
-    attachment = learning_object.attachments.create map_bitstream2attachment(bitstream)
+    attachment = create_attachment(learning_object, bitstream, attachment_id)
 
     ThumbnailGenerateWorker.perform_async attachment.id, media_path
   end
 
   private
 
+  def create_attachment(learning_object, bitstream, attachment_id = nil)
+    unless attachment_id.nil?
+      attachment = learning_object.attachments.find(attachment_id)
+      unless attachment.nil?
+        attachment.update(map_bitstream2attachment(bitstream))
+        return attachment
+      end
+    end
+    learning_object.attachments.create map_bitstream2attachment(bitstream)
+  end
+
   def publisher
     @publisher ||= LearningObjectPublisher.new(dspace)
   end