Merge pull request #2083 from NCCE/2788/primary-users-completing-cour…

…se-not-all-auto-enrolled

Trying to resolve issues around auto-enrolment

app/jobs/achiever/fetch_users_completed_courses_from_achiever_job.rb

@@ -14,11 +14,20 @@ def perform(user)
 
         case course.attendance_status
         when "attended"
-          any_marked_as_attended = true
-
-          achievement.complete!
+          begin
+            achievement.complete!
+            any_marked_as_attended = true
+          rescue Statesman::TransitionConflictError => e
+            Sentry.set_tags(achievement_id: achievement.id, user_id: user_id)
+            Sentry.capture_exception(e)
+          end
         when "cancelled"
-          achievement.drop!
+          begin
+            achievement.drop!
+          rescue Statesman::TransitionConflictError => e
+            Sentry.set_tags(achievement_id: achievement.id, user_id: user_id)
+            Sentry.capture_exception(e)
+          end
         end
       end
 

spec/jobs/achiever/fetch_users_completed_courses_from_achiever_job_spec.rb

@@ -28,6 +28,11 @@
         expect(CertificatePendingTransitionJob).to have_been_enqueued.exactly(:once)
       end
 
+      it "queues AutoEnrolJob" do
+        perform_job
+        expect(AutoEnrolJob).to have_been_enqueued.exactly(:once)
+      end
+
       it "creates an achievement that belongs to the right activity" do
         perform_job
         expect(Achievement.where(activity_id: activity_one.id).exists?).to eq true