decidim-core 0.9.3 → 0.10.0

data/db/migrate/20170215115407_add_organization_custom_reference.rb

@@ -9,7 +9,7 @@ class AddOrganizationCustomReference < ActiveRecord::Migration[5.0]
     add_column :decidim_organizations, :reference_prefix, :string
 
     Organization.find_each do |organization|
-      organization.update_attributes!(reference_prefix: organization.name[0])
+      organization.update!(reference_prefix: organization.name[0])
     end
 
     change_column_null :decidim_organizations, :reference_prefix, false

data/db/migrate/20170313095436_add_available_authorizations_to_organization.rb

@@ -10,7 +10,7 @@ class AddAvailableAuthorizationsToOrganization < ActiveRecord::Migration[5.0]
 
     workflows = Decidim::Verifications.workflows.map(&:name)
     Organization.find_each do |org|
-      org.update_attributes!(available_authorizations: workflows)
+      org.update!(available_authorizations: workflows)
     end
   end
 end

data/db/migrate/20171207182729_create_decidim_attachment_collections.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateDecidimAttachmentCollections < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_attachment_collections do |t|
+      t.jsonb :name, null: false
+      t.jsonb :description, null: false
+      t.integer :weight, null: false, default: 0
+      t.references :collection_for, polymorphic: true, null: false, index: { name: "decidim_attachment_collections_collection_for_id_and_type" }
+    end
+  end
+end

data/db/migrate/20180130093153_add_action_log.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddActionLog < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_action_logs do |t|
+      t.references :decidim_organization, null: false, index: { name: "index_action_logs_on_organization_id" }
+      t.references :decidim_user, null: false, index: { name: "index_action_logs_on_user_id" }
+      t.references :decidim_feature, index: { name: "index_action_logs_on_feature_id" }
+      t.references :resource, polymorphic: true, null: false, index: { name: "index_action_logs_on_resource_type_and_id" }
+      t.references :participatory_space, polymorphic: true, index: { name: "index_action_logs_on_space_type_and_id" }
+      t.string :action, null: false
+      t.jsonb :extra
+
+      t.timestamps
+    end
+    add_index :decidim_action_logs, :created_at
+  end
+end

data/db/migrate/20180206143340_fix_reference_for_all_resources.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class FixReferenceForAllResources < ActiveRecord::Migration[5.1]
+  def up
+    models = ActiveRecord::Base.descendants.select { |c| c.included_modules.include?(Decidim::HasReference) }
+
+    models.each do |model|
+      model.find_each(&:touch)
+    end
+  end
+
+  def down; end
+end

data/db/migrate/20180215104821_create_decidim_area_types.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimAreaTypes < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_area_types do |t|
+      t.references :decidim_organization, foreign_key: true, index: true
+      t.jsonb :name, null: false
+      t.jsonb :plural, null: false
+    end
+  end
+end

data/db/migrate/20180215104945_create_decidim_areas.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateDecidimAreas < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_areas do |t|
+      t.jsonb :name
+      t.references :area_type, foreign_key: { to_table: :decidim_area_types }, index: true
+      t.references :decidim_organization, foreign_key: true, index: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180221101934_fix_nickname_index.rb

@@ -9,7 +9,7 @@ class FixNicknameIndex < ActiveRecord::Migration[5.1]
     Decidim::User.where(nickname: nil)
                  .where(deleted_at: nil)
                  .where(managed: false)
-                 .find_each { |u| u.update_attributes(nickname: Decidim::User.nicknamize(u.name)) }
+                 .find_each { |u| u.update(nickname: Decidim::User.nicknamize(u.name)) }
 
     # rubocop:disable Rails/SkipsModelValidations
     Decidim::User.where(nickname: nil)

