decidim-core 0.23.3 → 0.24.0.rc1

data/db/migrate/20180206143340_fix_reference_for_all_resources.rb

@@ -5,6 +5,8 @@ class FixReferenceForAllResources < ActiveRecord::Migration[5.1]
     models = ActiveRecord::Base.descendants.select { |c| c.included_modules.include?(Decidim::HasReference) }
 
     models.each do |model|
+      next unless model.table_exists?
+
       model.find_each(&:touch)
     end
   end

data/db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb

@@ -2,7 +2,7 @@
 
 class RenameMaximumVotesPerProposalToThresholdPerProposal < ActiveRecord::Migration[5.1]
   def up
-    execute <<~SQL
+    execute <<~SQL.squish
       UPDATE decidim_components
       SET settings = jsonb_set(
         settings::jsonb,
@@ -14,7 +14,7 @@ class RenameMaximumVotesPerProposalToThresholdPerProposal < ActiveRecord::Migrat
   end
 
   def down
-    execute <<~SQL
+    execute <<~SQL.squish
       UPDATE decidim_components
       SET settings = jsonb_set(
         settings::jsonb,

data/db/migrate/20200929171508_remove_show_statistics_from_organizations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveShowStatisticsFromOrganizations < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_organizations, :show_statistics
+  end
+end

data/db/migrate/20201010124755_create_decidim_user_moderations.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateDecidimUserModerations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_user_moderations do |t|
+      t.belongs_to :decidim_user, foreign_key: true
+      t.integer :report_count, default: 0, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201010124756_create_decidim_user_reports.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateDecidimUserReports < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_user_reports do |t|
+      t.integer :user_moderation_id, foreign_key: true
+      t.integer :user_id, null: false
+      t.string :reason
+      t.text :details
+
+      t.timestamps
+    end
+    add_foreign_key :decidim_user_reports, :decidim_user_moderations, column: :user_moderation_id
+    add_foreign_key :decidim_user_reports, :decidim_users, column: :user_id
+  end
+end

data/db/migrate/20201010224433_add_suspension_fields_to_decidim_users.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddSuspensionFieldsToDecidimUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :suspended, :boolean, default: false, null: false
+    add_column :decidim_users, :suspended_at, :datetime
+  end
+end

data/db/migrate/20201011074641_create_decidim_user_suspensions.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateDecidimUserSuspensions < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_user_suspensions do |t|
+      t.belongs_to :decidim_user, foreign_key: true
+      t.integer :suspending_user_id
+      t.text :justification
+
+      t.timestamps
+    end
+    add_foreign_key :decidim_user_suspensions, :decidim_users, column: :suspending_user_id
+  end
+end

data/db/migrate/20201011081626_add_current_suspension_id_to_decidim_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCurrentSuspensionIdToDecidimUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :suspension_id, :integer
+  end
+end

data/db/migrate/20201013071533_add_reported_content_to_moderations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReportedContentToModerations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_moderations, :reported_content, :text
+  end
+end

data/db/migrate/20201019074554_add_locale_to_moderation_reports.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLocaleToModerationReports < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_reports, :locale, :string
+  end
+end

data/db/migrate/20201127114444_encrypt_authorization_metadatas.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class EncryptAuthorizationMetadatas < ActiveRecord::Migration[5.2]
+  def up
+    Decidim::Authorization.all.each do |auth|
+      # Re-setting these values will internally convert the hash values to
+      # encypted values
+      auth.update!(
+        metadata: auth.metadata,
+        verification_metadata: auth.verification_metadata
+      )
+    end
+  end
+
+  def down
+    Decidim::Authorization.all.each do |auth|
+      # rubocop:disable Rails/SkipsModelValidations
+      auth.update_columns(
+        metadata: decrypt_hash(auth.metadata),
+        verification_metadata: decrypt_hash(auth.verification_metadata)
+      )
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+  end
+
+  private
+
+  def decrypt_hash(hash)
+    hash.transform_values do |value|
+      ActiveSupport::JSON.decode(Decidim::AttributeEncryptor.decrypt(value))
+    rescue ActiveSupport::MessageEncryptor::InvalidMessage
+      value
+    end
+  end
+end

data/db/migrate/20201128130723_add_allow_public_access_to_static_pages.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddAllowPublicAccessToStaticPages < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_static_pages, :allow_public_access, :boolean, null: false, default: false
+
+    reversible do |direction|
+      direction.up do
+        # rubocop:disable Rails/SkipsModelValidations
+        Decidim::StaticPage.where(slug: "terms-and-conditions").update_all(
+          allow_public_access: true
+        )
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end

data/db/migrate/20201218144706_update_table_block_user_functionality.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class UpdateTableBlockUserFunctionality < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :decidim_user_suspensions, :suspending_user_id, :blocking_user_id
+    rename_table :decidim_user_suspensions, :decidim_user_blocks
+  end
+end

data/db/migrate/20201218145252_rename_decidim_user_fields_for_block_functionality.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RenameDecidimUserFieldsForBlockFunctionality < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :decidim_users, :suspended, :blocked
+    rename_column :decidim_users, :suspended_at, :blocked_at
+    rename_column :decidim_users, :suspension_id, :block_id
+  end
+end

data/db/migrate/20210208134328_add_email_on_moderations_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEmailOnModerationsToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :email_on_moderations, :boolean, default: true
+  end
+end

data/db/seeds.rb

@@ -4,6 +4,7 @@ if !Rails.env.production? || ENV["SEED"]
   print "Creating seeds for decidim-core...\n" unless Rails.env.test?
 
   require "decidim/faker/localized"
+  require "decidim/faker/internet"
 
   seeds_root = File.join(__dir__, "seeds")
 
@@ -16,8 +17,8 @@ if !Rails.env.production? || ENV["SEED"]
     table.tr("_", "/").classify.safe_constantize
   end.compact.each(&:reset_column_information)
 
-  smtp_label = Faker::Twitter.unique.screen_name
-  smtp_email = Faker::Internet.email
+  smtp_label = ENV["SMTP_FROM_LABEL"] || Faker::Twitter.unique.screen_name
+  smtp_email = ENV["SMTP_FROM_EMAIL"] || Faker::Internet.email
 
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
@@ -30,14 +31,14 @@ if !Rails.env.production? || ENV["SEED"]
       from: "#{smtp_label} <#{smtp_email}>",
       from_email: smtp_email,
       from_label: smtp_label,
-      user_name: Faker::Twitter.unique.screen_name,
-      encrypted_password: Decidim::AttributeEncryptor.encrypt(Faker::Internet.password(8)),
-      address: ENV["DECIDIM_HOST"] || "localhost",
-      port: ENV["DECIDIM_SMTP_PORT"] || "25"
+      user_name: ENV["SMTP_USERNAME"] || Faker::Twitter.unique.screen_name,
+      encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV["SMTP_PASSWORD"] || Faker::Internet.password(min_length: 8)),
+      address: ENV["SMTP_ADDRESS"] || ENV["DECIDIM_HOST"] || "localhost",
+      port: ENV["SMTP_PORT"] || ENV["DECIDIM_SMTP_PORT"] || "25"
     },
     host: ENV["DECIDIM_HOST"] || "localhost",
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.sentence(15)
+      Decidim::Faker::Localized.sentence(word_count: 15)
     end,
     default_locale: Decidim.default_locale,
     available_locales: Decidim.available_locales,
