Merge pull request #74 from azul/refactor/finding-users

there's no need for User#find_by_param. clean it up

2 files changed, 1 insertions, 13 deletions

diff --git a/users/app/models/token.rb b/users/app/models/token.rb
index 514b97f..3de0059 100644
--- a/users/app/models/token.rb
+++ b/users/app/models/token.rb
@@ -2,14 +2,10 @@ class Token < CouchRest::Model::Base
 
   use_database :tokens
 
-  property :user_id, String, accessible: false
+  belongs_to :user
 
   validates :user_id, presence: true
 
-  def user
-    User.find(self.user_id)
-  end
-
   def initialize(*args)
     super
     self.id = SecureRandom.urlsafe_base64(32).gsub(/^_*/, '')
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index c1988f3..8874966 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -34,14 +34,6 @@ class User < CouchRest::Model::Base
     view :by_created_at
   end # end of design
 
-  class << self
-    alias_method :find_by_param, :find
-  end
-
-  def to_param
-    self.id
-  end
-
   def to_json(options={})
     {
       :login => login,