Merge branch '746-fix-ols-curation-n-collection-messaging' into 'development'

Resolve "fix ols curation n collection messaging"

Closes #746

See merge request ComPlat/chemotion_ELN!977

Gemfile.lock

@@ -310,7 +310,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashdiff (0.3.9)
+    hashdiff (1.0.0)
     hashie (3.6.0)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
@@ -431,7 +431,7 @@ GEM
     prawn-svg (0.29.1)
       css_parser (~> 1.6)
       prawn (>= 0.11.1, < 3)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     pundit (2.0.1)
       activesupport (>= 3.0.0)
     rack (1.6.11)
@@ -612,7 +612,7 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webmock (3.5.1)
+    webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

app/jobs/move_to_collection_job.rb

@@ -50,7 +50,8 @@ class MoveToCollectionJob < ActiveJob::Base
       error_reactions = reactions.select{ |o| o[:state] != MoveToCollectionJob::STATE_MOVED }
 
       if error_samples&.count > 0 || error_reactions&.count > 0
-      raise "Jobs are not completed!! "+ moresamples.inspect + error_reactions&.to_json + error_samples&.to_json
+        raise "Jobs are not completed!! "+ moresamples.inspect + error_reactions&.to_json + error_samples&.to_json
+      end
     ensure
       comment =  'operation completed'
       comment =  'Some samples were not transferred, please sync. again.' if moresamples&.count > 0

db/migrate/20190712090136_curate_profile_recent_owl.rb

@@ -2,6 +2,7 @@ class CurateProfileRecentOwl < ActiveRecord::Migration
   def change
     Profile.find_each do |profile|
       data = profile.data
+      next unless data
       # break unless defined? OlsTerm
       %w[chmo rxno].each do |owl_name|
         next unless data[owl_name].present?
@@ -12,6 +13,7 @@ class CurateProfileRecentOwl < ActiveRecord::Migration
             next
           end
           t = OlsTerm.find_by(term_id: term)
+	  next unless t
           new_term = {
             'owl_name' => owl_name,
             'term_id' => term,

lib/reporter/worker.rb

@@ -60,7 +60,7 @@ module Reporter
 
       message = Message.create_msg_notification(
         channel_subject: Channel::REPORT_GENERATOR_NOTIFICATION,
-        data_args: { report_name: @full_filename}, message_to: @author.id,
+        data_args: { report_name: @full_filename}, message_from: @author.id,
         report_id: @report.id
       )