data/db/migrate/20180226140756_add_version_to_action_logs.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddVersionToActionLogs < ActiveRecord::Migration[5.1]
+  def up
+    add_column :decidim_action_logs, :version_id, :integer, index: true
+
+    Decidim::ActionLog.find_each do |action_log|
+      version_id = action_log.extra.dig("version", "id")
+      next unless version_id
+      # rubocop:disable Rails/SkipsModelValidations
+      action_log.update_column(:version_id, version_id)
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+  end
+
+  def down
+    remove_column :decidim_action_logs, :version_id
+  end
+end

data/db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class RenameMaximumVotesPerProposalToThresholdPerProposal < ActiveRecord::Migration[5.1]
+  def up
+    execute <<~SQL
+      UPDATE decidim_features
+      SET settings = jsonb_set(
+        settings::jsonb,
+        array['global'],
+        (settings->'global')::jsonb - 'maximum_votes_per_proposal' || jsonb_build_object('threshold_per_proposal', settings->'global'->'maximum_votes_per_proposal')
+        )
+      WHERE manifest_name = 'proposals'
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+      UPDATE decidim_features
+      SET settings = jsonb_set(
+        settings::jsonb,
+        array['global'],
+        (settings->'global')::jsonb - 'threshold_per_proposal' || jsonb_build_object('maximum_votes_per_proposal', settings->'global'->'threshold_per_proposal')
+        )
+      WHERE manifest_name = 'proposals'
+    SQL
+  end
+end

data/db/migrate/20180326075746_change_event_name_and_class_to_rename_to_publish_proposal_event.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ChangeEventNameAndClassToRenameToPublishProposalEvent < ActiveRecord::Migration[5.1]
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Notification.where(event_name: "decidim.events.proposals.proposal_created")
+                         .update_all(event_name: "decidim.events.proposals.proposal_published", event_class: "Decidim::Proposals::PublishProposalEvent")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def down
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Notification.where(event_name: "decidim.events.proposals.proposal_published")
+                         .update_all(event_name: "decidim.events.proposals.proposal_created", event_class: "Decidim::Proposals::CreateProposalEvent")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/db/seeds.rb

@@ -55,6 +55,34 @@ if !Rails.env.production? || ENV["SEED"]
     end
   end
 
