@@ -5,8 +5,8 @@ class Channel include DataMapper::Resource property :id, Integer, :serial => true - property :server, String, :nullable => false - property :name, String, :nullable => false + property :server, String, :key => true + property :name, String, :key => true has n, :scores leaves/scorekeeper/models/channel.rb @@ -4,8 +4,8 @@ class Person include DataMapper::Resource property :id, Integer, :serial => true - property :server, String, :nullable => false - property :name, String, :nullable => false + property :server, String, :nullable => false, :unique_index => :server_and_name + property :name, String, :nullable => false, :unique_index => :server_and_name property :authorized, Boolean, :nullable => false, :default => true has n, :scores, :child_key => [ :receiver_id ] leaves/scorekeeper/models/person.rb @@ -5,7 +5,8 @@ class Pseudonym include DataMapper::Resource property :id, Integer, :serial => true - property :name, String, :nullable => false + property :name, String, :nullable => false, :index => true + property :person_id, Integer, :nullable => false, :index => true belongs_to :person end leaves/scorekeeper/models/pseudonym.rb @@ -4,14 +4,19 @@ class Score include DataMapper::Resource property :id, Integer, :serial => true + property :giver_id, Integer, :nullable => false, :index => :giver_and_receiver + property :receiver_id, Integer, :nullable => false, :index => :giver_and_receiver + property :channel_id, Integer, :nullable => false, :index => true property :change, Integer, :nullable => false, :default => 0 property :note, String - property :created_at, DateTime + timestamps :created_at belongs_to :giver, :class_name => 'Person', :child_key => [ :giver_id ] belongs_to :receiver, :class_name => 'Person', :child_key => [ :receiver_id ] belongs_to :channel + validates_with_method :cant_give_scores_to_self + # Returns scores given to a Person. def self.given_to(people) @@ -39,4 +44,14 @@ class Score def self.newest_first all(:order => [ :created_at.desc ]) end + + private + + def cant_give_scores_to_self + if giver_id == receiver_id then + [ false, "You can't change your own score." ] + else + true + end + end end leaves/scorekeeper/models/score.rb 0135a6f466b8b87c12b68fc4d72f9a7217fbb00c Tim Morgan riscfuture@gmail.com http://github.com/RISCfuture/autumn/commit/48833e91de53ff927180fd2f74457d8123dc0855 48833e91de53ff927180fd2f74457d8123dc0855 2009-06-12T02:47:28-07:00 2009-06-12T02:47:28-07:00 Schema improvements for Scorekeeper aac8d5557ebcb8c75304f980b9f5bc48ddc62739 Tim Morgan riscfuture@gmail.com