Merge pull request #2022 from DFE-Digital/fix/require-openstruct-glob…

…ally

Play past OpenStruct loading issue with global 'require'

app/models/concerns/teamable.rb

@@ -26,9 +26,5 @@ module Teamable
     def regional_teams
       REGIONAL_TEAMS.values
     end
-
-    def user_teams
-      USER_TEAMS.values
-    end
   end
 end

app/models/user.rb

@@ -71,8 +71,7 @@ def add_new_project
   end
 
   def team_options
-    team_struct = Struct.new(:id, :name)
-    User.user_teams.map { |team| team_struct.new(team, I18n.t("user.teams.#{team}")) }
+    User.teams.keys.map { |team| OpenStruct.new(id: team, name: I18n.t("user.teams.#{team}")) }
   end
 
   private def apply_roles_based_on_team

config/application.rb

@@ -1,5 +1,7 @@
 require_relative "boot"
 
+require "ostruct"
+
 require "rails"
 # Pick the frameworks you want:
 require "active_model/railtie"