Merge pull request doubtfire-lms#466 from b0ink/fix/handle-allocate-import

Fix: handle allocate+ data user import

Author: macite

app/models/unit.rb

@@ -635,9 +635,17 @@ def import_users_from_csv(file)
     end
 
     # Check if these headers should be processed by institution file or from DF format
+    # Asking "Who will convert the users to the right format?"
+    # If these are "institution formatted"? then use import settings from institution settings
+    # Which contain:
+    #  - function to check if row is missing header values
+    #  - function to convert row to hash in the required format
+    #  - booleans for replacing tutorial/campus if different
     if Doubtfire::Application.config.institution_settings.are_headers_institution_users? csv.headers
+      logger.debug 'Importing users using institution\'s import settings'
       import_settings = Doubtfire::Application.config.institution_settings.user_import_settings_for(csv.headers)
     else
+      logger.debug 'Importing users using default import settings'
       if tutorial_streams.count > 0
         stream_names = tutorial_stream_abbr.map { |abbr| abbr.downcase }
       else
@@ -759,7 +767,17 @@ def sync_enrolment_with(enrolment_data, import_settings, result)
         if changes.key? username
           if row_data[:enrolled] # they should be enrolled - record that... overriding anything else
             # record previous row as ignored
-            ignored << { row: changes[username][:row], message: "Skipping duplicate role - ensuring enrolled" }
+            ignored_entry = { row: changes[username][:row], message: 'Skipping duplicate role - ensuring enrolled.' }
+
+            # Allocate+ csv data may have duplicate student rows for each tutorial enrolment
+            # We need to combine the tutorials from both rows so that the student is enrolled into each tutorial
+            if import_settings[:merge_tutorials_for_duplicate_students] && changes[username][:tutorials]&.any?
+                row_data[:tutorials] ||= []
+                row_data[:tutorials].concat(changes[username][:tutorials])
+                ignored_entry[:message] += ' Merged tutorial enrolments.'
+            end
+
+            ignored << ignored_entry
             changes[username] = row_data
           else
             # record this row as skipped