From e65cd3d99f3e18cd151fc35d16a01b66bf1a75fa Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 11 Sep 2013 10:25:46 -0700 Subject: [PATCH] Fixing premium interval in statistics. --- apps/rss_feeds/models.py | 7 +++++-- apps/rss_feeds/views.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index 06abb7f7d..45c18101f 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -1337,10 +1337,13 @@ class Feed(models.Model): # print 'New/updated story: %s' % (story), return story_in_system, story_has_changed - def get_next_scheduled_update(self, force=False, verbose=True): - if self.min_to_decay and not force: + def get_next_scheduled_update(self, force=False, verbose=True, premium_speed=False): + if self.min_to_decay and not force and not premium_speed: return self.min_to_decay + if premium_speed: + self.active_premium_subscribers += 1 + upd = self.stories_last_month / 30.0 subs = (self.active_premium_subscribers + ((self.active_subscribers - self.active_premium_subscribers) / 10.0)) diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index 8e68ed6f7..e168705ad 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -159,7 +159,8 @@ def load_feed_statistics(request, feed_id): original_premium_subscribers = feed.premium_subscribers feed.active_premium_subscribers = max(feed.active_premium_subscribers+1, 1) feed.premium_subscribers += 1 - premium_update_interval_minutes = feed.get_next_scheduled_update(force=True, verbose=False) + premium_update_interval_minutes = feed.get_next_scheduled_update(force=True, verbose=False, + premium_speed=True) feed.active_premium_subscribers = original_active_premium_subscribers feed.premium_subscribers = original_premium_subscribers stats['premium_update_interval_minutes'] = premium_update_interval_minutes