Merge pull request #215 from OpenDSA/master

Author: awhicks

app/models/odsa_module_progress.rb

@@ -50,30 +50,31 @@ def required_fields
   #~ Class methods ............................................................
 
   def self.get_progress(user_id, inst_chapter_module_id, inst_book_id, lis_outcome_service_url = nil, lis_result_sourcedid = nil, lms_access_id = nil)
-    module_progress = OdsaModuleProgress.find_or_create_by(user_id: user_id, inst_chapter_module_id: inst_chapter_module_id) do |mp|
-      mp.inst_book_id = inst_book_id
-    end
-    if lis_outcome_service_url.present?
+    module_progress = OdsaModuleProgress.find_or_initialize_by(user_id: user_id, inst_chapter_module_id: inst_chapter_module_id)
+    if module_progress.new_record?
+      module_progress.inst_book_id = inst_book_id
       module_progress.lis_outcome_service_url = lis_outcome_service_url
       module_progress.lis_result_sourcedid = lis_result_sourcedid
       module_progress.lms_access_id = lms_access_id
-      save_result = module_progress.save!
+      module_progress.save!
+    elsif lis_outcome_service_url.present? && module_progress.lis_outcome_service_url != lis_outcome_service_url
+      module_progress.lis_outcome_service_url = lis_outcome_service_url
+      module_progress.lis_result_sourcedid = lis_result_sourcedid
+      module_progress.lms_access_id = lms_access_id
+      module_progress.save!
     end
 
     module_progress
   end
 
   def self.get_standalone_progress(user_id, inst_module_version_id, lis_outcome_service_url = nil, lis_result_sourcedid = nil, lms_access_id = nil)
-    module_progress = OdsaModuleProgress.find_or_create_by(user_id: user_id, inst_module_version_id: inst_module_version_id)
-    if module_progress == nil
-      module_progress = OdsaModuleProgress.new(user_id: user_id, inst_module_version_id: inst_module_version_id)
-      unless lis_outcome_service_url == nil or lis_result_sourcedid == nil
-        module_progress.lis_outcome_service_url = lis_outcome_service_url
-        module_progress.lis_result_sourcedid = lis_result_sourcedid
-        module_progress.lms_access_id = lms_access_id
-      end
+    module_progress = OdsaModuleProgress.find_or_initialize_by(user_id: user_id, inst_module_version_id: inst_module_version_id)
+    if module_progress.new_record?
+      module_progress.lis_outcome_service_url = lis_outcome_service_url
+      module_progress.lis_result_sourcedid = lis_result_sourcedid
+      module_progress.lms_access_id = lms_access_id
       module_progress.save!
-    elsif (lis_outcome_service_url != nil and module_progress.lis_outcome_service_url == nil) or (lis_result_sourcedid != nil and module_progress.lis_result_sourcedid == nil) or (lms_access_id != nil and module_progress.lms_access_id == nil)
+    elsif lis_outcome_service_url.present? && module_progress.lis_outcome_service_url != lis_outcome_service_url
       module_progress.lis_outcome_service_url = lis_outcome_service_url
       module_progress.lis_result_sourcedid = lis_result_sourcedid
       module_progress.lms_access_id = lms_access_id
@@ -84,7 +85,6 @@ def self.get_standalone_progress(user_id, inst_module_version_id, lis_outcome_se
 
   #~ Instance methods .........................................................
   def update_proficiency(inst_exercise, force_send = false)
-    Rails.logger.info("--- ODSA_MODULE_PROGRESS: update_proficiency called for user #{self.user_id} ---")
     if self.inst_module_version_id
       # standalone module
       return update_standalone_proficiency(inst_exercise)
@@ -104,13 +104,14 @@ def update_proficiency(inst_exercise, force_send = false)
     # Comparing two floats.
     # Only send score to LMS if the score has increased, or previous
     # passback was not performed or unsuccessful
-    if force_send or
-      self.last_passback.nil? or
-      (self.inst_book && self.inst_book.last_compiled.nil?) or
-      (self.last_passback && self.inst_book && self.inst_book.last_compiled && (self.last_passback < self.inst_book.last_compiled)) or
-      self.highest_score > old_score
-      res = post_score_to_lms()
-    end
+    # if force_send or
+    #   self.last_passback.nil? or
+    #   (self.inst_book && self.inst_book.last_compiled.nil?) or
+    #   (self.last_passback && self.inst_book && self.inst_book.last_compiled && (self.last_passback < self.inst_book.last_compiled)) or
+    #   self.highest_score > old_score
+    #   res = post_score_to_lms()
+    # end
+    res = post_score_to_lms()
     self.save!
 
     last_exercise = false

lib/lti/outcomes.rb

@@ -8,14 +8,37 @@ def self.post_score_to_consumer(score, lis_outcome_service_url, lis_result_sourc
 
         tp = IMS::LTI::ToolProvider.new(consumer_key, consumer_secret, lti_param)
         tp.extend IMS::LTI::Extensions::OutcomeData::ToolProvider
-        res = tp.post_extended_replace_result!(score: score)
-        unless res.success?
-            error = Error.new(:class_name => 'post_replace_result_fail',
-                              :message => res.inspect,
-                              :params => self.as_json.to_json)
+        score_res = tp.post_read_result!
+        if score_res.success?
+            current_score = score_res.score
+            Rails.logger.info("LTI score read response: #{score_res.inspect}")
+            Rails.logger.info("LTI current score: #{current_score}, new score: #{score}")
+            if current_score.nil? || score > current_score.to_f
+                res = tp.post_extended_replace_result!(score: score)
+                unless res.success?
+                    error = Error.new(:class_name => 'post_replace_result_fail',
+                                    :message => res.inspect,
+                                    :params => {
+                                        score: score,
+                                        lis_outcome_service_url: lis_outcome_service_url,
+                                        lis_result_sourcedid: lis_result_sourcedid
+                                    }.to_json)
+                    error.save!
+                end
+                return res
+            else
+                return score_res
+            end
+        else
+            error = Error.new(:class_name => 'post_read_result_fail',
+                            :message => score_res.inspect,
+                            :params => {
+                                score: score,
+                                lis_outcome_service_url: lis_outcome_service_url,
+                                lis_result_sourcedid: lis_result_sourcedid
+                            }.to_json)
             error.save!
+            return score_res
         end
-        return res
     end
-
 end