<% projects.each_with_index do |project, i| %>
+ <% cache [current_user, project] do %>
<%= render partial: "projects/index/project.html.erb", locals: { project: project } %>
+ <% end %>
<% if (i + 1) % 4 == 0 %>
diff --git a/db/migrate/20180417062042_create_datatables_reports.rb b/db/migrate/20180417062042_create_datatables_reports.rb
deleted file mode 100644
index 3edf73c65..000000000
--- a/db/migrate/20180417062042_create_datatables_reports.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class CreateDatatablesReports < ActiveRecord::Migration[5.1]
- def change
- create_view :datatables_reports, materialized: true
- add_index :datatables_reports, :id, unique: true
- add_index :datatables_reports, :team_id
- end
-end
diff --git a/db/migrate/20181212162649_remove_datatables_reports_view.rb b/db/migrate/20181212162649_remove_datatables_reports_view.rb
new file mode 100644
index 000000000..ebf119b41
--- /dev/null
+++ b/db/migrate/20181212162649_remove_datatables_reports_view.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveDatatablesReportsView < ActiveRecord::Migration[5.1]
+ def up
+ ActiveRecord::Base.connection.execute(
+ 'DROP MATERIALIZED VIEW IF EXISTS datatables_reports'
+ )
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5b0a2b409..ab055cf53 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20181008130519) do
+ActiveRecord::Schema.define(version: 20181212162649) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -1038,36 +1038,4 @@ ActiveRecord::Schema.define(version: 20181008130519) do
JOIN user_teams ON ((teams.id = user_teams.team_id)));
SQL
- create_view "datatables_reports", materialized: true, sql_definition: <<-SQL
- SELECT DISTINCT ON (reports.id) reports.id,
- reports.name,
- projects.name AS project_name,
- ( SELECT users.full_name
- FROM users
- WHERE (users.id = reports.user_id)) AS created_by,
- ( SELECT users.full_name
- FROM users
- WHERE (users.id = reports.last_modified_by_id)) AS last_modified_by,
- reports.created_at,
- reports.updated_at,
- projects.archived AS project_archived,
- projects.visibility AS project_visibility,
- projects.id AS project_id,
- reports.team_id,
- ARRAY( SELECT DISTINCT user_teams_1.user_id
- FROM user_teams user_teams_1
- WHERE (user_teams_1.team_id = teams.id)) AS users_with_team_read_permissions,
- ARRAY( SELECT DISTINCT user_projects_1.user_id
- FROM user_projects user_projects_1
- WHERE (user_projects_1.project_id = projects.id)) AS users_with_project_read_permissions
- FROM ((((reports
- JOIN projects ON ((projects.id = reports.project_id)))
- JOIN user_projects ON ((user_projects.project_id = projects.id)))
- JOIN teams ON ((teams.id = projects.team_id)))
- JOIN user_teams ON ((user_teams.team_id = teams.id)));
- SQL
-
- add_index "datatables_reports", ["id"], name: "index_datatables_reports_on_id", unique: true
- add_index "datatables_reports", ["team_id"], name: "index_datatables_reports_on_team_id"
-
end
diff --git a/db/views/datatables_reports_v01.sql b/db/views/datatables_reports_v01.sql
deleted file mode 100644
index 224c84403..000000000
--- a/db/views/datatables_reports_v01.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-SELECT DISTINCT ON (id)
- reports.id AS id,
- reports.name AS name,
- projects.name AS project_name,
- (
- SELECT users.full_name
- FROM users
- WHERE users.id = reports.user_id
- ) AS created_by,
- (
- SELECT users.full_name
- FROM users
- WHERE users.id = reports.last_modified_by_id
- ) AS last_modified_by,
- reports.created_at AS created_at,
- reports.updated_at AS updated_at,
- projects.archived AS project_archived,
- projects.visibility AS project_visibility,
- projects.id AS project_id,
- reports.team_id AS team_id,
- ARRAY(
- SELECT DISTINCT user_teams.user_id
- FROM user_teams
- WHERE user_teams.team_id = teams.id
- ) AS users_with_team_read_permissions,
- ARRAY(
- SELECT DISTINCT user_projects.user_id
- FROM user_projects
- WHERE user_projects.project_id = projects.id
- ) AS users_with_project_read_permissions
-FROM reports
-INNER JOIN projects
-ON projects.id = reports.project_id
-INNER JOIN user_projects
-ON user_projects.project_id = projects.id
-INNER JOIN teams
-ON teams.id = projects.team_id
-INNER JOIN user_teams
-ON user_teams.team_id = teams.id
diff --git a/spec/models/views/datatables/datatables_report_spec.rb b/spec/models/views/datatables/datatables_report_spec.rb
deleted file mode 100644
index 711420f24..000000000
--- a/spec/models/views/datatables/datatables_report_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Views::Datatables::DatatablesReport, type: :model do
- describe 'Database table' do
- it { should have_db_column :id }
- it { should have_db_column :name }
- it { should have_db_column :project_name }
- it { should have_db_column :created_by }
- it { should have_db_column :last_modified_by }
- it { should have_db_column :created_at }
- it { should have_db_column :updated_at }
- it { should have_db_column :project_archived }
- it { should have_db_column :project_visibility }
- it { should have_db_column :project_id }
- it { should have_db_column :team_id }
- it { should have_db_column :users_with_team_read_permissions }
- it { should have_db_column :users_with_project_read_permissions }
- end
-
- describe 'is readonly' do
- let(:team) { create :team }
- it do
- expect {
- Views::Datatables::DatatablesReport.create!(team: team)
- }.to raise_error(
- ActiveRecord::ReadOnlyRecord,
- 'Views::Datatables::DatatablesReport is marked as readonly'
- )
- end
- end
-
- describe '#tokenize/1' do
- it 'returns an array of permission items' do
- items = [[1, [1, 2]], [2, [3, 4]]]
- tokenized = described_class.send('tokenize', items)
- expect(tokenized.first).to have_attributes(report_id: 1,
- users_ids: [1, 2])
- expect(tokenized.last).to have_attributes(report_id: 2, users_ids: [3, 4])
- end
- end
-
- describe '#for_admin/3' do
- let!(:user) { create :user }
- let!(:user_two) { create :user, email: 'user.two@asdf.com' }
- let!(:team) { create :team }
- let!(:project) do
- create :project, created_by: user, last_modified_by: user, team: team
- end
- let!(:user_project) { create :user_project, project: project, user: user }
- let!(:team_two) { create :team }
- let!(:user_team) do
- create :user_team, team: team_two, user: user_two, role: 0
- end
- let!(:user_team) { create :user_team, team: team, user: user, role: 2 }
-
- let!(:project_two) do
- create :project, created_by: user_two,
- last_modified_by: user_two,
- team: team_two
- end
- let!(:report_one) do
- create :report, user: user,
- team: team,
- name: 'report one',
- project: project
- end
- let!(:report_two) do
- create :report, user: user,
- team: team_two,
- project: project_two,
- name: 'report two'
- end
-
- it 'returns the reports' do
- reports = team.datatables_reports.visible_by(user, team)
- expect(reports.length).to eq 1
- expect(reports.first.id).to eq report_one.id
- end
- end
-end