diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/organisation.rb | 8 | ||||
| -rw-r--r-- | app/models/user.rb | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/models/organisation.rb b/app/models/organisation.rb index c219bcbc9..9d6e92825 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -21,12 +21,4 @@ class Organisation < ActiveRecord::Base def add_rule_parameter_set RuleParameterSet.default_for_all_modes( self).save end - - def self.sync_or_create code:, name: - find_or_create_by(code: code) do |org| - org.name = name - org.code = code - org.synced_at = Time.now - end - end end diff --git a/app/models/user.rb b/app/models/user.rb index a8b8a01a0..3233b5efb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -32,7 +32,11 @@ class User < ActiveRecord::Base extra = extra_attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} self.name = extra[:full_name] self.email = extra[:email] - self.organisation = Organisation.sync_or_create code: extra[:organisation_code], name: extra[:organisation_name] + + self.organisation = Organisation.find_or_create_by(code: extra[:organisation_code]).tap do |org| + org.name = extra[:organisation_name] + org.synced_at = Time.now + end end private |