decidim-assemblies 0.19.1 → 0.23.0

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200108113855_create_decidim_assembly_types.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class CreateDecidimAssemblyTypes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_assemblies_types do |t|
+      t.jsonb :title, null: false
+
+      t.integer :decidim_organization_id,
+                foreign_key: true,
+                index: {
+                  name: "index_decidim_assemblies_types_on_decidim_organization_id"
+                }
+
+      t.timestamps
+    end
+
+    add_reference :decidim_assemblies, :decidim_assemblies_type, index: true, foreign_key: true
+  end
+end

data/db/migrate/20200108123050_migrate_decidim_assembly_types.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# Migrates freezed assembly types to a table where to configure them
+class MigrateDecidimAssemblyTypes < ActiveRecord::Migration[5.2]
+  LEGACY_TYPES = {
+    "government" => "Government",
+    "executive" => "Executive",
+    "consultative_advisory" => "Consultative/Advisory",
+    "participatory" => "Participatory",
+    "working_group" => "Working group",
+    "commission" => "Comission",
+    "others" => "Others"
+  }.freeze
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  class Assembly < ApplicationRecord
+    self.table_name = :decidim_assemblies
+  end
+
+  class AssemblyType < ApplicationRecord
+    self.table_name = :decidim_assemblies_types
+  end
+
+  def up
+    Organization.find_each do |organization|
+      LEGACY_TYPES.each do |type, _english|
+        title = {}
+        organization.available_locales.each do |lang|
+          t = type_localized(type, lang)
+          title[lang] = t if t
+        end
+
+        unless type == "others"
+          assembly_type = AssemblyType.find_or_create_by(
+            decidim_organization_id: organization.id,
+            title: title
+          )
+        end
+        Assembly.where(decidim_organization_id: organization.id, assembly_type: type).each do |assembly|
+          if type == "others"
+            assembly_type = AssemblyType.find_or_create_by(
+              decidim_organization_id: organization.id,
+              title: assembly.assembly_type_other
+            )
+          end
+          assembly.decidim_assemblies_type_id = assembly_type.id
+          assembly.save
+        end
+      end
+    end
+  end
+
+  def down
+    Assembly.find_each do |assembly|
+      next unless assembly.decidim_assemblies_type_id
+
+      assembly_type = AssemblyType.find(assembly.decidim_assemblies_type_id)
+      next unless assembly_type
+
+      key = LEGACY_TYPES.find { |type, _english| type_localized(type, "en") == assembly_type.title["en"] }
+
+      unless key
+        key = "others"
+        assembly.assembly_type_other = assembly_type.title
+      end
+      assembly.assembly_type = key
+      assembly.save
+    end
+  end
+
+  private
+
+  def type_localized(type, lang)
+    I18n.with_locale(lang) do
+      t = I18n.t("assembly_types.#{type}", scope: "decidim.assemblies", default: false)
+      t ||= LEGACY_TYPES[type] if lang == "en"
+      t
+    end
+  end
+end

data/db/migrate/20200320105906_index_foreign_keys_in_decidim_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAssemblies < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_assemblies, :decidim_scope_id
+  end
+end

data/db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAssemblyUserRoles < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_assembly_user_roles, :decidim_user_id
+  end
+end

data/db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveLegacyDecidimAssemblyType < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_assemblies, :assembly_type, :string
+    remove_column :decidim_assemblies, :assembly_type_other, :jsonb
+  end
+end

data/db/migrate/20200430202456_create_decidim_assemblies_settings.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimAssembliesSettings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_assemblies_settings do |t|
+      t.boolean :enable_organization_chart, default: true
+      t.references :decidim_organization, foreign_key: true
+    end
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -15,6 +15,9 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        resources :assemblies_types
+        resource :assemblies_settings, only: [:edit, :update], controller: "assemblies_settings"
+
         resources :assemblies, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "assembly_publications", only: [:create, :destroy]
           resources :copies, controller: "assembly_copies", only: [:new, :create]
@@ -28,6 +31,12 @@ module Decidim
 
           resources :attachment_collections, controller: "assembly_attachment_collections"
           resources :attachments, controller: "assembly_attachments"
+
+          resource :export, controller: "assembly_exports", only: :create
+
+          collection do
+            resources :imports, controller: "assembly_imports", only: [:new, :create]
+          end
         end
 
         scope "/assemblies/:assembly_slug" do
@@ -38,6 +47,7 @@ module Decidim
             member do
               put :publish
               put :unpublish
+              get :share
             end
             resources :exports, only: :create
           end

data/lib/decidim/assemblies/engine.rb

@@ -4,6 +4,7 @@ require "rails"
 require "active_support/all"
 
 require "decidim/core"
+require "decidim/assemblies/query_extensions"
 
 module Decidim
   module Assemblies
@@ -24,7 +25,7 @@ module Decidim
 
         resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
           resources :assembly_members, only: :index, path: "members"
-          resource :assembly_widget, only: :show, path: "embed"
+          resource :widget, only: :show, path: "embed"
         end
 
         scope "/assemblies/:assembly_slug/f/:component_id" do
@@ -108,6 +109,12 @@ module Decidim
           end
         end
       end
+
+      initializer "decidim_assemblies.query_extensions" do
+        Decidim::Api::QueryType.define do
+          QueryExtensions.define(self)
+        end
+      end
     end
   end
 end

data/lib/decidim/assemblies/participatory_space.rb

@@ -10,9 +10,12 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
 
   participatory_space.permissions_class_name = "Decidim::Assemblies::Permissions"
 
+  participatory_space.query_type = "Decidim::Assemblies::AssemblyType"
+
   participatory_space.register_resource(:assembly) do |resource|
     resource.model_class_name = "Decidim::Assembly"
     resource.card = "decidim/assemblies/assembly"