@@ -75,7 +76,7 @@ if !Rails.env.production? || ENV["SEED"]
       5.times do
         Decidim::Scope.create!(
           name: Decidim::Faker::Localized.literal(Faker::Address.unique.city),
-          code: parent.code + "-" + Faker::Address.unique.state_abbr,
+          code: "#{parent.code}-#{Faker::Address.unique.state_abbr}",
           scope_type: municipality,
           organization: organization,
           parent: parent
@@ -125,7 +126,7 @@ if !Rails.env.production? || ENV["SEED"]
     admin: true,
     tos_agreement: true,
     personal_url: Faker::Internet.url,
-    about: Faker::Lorem.paragraph(2),
+    about: Faker::Lorem.paragraph(sentence_count: 2),
     accepted_tos_version: organization.tos_version,
     admin_terms_accepted_at: Time.current
   )
@@ -142,7 +143,7 @@ if !Rails.env.production? || ENV["SEED"]
     organization: organization,
     tos_agreement: true,
     personal_url: Faker::Internet.url,
-    about: Faker::Lorem.paragraph(2),
+    about: Faker::Lorem.paragraph(sentence_count: 2),
     accepted_tos_version: organization.tos_version
   )
 
@@ -158,7 +159,7 @@ if !Rails.env.production? || ENV["SEED"]
     organization: organization,
     tos_agreement: true,
     personal_url: Faker::Internet.url,
-    about: Faker::Lorem.paragraph(2),
+    about: Faker::Lorem.paragraph(sentence_count: 2),
     accepted_tos_version: organization.tos_version
   )
 
@@ -178,7 +179,7 @@ if !Rails.env.production? || ENV["SEED"]
         email: Faker::Internet.email,
         confirmed_at: Time.current,
         extended_data: {
-          document_number: Faker::Number.number(10).to_s,
+          document_number: Faker::Number.number(digits: 10).to_s,
           phone: Faker::PhoneNumber.phone_number,
           verified_at: verified_at
         },
@@ -208,7 +209,7 @@ if !Rails.env.production? || ENV["SEED"]
   hero_content_block = Decidim::ContentBlock.find_by(organization: organization, manifest_name: :hero, scope_name: :homepage)
   hero_content_block.images_container.background_image = File.new(File.join(seeds_root, "homepage_image.jpg"))
   settings = {}
-  welcome_text = Decidim::Faker::Localized.sentence(5)
+  welcome_text = Decidim::Faker::Localized.sentence(word_count: 5)
   settings = welcome_text.inject(settings) { |acc, (k, v)| acc.update("welcome_text_#{k}" => v) }
   hero_content_block.settings = settings
   hero_content_block.save!

data/lib/decidim/amendable.rb

