Only update roles in Immediate Onboarding branch

Author: mwtrew

app/services/school_verification_service.rb

@@ -12,12 +12,16 @@ def verify(token: nil)
     School.transaction do
       school.verify!
 
-      creator_id = school.creator_id
-      Role.owner.find_or_create_by!(user_id: creator_id, school:)
-      Role.teacher.find_or_create_by!(user_id: creator_id, school:)
-
-      # TODO: Remove this line, once the feature flag is retired
-      success = FeatureFlags.immediate_school_onboarding? || SchoolOnboardingService.new(school).onboard(token: token)
+      if FeatureFlags.immediate_school_onboarding?
+        # For backwards compatibility with pre-Immediate Onboarding unverified schools, we need to create the roles
+        #  if they don't exist - this didn't happen at the time the school was created.
+        creator_id = school.creator_id
+        Role.owner.find_or_create_by!(user_id: creator_id, school:)
+        Role.teacher.find_or_create_by!(user_id: creator_id, school:)
+        success = true
+      else
+        success = SchoolOnboardingService.new(school).onboard(token: token)
+      end
 
       # TODO: Remove this line, once the feature flag is retired
       raise ActiveRecord::Rollback unless success