+    resource.searchable = true
   end
 
   participatory_space.context(:public) do |context|
@@ -25,6 +28,19 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     context.layout = "layouts/decidim/admin/assembly"
   end
 
+  participatory_space.exports :assemblies do |export|
+    export.collection do |assembly|
+      Decidim::Assembly.where(id: assembly.id)
+    end
+
+    export.serializer Decidim::Assemblies::AssemblySerializer
+  end
+
+  participatory_space.register_on_destroy_account do |user|
+    Decidim::AssemblyUserRole.where(user: user).destroy_all
+    Decidim::AssemblyMember.where(user: user).destroy_all
+  end
+
   participatory_space.seeds do
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
@@ -32,7 +48,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     Decidim::ContentBlock.create(
       organization: organization,
       weight: 32,
-      scope: :homepage,
+      scope_name: :homepage,
       manifest_name: :highlighted_assemblies,
       published_at: Time.current
     )
@@ -49,11 +65,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+        organization: organization,
+        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
-        organization: organization,
         meta_scope: Decidim::Faker::Localized.word,
         developer_group: Decidim::Faker::Localized.sentence(1),
         local_area: Decidim::Faker::Localized.sentence(2),
@@ -67,8 +83,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         composition: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        assembly_type: "others",
-        assembly_type_other: Decidim::Faker::Localized.word,
+        assembly_type: Decidim::AssembliesType.create!(organization: organization, title: Decidim::Faker::Localized.word),
         creation_date: 1.day.from_now,
         created_by: "others",
         created_by_other: Decidim::Faker::Localized.word,
@@ -133,11 +148,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+        organization: organization,
+        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
-        organization: organization,
         meta_scope: Decidim::Faker::Localized.word,
         developer_group: Decidim::Faker::Localized.sentence(1),
         local_area: Decidim::Faker::Localized.sentence(2),
@@ -149,6 +164,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
       )
 
       [assembly, child].each do |current_assembly|
+        current_assembly.add_to_index_as_search_resource
         attachment_collection = Decidim::AttachmentCollection.create!(
           name: Decidim::Faker::Localized.word,
           description: Decidim::Faker::Localized.sentence(5),
@@ -158,23 +174,23 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
           attachment_collection: attachment_collection,
-          attached_to: current_assembly
+          attached_to: current_assembly,
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "city.jpeg")),
-          attached_to: current_assembly
+          attached_to: current_assembly,
+          file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-          attached_to: current_assembly
+          attached_to: current_assembly,
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
 
         2.times do

data/lib/decidim/assemblies/query_extensions.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This module's job is to extend the API with custom fields related to
+    # decidim-assemblies.
+    module QueryExtensions
+      # Public: Extends a type with `decidim-assemblies`'s fields.
+      #
+      # type - A GraphQL::BaseType to extend.
+      #
+      # Returns nothing.
+      def self.define(type)
+        type.field :assembliesTypes do
+          type !types[AssembliesTypeType]
+          description "Lists all assemblies types"
+
+          resolve lambda { |_obj, _args, ctx|
+            Decidim::AssembliesType.where(
+              organization: ctx[:current_organization]
+            )
+          }
+        end
+
+        type.field :assembliesType do
+          type AssembliesTypeType
+          description "Finds an assemblies type group"
+          argument :id, !types.ID, "The ID of the Assemblies type"
+
+          resolve lambda { |_obj, args, ctx|
+            Decidim::AssembliesType.find_by(
+              organization: ctx[:current_organization],
+              id: args[:id]
+            )
+          }
+        end
+      end
+    end
+  end
+end

data/lib/decidim/assemblies/test/factories.rb

@@ -8,16 +8,26 @@ FactoryBot.define do
     "#{Faker::Internet.slug(nil, "-")}-#{n}"
   end
 
+  factory :assemblies_setting, class: "Decidim::AssembliesSetting" do
+    enable_organization_chart { true }
+    organization
+  end
+
+  factory :assemblies_type, class: "Decidim::AssembliesType" do
+    title { generate_localized_title }
+    organization
+  end
+
   factory :assembly, class: "Decidim::Assembly" do
     title { generate_localized_title }
     slug { generate(:assembly_slug) }
     subtitle { generate_localized_title }
     short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
-    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
-    published_at { Time.current }
     organization
+    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
+    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
+    published_at { Time.current }
     meta_scope { Decidim::Faker::Localized.word }
     developer_group { generate_localized_title }
     local_area { generate_localized_title }
@@ -28,8 +38,6 @@ FactoryBot.define do
     private_space { false }
     purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    assembly_type { "others" }
-    assembly_type_other { generate_localized_title }
     creation_date { 1.month.ago }
     created_by { "others" }
     created_by_other { Decidim::Faker::Localized.word }
@@ -46,6 +54,10 @@ FactoryBot.define do
     youtube_handler { "others" }
     github_handler { "others" }
 
+    trait :with_type do
+      assembly_type { create :assemblies_type, organization: organization }
+    end
+
     trait :promoted do
       promoted { true }
     end
@@ -130,6 +142,21 @@ FactoryBot.define do
     end
   end
 
+  factory :assembly_valuator, parent: :user, class: "Decidim::User" do
+    transient do
+      assembly { create(:assembly) }
+    end
+
+    organization { assembly.organization }
+
+    after(:create) do |user, evaluator|
+      create :assembly_user_role,
+             user: user,
+             assembly: evaluator.assembly,
+             role: :valuator
+    end
+  end
+
   factory :assembly_member, class: "Decidim::AssemblyMember" do
     assembly { create(:assembly) }
 

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.19.1"
+      "0.23.0"
     end
   end
 end