feed updater: do not fetch feeds for archived canteens

openmensa · Jul 2, 2015 · fd9d48e · fd9d48e
1 parent 213ad9b
commit fd9d48e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/open_mensa/update_feeds_task.rb b/lib/open_mensa/update_feeds_task.rb
@@ -11,8 +11,9 @@ def do
   end
 
   def fix_next_fetch_ats
-    changes = Feed.where { (schedule == nil) & (next_fetch_at != nil) }.update_all(next_fetch_at: nil)
-    Feed.where { (schedule != nil) & (next_fetch_at == nil) }.each do |feed|
+    disabled_feeds = Feed.joins { source.canteen }.where { source.canteen.state == 'archived' }.select(:id)
+    changes = Feed.where { ((schedule == nil) | id.in(disabled_feeds)) & (next_fetch_at != nil) }.update_all(next_fetch_at: nil)
+    Feed.where { (schedule != nil) & id.not_in(disabled_feeds) & (next_fetch_at == nil) }.each do |feed|
       feed.next_fetch_at = CronParser.new(feed.schedule).last
       feed.save!
       changes += 1

diff --git a/spec/lib/open_mensa/update_feeds_task_spec.rb b/spec/lib/open_mensa/update_feeds_task_spec.rb
@@ -117,5 +117,16 @@ def new_feed(attrs={})
 
       task.do
     end
+
+    it 'should only fetch active feeds/sources' do
+      feed = new_feed schedule: '*/15 8-9 * * *', next_fetch_at: _815
+      feed3 = new_feed schedule: '0 8-9 * * *', next_fetch_at: _834
+      feed3.canteen.update_attributes state: 'archived'
+
+      expect(OpenMensa::Updater).to receive(:new).with(feed, 'schedule').ordered.and_return(success_updater)
+      expect(OpenMensa::Updater).to_not receive(:new)
+
+      task.do
+    end
   end
 end