@@ -44,7 +44,7 @@ module Decidim
         when "participants"
           return none unless user
 
-          where(id: joins(:amendable).where("decidim_amendments.decidim_user_id = ?", user.id))
+          where(id: joins(:amendable).where(decidim_amendments: { decidim_user_id: user.id }))
         else # Assume 'all'
           only_emendations
         end
@@ -67,6 +67,7 @@ module Decidim
 
     class_methods do
       attr_reader :amendable_options
+
       # Public: Configures amendable for this model.
       #
       # fields  - An `Array` of `symbols` specifying the fields that can be amended
@@ -134,7 +135,7 @@ module Decidim
       when "participants"
         return self.class.none unless user
 
-        published_emendations.where("decidim_amendments.decidim_user_id = ?", user.id)
+        published_emendations.where(decidim_amendments: { decidim_user_id: user.id })
       else # Assume 'all'
         published_emendations
       end

data/{app/functions/decidim/core → lib/decidim/api/functions}/component_finder_base.rb

@@ -14,7 +14,7 @@ module Decidim
     #
     # For an example check
     # decidim-proposals/app/types/decidim/proposals/proposals_type.rb
-    class ComponentFinderBase < GraphQL::Function
+    class ComponentFinderBase
       attr_reader :model_class
 
       def initialize(model_class:)

data/{app/functions/decidim/core → lib/decidim/api/functions}/component_list.rb

@@ -14,8 +14,9 @@ module Decidim
     # This is used by ParticipatorySpaceInterface to apply filter/orders when
     # searching raw components. When listing properly defined components,
     # use ComponentListBase instead
-    class ComponentList < GraphQL::Function
+    class ComponentList
       include NeedsApiFilterAndOrder
+      include NeedsApiDefaultOrder
       attr_reader :model_class
 
       def initialize
@@ -26,11 +27,10 @@ module Decidim
         @query = Decidim::Component
         # remove default ordering if custom order required
         @query = @query.unscoped if args[:order]
-        @query = @query.where(
-          participatory_space: participatory_space
-        ).published
+        @query = @query.where(participatory_space: participatory_space).published
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)
+        add_default_order
         @query
       end
     end

data/{app/functions/decidim/core → lib/decidim/api/functions}/component_list_base.rb

@@ -25,8 +25,9 @@ module Decidim
     # For an example check
     # decidim-proposals/app/types/decidim/proposals/proposals_type.rb
     #
-    class ComponentListBase < GraphQL::Function
+    class ComponentListBase
       include NeedsApiFilterAndOrder
+      include NeedsApiDefaultOrder
       attr_reader :model_class
 
       def initialize(model_class:)
@@ -40,6 +41,7 @@ module Decidim
         add_filter_keys(args[:filter])
         order = filter_keys_by_settings(args[:order].to_h, component)
         add_order_keys(order)
+        add_default_order
         @query
       end
 

data/lib/decidim/api/functions/needs_api_default_order.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    module NeedsApiDefaultOrder
+      private
+
+      # Add default order to the query in order to avoid random PostgreSQL
+      # ordering between the queries for different pages of results. If some of
+      # the queried records are updated or new records are added between the
+      # API calls to different pages of records, PostgreSQL can randomly change
+      # the order causing duplicates to appear or some records to disappear from
+      # the results unless the order of the records is explicitly defined.
+      #
+      # Note that this needs to be called as the last method before returning
+      # the query so that it won't affect the desired ordering specified in the
+      # GraphQ query. In that case, ordering by ID will be the secondary order
+      # of the records.
+      def add_default_order
+        @query = @query.order(:id)
+      end
+    end
+  end
+end

data/{app/functions/decidim/core → lib/decidim/api/functions}/participatory_space_finder_base.rb

@@ -5,7 +5,7 @@ module Decidim
     # An abstract base class resolver for the GraphQL endpoint for a single participatory space
     # Inherit from this class and add search arguments to create finder participatory classes
     # as is shown in ParticipatorySpaceFinder
-    class ParticipatorySpaceFinderBase < GraphQL::Function
+    class ParticipatorySpaceFinderBase
       attr_reader :manifest
 
       def initialize(manifest:)
@@ -19,7 +19,7 @@ module Decidim
 
       def call(_obj, args, ctx)
         query = { organization: ctx[:current_organization] }
-        args.keys.each do |key|
+        args.compact.keys.each do |key|
           query[key] = args[key]
         end
         model_class.public_spaces.find_by(query)

data/{app/functions/decidim/core → lib/decidim/api/functions}/participatory_space_list_base.rb

@@ -7,8 +7,9 @@ module Decidim
     # as is shown in ParticipatorySpaceList
     # + info:
     # https://github.com/rmosolgo/graphql-ruby/blob/v1.6.8/guides/fields/function.md
-    class ParticipatorySpaceListBase < GraphQL::Function
+    class ParticipatorySpaceListBase
       include NeedsApiFilterAndOrder
+      include NeedsApiDefaultOrder
       attr_reader :manifest
 
       def initialize(manifest:)
@@ -27,6 +28,7 @@ module Decidim
 
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)
+        add_default_order
         @query
       end
     end