+  territorial = Decidim::AreaType.create!(
+    name: Decidim::Faker::Localized.literal("territorial"),
+    plural: Decidim::Faker::Localized.literal("territorials"),
+    organization: organization
+  )
+
+  sectorial = Decidim::AreaType.create!(
+    name: Decidim::Faker::Localized.literal("sectorials"),
+    plural: Decidim::Faker::Localized.literal("sectorials"),
+    organization: organization
+  )
+
+  3.times do
+    Decidim::Area.create!(
+      name: Decidim::Faker::Localized.word,
+      area_type: territorial,
+      organization: organization
+    )
+  end
+
+  5.times do
+    Decidim::Area.create!(
+      name: Decidim::Faker::Localized.word,
+      area_type: sectorial,
+      organization: organization
+    )
+  end
+
   admin = Decidim::User.find_or_initialize_by(email: "admin@example.org")
 
   admin.update!(

data/lib/decidim/abilities/participatory_process_role_ability.rb

@@ -26,7 +26,7 @@ module Decidim
       def define_participatory_process_abilities; end
 
       # Abstract: A subclass must define this method returning a valid role.
-      # See ParticipatoryProcessUserRoles::ROLES for more information.
+      # See ParticipatoryProcessUserRole::ROLES for more information.
       def role
         raise "Needs implementation"
       end
@@ -39,7 +39,7 @@ module Decidim
       # Returns a collection of Participatory processes where the given user has the
       # specific role privilege.
       def participatory_processes_with_role_privileges
-        @participatory_processes ||= Decidim::ParticipatoryProcessesWithUserRole.for(@user, role)
+        @participatory_processes_with_role_privileges ||= Decidim::ParticipatoryProcessesWithUserRole.for(@user, role)
       end
 
       # Whether the user has at least one process to manage or not.

data/lib/decidim/api/author_interface.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents an author who owns a resource.
+    AuthorInterface = GraphQL::InterfaceType.define do
+      name "Author"
+      description "An author"
+
+      field :name, !types.String, "The author's name"
+      field :nickname, !types.String, "The author's nickname"
+
+      field :avatarUrl, !types.String, "The author's avatar url"
+      field :profilePath, !types.String, "The author's profile path"
+      field :badge, !types.String, "The author's badge icon"
+
+      field :deleted, !types.Boolean, "Whether the author's account has been deleted or not"
+
+      resolve_type ->(obj, _ctx) {
+                     return Decidim::Core::UserType if obj.is_a? Decidim::User
+                     return Decidim::Core::UserGroupType if obj.is_a? Decidim::UserGroup
+                   }
+    end
+  end
+end

data/lib/decidim/api/component_interface.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    ComponentInterface = GraphQL::InterfaceType.define do
+      name "ComponentInterface"
+      description "This interface is implemented by all components that belong into a Participatory Space"
+
+      field :id, !types.ID, "The Component's unique ID"
+
+      field :name, !TranslatedFieldType, "The name of this component."
+
+      resolve_type ->(obj, _ctx) { obj.manifest.query_type.constantize }
+    end
+  end
+end

data/lib/decidim/api/participatory_space_interface.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    ParticipatorySpaceInterface = GraphQL::InterfaceType.define do
+      name "ParticipatorySpaceInterface"
+      description "The interface that all participatory spaces should implement."
+
+      field :id, !types.ID, "The participatory space's unique ID"
+
+      field :title, !TranslatedFieldType, "The name of this participatory space."
+
+      field :components, types[ComponentInterface] do
+        description "Lists the components this space contains."
+
+        resolve ->(participatory_space, _args, _ctx) {
+                  Decidim::Feature.where(
+                    participatory_space: participatory_space
+                  ).published
+                }
+      end
+
+      field :stats, types[Decidim::Core::StatisticType] do
+        resolve ->(participatory_space, _args, _ctx) {
+          published_features = Feature.where(participatory_space: participatory_space).published
+
+          stats = Decidim.feature_manifests.map do |feature_manifest|
+            feature_manifest.stats.with_context(published_features).map { |name, data| [name, data] }.flatten
+          end
+
+          stats.reject(&:empty?)
+        }
+      end
+
+      resolve_type ->(obj, _ctx) { obj.manifest.query_type.constantize }
+    end
+  end
+end

data/lib/decidim/authorable.rb

@@ -12,6 +12,14 @@ module Decidim
       validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization
 
+      # Checks whether the user is author of the given proposal, either directly
+      # authoring it or via a user group.
+      #
+      # user - the user to check for authorship
+      def authored_by?(user)
+        author == user || user.user_groups.include?(user_group)
+      end
+
       private
 
       def verified_user_group

data/lib/decidim/core.rb

@@ -2,7 +2,6 @@
 
 require "decidim/core/engine"
 require "decidim/core/version"
-require "decidim/core/api"
 
 # Decidim configuration.
 module Decidim
@@ -10,26 +9,27 @@ module Decidim
   autoload :FormBuilder, "decidim/form_builder"
   autoload :AuthorizationFormBuilder, "decidim/authorization_form_builder"
   autoload :FilterFormBuilder, "decidim/filter_form_builder"
-  autoload :DeviseFailureApp, "decidim/devise_failure_app"
   autoload :FeatureManifest, "decidim/feature_manifest"
   autoload :ParticipatorySpaceManifest, "decidim/participatory_space_manifest"
   autoload :ResourceManifest, "decidim/resource_manifest"
   autoload :Resourceable, "decidim/resourceable"
   autoload :Traceable, "decidim/traceable"
+  autoload :Loggable, "decidim/loggable"
   autoload :Reportable, "decidim/reportable"
   autoload :Authorable, "decidim/authorable"
   autoload :Participable, "decidim/participable"
   autoload :Publicable, "decidim/publicable"
   autoload :Scopable, "decidim/scopable"
+  autoload :ScopableFeature, "decidim/scopable_feature"
   autoload :ContentParsers, "decidim/content_parsers"
   autoload :ContentRenderers, "decidim/content_renderers"
   autoload :ContentProcessor, "decidim/content_processor"
   autoload :Features, "decidim/features"
+  autoload :HasAttachmentCollections, "decidim/has_attachment_collections"
   autoload :HasAttachments, "decidim/has_attachments"
   autoload :FeatureValidator, "decidim/feature_validator"
   autoload :HasSettings, "decidim/has_settings"
   autoload :HasFeature, "decidim/has_feature"
-  autoload :HasScope, "decidim/has_scope"
   autoload :HasCategory, "decidim/has_category"
   autoload :Followable, "decidim/followable"
   autoload :FriendlyDates, "decidim/friendly_dates"
@@ -49,6 +49,7 @@ module Decidim
   autoload :Events, "decidim/events"
   autoload :ViewHooks, "decidim/view_hooks"
   autoload :NewsletterEncryptor, "decidim/newsletter_encryptor"
+  autoload :QueryExtensions, "decidim/query_extensions"
 
   include ActiveSupport::Configurable
 
@@ -93,7 +94,7 @@ module Decidim
 
   # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
-    %w(en ca es eu fi fr gl it nl pt pr-BR ru sv uk)
+    %w(en ca es eu fi fr gl it nl pt pt-BR ru sv uk)
   end
 
   # Exposes a configuration option: an array of symbols representing processors
@@ -121,19 +122,30 @@ module Decidim
   # Exposes a configuration option: an object to configure geocoder
   config_accessor :geocoder
 
-  # Exposes a configuration option: a custom method to generate references
+  # Exposes a configuration option: a custom method to generate references.
+  # If overwritten, it should handle both feature resources and participatory spaces.
   # Default: Calculates a unique reference for the model in
   # the following format:
   #
-  # "BCN-DPP-2017-02-6589" which in this example translates to:
+  # "BCN-PROP-2017-02-6589" which in this example translates to:
   #
   # BCN: A setting configured at the organization to be prepended to each reference.
-  # PROP: Unique name identifier for a resource: Decidim::Proposals::Proposal (MEET for meetings or PROJ for projects).
+  # PROP: Unique name identifier for a resource: Decidim::Proposals::Proposal
+  #       (MEET for meetings or PROJ for projects).
   # 2017-02: Year-Month of the resource creation date
   # 6589: ID of the resource
-  config_accessor :resource_reference_generator do
+  config_accessor :reference_generator do
     lambda do |resource, feature|
-      ref = feature.participatory_space.organization.reference_prefix
+      ref = ""
+
+      if resource.is_a?(Decidim::HasFeature) && feature.present?
+        # It's a feature resource
+        ref = feature.participatory_space.organization.reference_prefix
+      elsif resource.is_a?(Decidim::Participable)
+        # It's a participatory space
+        ref = resource.organization.reference_prefix
+      end
+
       class_identifier = resource.class.name.demodulize[0..3].upcase
       year_month = (resource.created_at || Time.current).strftime("%Y-%m")
 
@@ -321,4 +333,10 @@ module Decidim
   def self.traceability
     @traceability ||= Traceability.new
   end
+
+  module Core
+    autoload :ParticipatorySpaceInterface, "decidim/api/participatory_space_interface"
+    autoload :ComponentInterface, "decidim/api/component_interface"
+    autoload :AuthorInterface, "decidim/api/author_interface"
+  end
 end

data/lib/decidim/core/engine.rb

@@ -35,9 +35,6 @@ require "paper_trail"
 
 require "decidim/api"
 
-require "decidim/query_extensions"
-require "decidim/i18n_exceptions"
-
 module Decidim
   module Core
     # Decidim's core Rails Engine.
@@ -96,7 +93,9 @@ module Decidim
       end
 
       initializer "decidim.query_extensions" do
-        QueryExtensions.extend!(Decidim::Api::QueryType)
+        Decidim::Api::QueryType.define do
+          Decidim::QueryExtensions.define(self)
+        end
       end
 
       initializer "decidim.i18n_exceptions" do