#{Faker::Lorem.paragraphs.join("
")}
", tag_list: Tag.all.sample(3).join(","), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.sample, terms_of_service: "1") - comment = Comment.create!(user: User.reorder("RANDOM()").first, + comment = Comment.create!(user: User.sample, body: Faker::Lorem.sentence, commentable: debate) diff --git a/db/dev_seeds/polls.rb b/db/dev_seeds/polls.rb index e26c99d7d..9813865dc 100644 --- a/db/dev_seeds/polls.rb +++ b/db/dev_seeds/polls.rb @@ -13,7 +13,7 @@ section "Creating polls" do starts_at: 5.days.ago, ends_at: 5.days.from_now, geozone_restricted: true, - geozones: Geozone.reorder("RANDOM()").limit(3)) + geozones: Geozone.sample(3)) Poll.create!(name: I18n.t("seeds.polls.recounting_poll"), slug: I18n.t("seeds.polls.recounting_poll").parameterize, diff --git a/db/dev_seeds/votes.rb b/db/dev_seeds/votes.rb index 357d2de59..749df9be8 100644 --- a/db/dev_seeds/votes.rb +++ b/db/dev_seeds/votes.rb @@ -1,5 +1,5 @@ section "Voting Debates, Proposals & Comments" do - not_org_users = User.where(["users.id NOT IN(?)", User.organizations.pluck(:id)]) + not_org_users = User.where.not(id: User.organizations) 100.times do voter = not_org_users.level_two_or_three_verified.all.sample vote = [true, false].sample diff --git a/db/migrate/20200519120717_rename_columns_with_slash_characters.rb b/db/migrate/20200519120717_rename_columns_with_slash_characters.rb new file mode 100644 index 000000000..0884c421a --- /dev/null +++ b/db/migrate/20200519120717_rename_columns_with_slash_characters.rb @@ -0,0 +1,9 @@ +class RenameColumnsWithSlashCharacters < ActiveRecord::Migration[5.1] + def change + change_table :tags do |t| + t.rename :"budget/investments_count", :budget_investments_count + t.rename :"legislation/proposals_count", :legislation_proposals_count + t.rename :"legislation/processes_count", :legislation_processes_count + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 57012aa3c..573774563 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: 20191108173350) do +ActiveRecord::Schema.define(version: 20200519120717) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1407,12 +1407,12 @@ ActiveRecord::Schema.define(version: 20191108173350) do t.integer "debates_count", default: 0 t.integer "proposals_count", default: 0 t.string "kind" - t.integer "budget/investments_count", default: 0 - t.integer "legislation/proposals_count", default: 0 - t.integer "legislation/processes_count", default: 0 + t.integer "budget_investments_count", default: 0 + t.integer "legislation_proposals_count", default: 0 + t.integer "legislation_processes_count", default: 0 t.index ["debates_count"], name: "index_tags_on_debates_count" - t.index ["legislation/processes_count"], name: "index_tags_on_legislation/processes_count" - t.index ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count" + t.index ["legislation_processes_count"], name: "index_tags_on_legislation_processes_count" + t.index ["legislation_proposals_count"], name: "index_tags_on_legislation_proposals_count" t.index ["name"], name: "index_tags_on_name", unique: true t.index ["proposals_count"], name: "index_tags_on_proposals_count" end diff --git a/lib/graph_ql/api_types_creator.rb b/lib/graph_ql/api_types_creator.rb index 823e430a8..3fbb3d704 100644 --- a/lib/graph_ql/api_types_creator.rb +++ b/lib/graph_ql/api_types_creator.rb @@ -10,7 +10,7 @@ module GraphQL string: GraphQL::STRING_TYPE }.freeze - def self.create(api_types_definitions) + def self.create created_types = {} api_types_definitions.each do |model, info| create_type(model, info[:fields], created_types) @@ -18,6 +18,10 @@ module GraphQL created_types end + def self.api_types_definitions + @api_types_definitions ||= parse_api_config_file(YAML.load_file(Rails.root.join("config/api.yml"))) + end + def self.type_kind(type) if SCALAR_TYPES[type] :scalar diff --git a/lib/tasks/budgets.rake b/lib/tasks/budgets.rake index 4efe30ee5..172944420 100644 --- a/lib/tasks/budgets.rake +++ b/lib/tasks/budgets.rake @@ -10,15 +10,4 @@ namespace :budgets do Budget.last.email_unselected end end - - desc "Update investments original_heading_id with current heading_id" - task set_original_heading_id: :environment do - ApplicationLogger.new.info "Setting original_heading_id to investments" - Budget::Investment.find_each do |investment| - unless investment.original_heading_id.present? - investment.update_column(:original_heading_id, investment.heading_id) - end - print "." - end - end end diff --git a/lib/tasks/consul.rake b/lib/tasks/consul.rake index 4116a8fd0..b831c59f4 100644 --- a/lib/tasks/consul.rake +++ b/lib/tasks/consul.rake @@ -1,13 +1,5 @@ namespace :consul do desc "Runs tasks needed to upgrade to the latest version" task execute_release_tasks: ["settings:rename_setting_keys", - "settings:add_new_settings", - "execute_release_1.1.0_tasks"] - - desc "Runs tasks needed to upgrade from 1.0.0 to 1.1.0" - task "execute_release_1.1.0_tasks": [ - "budgets:set_original_heading_id", - "migrations:valuation_taggings", - "migrations:budget_admins_and_valuators" - ] + "settings:add_new_settings"] end diff --git a/lib/tasks/local_census_records.rake b/lib/tasks/local_census_records.rake deleted file mode 100644 index 64ad7d383..000000000 --- a/lib/tasks/local_census_records.rake +++ /dev/null @@ -1,13 +0,0 @@ -namespace :local_census_records do - desc "Remove duplicated records from database" - task remove_duplicates: :environment do - ids = LocalCensusRecord.group(:document_type, :document_number).pluck("MIN(id) as id") - duplicates = LocalCensusRecord.count - ids.size - - if duplicates > 0 - ApplicationLogger.new.info "Removing local census records duplicates" - LocalCensusRecord.where("id NOT IN (?)", ids).destroy_all - ApplicationLogger.new.info "Removed #{duplicates} records." - end - end -end diff --git a/lib/tasks/migrations.rake b/lib/tasks/migrations.rake deleted file mode 100644 index f545b620e..000000000 --- a/lib/tasks/migrations.rake +++ /dev/null @@ -1,20 +0,0 @@ -namespace :migrations do - desc "Migrates context of valuation taggings" - task valuation_taggings: :environment do - ApplicationLogger.new.info "Updating valuation taggings context" - Tagging.where(context: "valuation").update_all(context: "valuation_tags") - end - - desc "Migrates budget staff" - task budget_admins_and_valuators: :environment do - ApplicationLogger.new.info "Updating budget administrators and valuators" - Budget.find_each do |budget| - investments = budget.investments.with_hidden - - budget.update!( - administrator_ids: investments.where.not(administrator: nil).distinct.pluck(:administrator_id), - valuator_ids: Budget::ValuatorAssignment.where(investment: investments).distinct.pluck(:valuator_id) - ) - end - end -end diff --git a/lib/tasks/secrets.rake b/lib/tasks/secrets.rake deleted file mode 100644 index 77c1d7344..000000000 --- a/lib/tasks/secrets.rake +++ /dev/null @@ -1,29 +0,0 @@ -namespace :secrets do - desc "Add SMTP, SSL and delay jobs settings to secrets.yml" - task smtp_ssl_and_delay_jobs: :environment do - current_settings = { - "mailer_delivery_method" => ActionMailer::Base.delivery_method, - "smtp_settings" => ActionMailer::Base.smtp_settings, - "force_ssl" => Rails.application.config.force_ssl, - "delay_jobs" => Delayed::Worker.delay_jobs - } - - settings_to_add = current_settings.select do |name, _| - Rails.application.secrets[name].nil? - end - - exit if settings_to_add.empty? - - secrets = Rails.application.config.paths["config/secrets"].first - stream = Psych.parse_stream(File.read(secrets)) - nodes = stream.children.first.children.first - - environment_index = nodes.children.index do |child| - child.is_a?(Psych::Nodes::Scalar) && child.value == Rails.env - end - - nodes.children[environment_index + 1].children.push(*Psych.parse(settings_to_add.to_yaml).children.first.children) - - File.open(secrets, "w") { |file| file.write stream.to_yaml } - end -end diff --git a/lib/user_segments.rb b/lib/user_segments.rb index ae6d345be..efa0d51a4 100644 --- a/lib/user_segments.rb +++ b/lib/user_segments.rb @@ -45,12 +45,9 @@ class UserSegments def self.not_supported_on_current_budget author_ids( - User.where( - "id NOT IN (SELECT DISTINCT(voter_id) FROM votes"\ - " WHERE votable_type = ? AND votes.votable_id IN (?))", - "Budget::Investment", - current_budget_investments.pluck(:id) - ) + User.where.not( + id: Vote.select(:voter_id).where(votable: current_budget_investments).distinct + ) ) end diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb index ed46a77b0..c8447055e 100644 --- a/spec/controllers/pages_controller_spec.rb +++ b/spec/controllers/pages_controller_spec.rb @@ -38,12 +38,12 @@ describe PagesController do describe "Not found pages" do it "returns a 404 message" do get :show, params: { id: "nonExistentPage" } - expect(response).to be_missing + expect(response).to be_not_found end it "returns a 404 message for a JavaScript request" do get :show, params: { id: "nonExistentJavaScript.js" } - expect(response).to be_missing + expect(response).to be_not_found end end end diff --git a/spec/lib/graph_ql/query_type_creator_spec.rb b/spec/lib/graph_ql/query_type_creator_spec.rb index 7a56666d0..36d671c5c 100644 --- a/spec/lib/graph_ql/query_type_creator_spec.rb +++ b/spec/lib/graph_ql/query_type_creator_spec.rb @@ -1,13 +1,15 @@ require "rails_helper" describe GraphQL::QueryTypeCreator do - let(:api_type_definitions) do - { - ProposalNotification => { fields: { title: :string }}, - Proposal => { fields: { id: :integer, title: :string }} - } + before do + allow(GraphQL::ApiTypesCreator).to receive(:api_types_definitions).and_return( + { + ProposalNotification => { fields: { title: :string }}, + Proposal => { fields: { id: :integer, title: :string }} + } + ) end - let(:api_types) { GraphQL::ApiTypesCreator.create(api_type_definitions) } + let(:api_types) { GraphQL::ApiTypesCreator.create } describe "::create" do let(:query_type) { GraphQL::QueryTypeCreator.create(api_types) } diff --git a/spec/lib/graphql_spec.rb b/spec/lib/graphql_spec.rb index 1a2efcce8..0675c0a66 100644 --- a/spec/lib/graphql_spec.rb +++ b/spec/lib/graphql_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -api_types = GraphQL::ApiTypesCreator.create(GraphqlController::API_TYPE_DEFINITIONS) +api_types = GraphQL::ApiTypesCreator.create query_type = GraphQL::QueryTypeCreator.create(api_types) ConsulSchema = GraphQL::Schema.define do query query_type diff --git a/spec/lib/tasks/budgets_spec.rb b/spec/lib/tasks/budgets_spec.rb deleted file mode 100644 index f1cd161a6..000000000 --- a/spec/lib/tasks/budgets_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "rails_helper" - -describe Budget do - let(:run_rake_task) do - Rake::Task["budgets:set_original_heading_id"].reenable - Rake.application.invoke_task("budgets:set_original_heading_id") - end - - it "sets attribute original_heading_id for existing investments" do - heading = create(:budget_heading) - investment = create(:budget_investment, heading: heading) - investment.update!(original_heading_id: nil) - - expect(investment.original_heading_id).to equal(nil) - - run_rake_task - investment.reload - - expect(investment.original_heading_id).to equal(heading.id) - end - - it "does not overwrite original_heading_id when already present" do - original_heading = create(:budget_heading) - new_heading = create(:budget_heading) - investment = create(:budget_investment, heading: original_heading) - investment.update!(heading: new_heading) - - expect(investment.original_heading_id).to eq original_heading.id - - run_rake_task - investment.reload - - expect(investment.original_heading_id).to eq original_heading.id - end -end diff --git a/spec/lib/tasks/local_census_records_spec.rb b/spec/lib/tasks/local_census_records_spec.rb deleted file mode 100644 index cb0e3c00c..000000000 --- a/spec/lib/tasks/local_census_records_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -require "rails_helper" -require Rails.root.join("db", "migrate", "20190530082138_add_unique_index_to_local_census_records") - -describe "LocalCensusRecord tasks" do - let(:run_rake_task) do - Rake::Task["local_census_records:remove_duplicates"].reenable - Rake.application.invoke_task("local_census_records:remove_duplicates") - end - - describe "#remove_duplicates" do - around do |example| - ActiveRecord::Migration.suppress_messages do - example.run - end - end - - before { AddUniqueIndexToLocalCensusRecords.new.down } - after { AddUniqueIndexToLocalCensusRecords.new.up } - - it "Remove all duplicates keeping older records" do - record1 = create(:local_census_record, document_type: "1", document_number: "#DOCUMENT_NUMBER") - record2 = create(:local_census_record, document_type: "2", document_number: "#DOCUMENT_NUMBER") - dup_record1 = build(:local_census_record, document_type: "1", document_number: "#DOCUMENT_NUMBER") - dup_record1.save!(validate: false) - dup_record2 = build(:local_census_record, document_type: "2", document_number: "#DOCUMENT_NUMBER") - dup_record2.save!(validate: false) - record3 = create(:local_census_record, document_type: "3", document_number: "#DOCUMENT_NUMBER") - - expect(LocalCensusRecord.count).to eq(5) - - run_rake_task - - expect(LocalCensusRecord.all).to match_array([record1, record2, record3]) - end - end -end diff --git a/spec/lib/tasks/migrations_spec.rb b/spec/lib/tasks/migrations_spec.rb deleted file mode 100644 index 6e375e50e..000000000 --- a/spec/lib/tasks/migrations_spec.rb +++ /dev/null @@ -1,68 +0,0 @@ -require "rails_helper" - -describe "Migration tasks" do - describe "valuation_taggins" do - let(:run_rake_task) do - Rake::Task["migrations:valuation_taggings"].reenable - Rake.application.invoke_task("migrations:valuation_taggings") - end - - it "updates taggings" do - valuation_tagging = create(:tagging, context: "valuation") - another_valuation_tagging = create(:tagging, context: "valuation") - valuation_tags_tagging = create(:tagging, context: "valuation_tags") - tags_tagging = create(:tagging) - - run_rake_task - - expect(valuation_tagging.reload.context).to eq "valuation_tags" - expect(another_valuation_tagging.reload.context).to eq "valuation_tags" - expect(valuation_tags_tagging.reload.context).to eq "valuation_tags" - expect(tags_tagging.reload.context).to eq "tags" - end - end - - describe "budget_admins_and_valuators" do - let(:run_rake_task) do - Rake::Task["migrations:budget_admins_and_valuators"].reenable - Rake.application.invoke_task("migrations:budget_admins_and_valuators") - end - - let(:old_budget) { create(:budget) } - let(:current_budget) { create(:budget) } - - it "assigns administrators from existing investments" do - harold = create(:administrator) - john = create(:administrator) - root = create(:administrator) - - create(:budget_investment, budget: old_budget, administrator: john) - create(:budget_investment, budget: old_budget, administrator: harold) - create(:budget_investment, budget: old_budget, administrator: nil) - - create(:budget_investment, budget: current_budget, administrator: root) - - run_rake_task - - expect(old_budget.administrators).to match_array [john, harold] - expect(current_budget.administrators).to match_array [root] - end - - it "assigns valuators from existing investments" do - tyrion = create(:valuator) - cersei = create(:valuator) - jaime = create(:valuator) - - create(:budget_investment, budget: old_budget, valuators: [cersei]) - create(:budget_investment, budget: old_budget, valuators: [jaime, cersei]) - create(:budget_investment, budget: old_budget, valuators: []) - - create(:budget_investment, budget: current_budget, valuators: [tyrion, jaime]) - - run_rake_task - - expect(old_budget.valuators).to match_array [cersei, jaime] - expect(current_budget.valuators).to match_array [tyrion, jaime] - end - end -end diff --git a/spec/models/community_spec.rb b/spec/models/community_spec.rb index 7354bc717..072e0cb36 100644 --- a/spec/models/community_spec.rb +++ b/spec/models/community_spec.rb @@ -13,11 +13,13 @@ RSpec.describe Community, type: :model do community = proposal.community user1 = create(:user) user2 = create(:user) + user3 = create(:user) topic1 = create(:topic, community: community, author: user1) create(:comment, commentable: topic1, author: user1) create(:comment, commentable: topic1, author: user2) create(:topic, community: community, author: user2) + create(:comment, commentable: proposal, author: user3) expect(community.participants).to match_array [user1, user2, proposal.author] end