From d5293c2e1d64e9e29376f2f71608b92c50787779 Mon Sep 17 00:00:00 2001 From: admin1 Date: Fri, 10 Jul 2020 09:33:13 -0400 Subject: [PATCH 1/4] added pro_users_feed_matview --- ...10130615_add_pro_users_feed_materialized_view.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb diff --git a/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb b/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb new file mode 100644 index 00000000..a50ae461 --- /dev/null +++ b/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb @@ -0,0 +1,13 @@ +class AddProUsersFeedMaterializedView < ActiveRecord::Migration[5.2] + def change + execute <<-SQL + CREATE MATERIALIZED VIEW pro_feed_users_matview AS + SELECT id + FROM accounts + WHERE accounts.is_investor=true + OR accounts.is_donor=true + OR accounts.is_verified=true + OR accounts.is_pro=true + SQL + end +end From 02c71b8af982205910575312f659807b3a6e9640 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 10 Jul 2020 13:38:10 +0000 Subject: [PATCH 2/4] Update 20200710130615_add_pro_users_feed_materialized_view.rb --- ...15_add_pro_users_feed_materialized_view.rb | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb b/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb index a50ae461..19dfc3b3 100644 --- a/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb +++ b/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb @@ -1,13 +1,15 @@ class AddProUsersFeedMaterializedView < ActiveRecord::Migration[5.2] def change - execute <<-SQL - CREATE MATERIALIZED VIEW pro_feed_users_matview AS - SELECT id - FROM accounts - WHERE accounts.is_investor=true - OR accounts.is_donor=true - OR accounts.is_verified=true - OR accounts.is_pro=true - SQL + safety_assured { + execute <<-SQL + CREATE MATERIALIZED VIEW pro_feed_users_matview AS + SELECT id + FROM accounts + WHERE accounts.is_investor=true + OR accounts.is_donor=true + OR accounts.is_verified=true + OR accounts.is_pro=true + SQL + } end end From 5b22f7eda7eea5552cfcf9d2ca696adef88a79cf Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 10 Jul 2020 13:45:25 +0000 Subject: [PATCH 3/4] Update db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb --- .../20200710130615_add_pro_users_feed_materialized_view.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb b/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb index 19dfc3b3..f0a7fa80 100644 --- a/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb +++ b/db/migrate/20200710130615_add_pro_users_feed_materialized_view.rb @@ -9,7 +9,7 @@ class AddProUsersFeedMaterializedView < ActiveRecord::Migration[5.2] OR accounts.is_donor=true OR accounts.is_verified=true OR accounts.is_pro=true - SQL + SQL } end end From b37597e1788aade909b95b29817f413136d45406 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 10 Jul 2020 14:29:51 +0000 Subject: [PATCH 4/4] Update status.rb --- app/models/status.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index d426cb83..6bec408d 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -342,12 +342,12 @@ class Status < ApplicationRecord end def as_pro_timeline(account = nil) - query = timeline_scope.without_replies.popular_accounts.where('statuses.created_at > ?', 2.hours.ago) + query = timeline_scope.without_replies.popular_accounts.where('statuses.updated_at > ?', 2.hours.ago) apply_timeline_filters(query, account) end def as_public_timeline(account = nil) - query = timeline_scope.without_replies.where('statuses.created_at > ?', 15.minutes.ago) + query = timeline_scope.without_replies.where('statuses.updated_at > ?', 15.minutes.ago) apply_timeline_filters(query, account) end