check outcome url

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
+      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
-      save_result = module_progress.save!
+      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)