Fix strange bugs with scoping mongoid objects over different types of relations

Jared Pace
1 parent 95c2aa13
Showing 6 changed files with 15 additions and 10 deletions Show diff stats
app/controllers/errs_controller.rb
app/models/app.rb
app/models/user.rb
app/views/errs/_table.html.haml
public/stylesheets/application.css
spec/controllers/errs_controller_spec.rb
@@ -21,7 +21,7 @@ class ErrsController &lt; ApplicationController
   end
   def resolve
-    @err  = @app.errs.unresolved.find(params[:id])
+    @err  = @app.errs.find(params[:id])
     # Deal with bug in mogoid where find is returning an Enumberable obj
     @err = @err.first if @err.respond_to?(:first)
@@ -22,8 +22,7 @@ class App
   # Mongoid Bug: find(id) on association proxies returns an Enumerator
   def self.find_by_id!(app_id)
-    raise app_id.inspect
-    where(:id => app_id).first || raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))
+    where(:_id => app_id).first || raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))
   end
   def self.find_by_api_key!(key)
@@ -16,11 +16,14 @@ class User
   # Mongoid doesn't seem to currently support
   # referencing embedded documents
   def watchers
-    App.all.map(&:watchers).flatten.select {|w| w.user_id == id}
+    App.all.map(&:watchers).flatten.select {|w| w.user_id.to_s == id.to_s}
   end
   def apps
-    App.where('watchers.user_id' => id.to_s)
+    # This is completely wasteful but became necessary
+    # due to bugs in Mongoid 
+    app_ids = watchers.map {|w| w.app.id}
+    App.any_in(:_id => app_ids)
   end
   def watching?(app)
@@ -8,7 +8,7 @@
       %th Count
   %tbody
     - errs.each do |err|
-      %tr
+      %tr{:class => err.resolved? ? 'resolved' : 'unresolved'}
         %td.app
           = err.app.name
           %span.environment= err.environment
@@ -476,6 +476,11 @@ table.errs td.message em {
   color: #727272;
   font-size: 0.9em;
 }
+table.errs tr.resolved td > * {
+  opacity: 0.5;
+  -moz-opacity: 0.5;
+  -webkit-opacity: 0.5;
+}
 /* Notices Pagination */
 .notice-pagination {
@@ -123,15 +123,13 @@ describe ErrsController do
       @err = Factory(:err)
       App.stub(:find).with(@err.app.id).and_return(@err.app)
-      @err.app.errs.stub(:unresolved).
-        and_return(stub('proxy', :find => @err))
+      @err.app.errs.stub(:find).and_return(@err)
       @err.stub(:resolve!)
     end
     it 'finds the app and the err' do
       App.should_receive(:find).with(@err.app.id).and_return(@err.app)
-      @err.app.errs.should_receive(:unresolved).
-        and_return(mock('proxy', :find => @err))
+      @err.app.errs.should_receive(:find).and_return(@err)
       put :resolve, :app_id => @err.app.id, :id => @err.id
       assigns(:app).should == @err.app
       assigns(:err).should == @err
	@@ -21,7 +21,7 @@ class ErrsController < ApplicationController		@@ -21,7 +21,7 @@ class ErrsController < ApplicationController
21	end	21	end
22		22
23	def resolve	23	def resolve
24	- @err = @app.errs.unresolved.find(params[:id])	24	+ @err = @app.errs.find(params[:id])
25		25
26	# Deal with bug in mogoid where find is returning an Enumberable obj	26	# Deal with bug in mogoid where find is returning an Enumberable obj
27	@err = @err.first if @err.respond_to?(:first)	27	@err = @err.first if @err.respond_to?(:first)
	@@ -22,8 +22,7 @@ class App		@@ -22,8 +22,7 @@ class App
22		22
23	# Mongoid Bug: find(id) on association proxies returns an Enumerator	23	# Mongoid Bug: find(id) on association proxies returns an Enumerator
24	def self.find_by_id!(app_id)	24	def self.find_by_id!(app_id)
25	- raise app_id.inspect
26	- where(:id => app_id).first \|\| raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))	25	+ where(:_id => app_id).first \|\| raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))
27	end	26	end
28		27
29	def self.find_by_api_key!(key)	28	def self.find_by_api_key!(key)
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	%th Count	8	%th Count
9	%tbody	9	%tbody
10	- errs.each do \|err\|	10	- errs.each do \|err\|
11	- %tr	11	+ %tr{:class => err.resolved? ? 'resolved' : 'unresolved'}
12	%td.app	12	%td.app
13	= err.app.name	13	= err.app.name
14	%span.environment= err.environment	14	%span.environment= err.environment