@@ -74,7 +74,7 @@ class Report < ActiveRecord::Base before_validation :set_source before_create :detect_location, :append_tags after_save :check_uniqueid - after_create :assign_tags, :assign_wait_time, :assign_filters + after_create :assign_tags, :assign_wait_time, :assign_filters, :auto_review named_scope :with_location, :conditions => 'location_id IS NOT NULL' named_scope :with_wait_time, :conditions => 'wait_time IS NOT NULL' @@ -87,7 +87,7 @@ class Report < ActiveRecord::Base named_scope( :unassigned, :limit => 10, :order => 'created_at DESC', - :conditions => 'reviewer_id IS NULL OR (assigned_at < UTC_TIMESTAMP - INTERVAL 10 MINUTE AND reviewed_at IS NULL)' + :conditions => 'reviewed_at IS NULL AND reviewer_id IS NULL OR assigned_at < UTC_TIMESTAMP - INTERVAL 10 MINUTE' ) do def assign(reviewer) # FIXME: can't we do this more efficiently? a la p-code: @@ -282,4 +282,11 @@ class Report < ActiveRecord::Base end true end + + def auto_review + if self.wait_time && self.location + self.reviewed_at = Time.now.utc + end + true + end end app/models/report.rb @@ -11,7 +11,7 @@ ActiveRecord::Schema.define(:version => 20081104035507) do - create_table "alert_viewings", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "alert_viewings", :force => true do |t| t.column "user_id", :integer t.column "reviewer_alert_id", :integer t.column "created_at", :datetime @@ -67,7 +67,7 @@ ActiveRecord::Schema.define(:version => 20081104035507) do add_index "locations", ["point"], :name => "index_locations_on_point", :spatial=> true - create_table "polling_places", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "polling_places", :force => true do |t| t.column "location_id", :integer t.column "name", :string, :limit => 80 t.column "address", :string, :limit => 80 @@ -86,7 +86,7 @@ ActiveRecord::Schema.define(:version => 20081104035507) do add_index "report_filters", ["report_id"], :name => "index_report_filters_on_report_id" add_index "report_filters", ["filter_id"], :name => "index_report_filters_on_filter_id" - create_table "report_tags", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "report_tags", :force => true do |t| t.column "report_id", :integer t.column "tag_id", :integer end @@ -94,7 +94,7 @@ ActiveRecord::Schema.define(:version => 20081104035507) do add_index "report_tags", ["report_id"], :name => "index_report_tags_on_report_id" add_index "report_tags", ["tag_id"], :name => "index_report_tags_on_tag_id" - create_table "reporters", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "reporters", :force => true do |t| t.column "location_id", :integer t.column "type", :string, :limit => 30 t.column "uniqueid", :string, :limit => 80 @@ -109,7 +109,7 @@ ActiveRecord::Schema.define(:version => 20081104035507) do add_index "reporters", ["uniqueid", "type"], :name => "index_reports_on_uniqueid_and_type", :unique => true - create_table "reports", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "reports", :force => true do |t| t.column "source", :string, :limit => 3 t.column "reporter_id", :integer t.column "location_id", :integer @@ -121,20 +121,20 @@ ActiveRecord::Schema.define(:version => 20081104035507) do t.column "polling_place_id", :integer t.column "created_at", :datetime t.column "updated_at", :datetime - t.column "rating", :integer - t.column "location_accuracy", :integer - t.column "has_audio", :boolean t.column "assigned_at", :datetime t.column "reviewed_at", :datetime t.column "reviewer_id", :integer t.column "dismissed_at", :datetime t.column "tag_s", :string + t.column "rating", :integer + t.column "location_accuracy", :integer + t.column "has_audio", :boolean end add_index "reports", ["created_at"], :name => "index_reports_on_created_at" add_index "reports", ["reviewer_id"], :name => "index_reports_on_reviewer_id" - create_table "reviewer_alerts", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "reviewer_alerts", :force => true do |t| t.column "text", :string t.column "user_id", :integer t.column "created_at", :datetime @@ -150,7 +150,7 @@ ActiveRecord::Schema.define(:version => 20081104035507) do t.column "decimal_value", :integer, :limit => 10 end - create_table "tags", :options=>'ENGINE=MyISAM', :force => true do |t| + create_table "tags", :force => true do |t| t.column "pattern", :string, :limit => 30 t.column "description", :string, :limit => 80 t.column "score", :integer @@ -181,13 +181,14 @@ ActiveRecord::Schema.define(:version => 20081104035507) do t.column "remember_token_expires_at", :datetime t.column "activation_code", :string, :limit => 40 t.column "activated_at", :datetime - t.column "is_admin", :boolean, :default => false t.column "is_terminated", :boolean, :default => false + t.column "is_admin", :boolean, :default => false t.column "reports_count", :integer, :default => 0 end add_index "users", ["api_key"], :name => "index_users_on_api_key", :unique => true add_index "users", ["email"], :name => "index_users_on_email", :unique => true add_index "users", ["type"], :name => "index_users_on_type" + add_index "users", ["reports_count"], :name => "index_users_on_reports_count" end db/schema.rb @@ -22,4 +22,4 @@ Looks like: Run hourly via cron and mail via: -0 * * * * mysql --table -u <USER> votereport_development < doc/hourly_statistics.sql | /bin/mail -s "TVR Hours Stats" monitors@twitter.votereport.com +0 * * * * mysql --table -u <USER> votereport_production < doc/hourly_statistics.sql | /bin/mail -s "TVR Hours Stats" <SOME LIST@twittervotereport.com> doc/README_FOR_HOURLY_STATS @@ -141,6 +141,13 @@ class ReportTest < ActiveSupport::TestCase assert_equal reports.size, Report.assigned(users(:quentin)).size end + def test_auto_review + new_report = @twitter_reporter.reports.create(:text => 'i got #early #reg #challenges #wait:10 some tags 11222') + assert_not_nil new_report.reviewed_at + reports = Report.unassigned + assert !reports.include?(new_report) + end + ########################## def create_report(text) test/unit/report_test.rb b07fa11dcb1b2879cb0087db63e6c1488e32ad8a Billy Gray wgray@zetetic.net http://github.com/davetroy/votereport/commit/7cbba86695129faee32f9775704ff7d39c50e5e1 7cbba86695129faee32f9775704ff7d39c50e5e1 2008-11-03T22:21:05-08:00 2008-11-03T22:21:05-08:00 - sets reports with a wait and a location as pre-approved - we may want to set the reviewer to some dummy/system user 60a695a4d4fbbb49885adb73bbc5334d3fdc695a Billy Gray wgray@zetetic.net