decidim-assemblies 0.23.6 → 0.24.0.rc1

data/config/locales/sk.yml

@@ -129,7 +129,6 @@ sk:
     admin_log:
       assembly_type:
         create: "%{user_name} vytvoril %{resource_name} nový typ zhromaždenia"
-        delete: "%{user_name} odstránil %{resource_name} používateľa z typu zhromaždenia %{space_name}"
         publish: "%{user_name} vytvoril nový typ zhromaždenia %{resource_name}"
         unpublish: "%{user_name} zrušil publikovanie typu zhromaždenia %{resource_name}"
         update: "%{user_name} aktualizoval typ zhromaždenia %{resource_name}"
@@ -163,8 +162,6 @@ sk:
       home:
         hero:
           participate_title: Podieľajte sa na procesoch platformy
-        sub_hero:
-          register_title: Vytvorte si účet na platforme
     participatory_processes:
       pages:
         home:

data/config/locales/sl.yml

@@ -238,7 +238,6 @@ sl:
         assemblies_count: Združbe
         comments_count: Komentarji
         debates_count: Debate
-        headline: Dejavnost
         meetings_count: Sestanki
         orders_count: Podpora
         pages_count: Strani

data/config/locales/sr-CS.yml

@@ -25,7 +25,6 @@ sr:
     admin_log:
       assembly_type:
         create: "%{user_name} je stvorio tip veća %{resource_name}"
-        delete: "%{user_name} je uklonio člana %{resource_name} iz tipa veća %{space_name}"
         publish: "%{user_name} je objavio tip veća %{resource_name}"
         unpublish: "%{user_name} je odustao od objavljivanja tipa veća %{resource_name}"
         update: "%{user_name} je ažurirao tip veća %{resource_name}"
@@ -64,8 +63,6 @@ sr:
       home:
         hero:
           participate_title: Učestvujte u procesima platforme
-        sub_hero:
-          register_title: Registrujte se na platformu
     participatory_processes:
       pages:
         home:

data/config/locales/sv.yml

@@ -1,8 +1,6 @@
 sv:
   activemodel:
     attributes:
-      assemblies_setting:
-        enable_organization_chart: Aktivera organisationskarta
       assembly:
         area_id: Område
         assembly_type: Typ av grupp
@@ -52,6 +50,7 @@ sv:
         target: Vem deltar
         title: Titel
         twitter: Twitter
+        weight: Vikt
         youtube: YouTube
       assembly_member:
         birthday: Födelsedag
@@ -62,7 +61,6 @@ sv:
         full_name: Fullständigt namn
         gender: Kön
         position: Befattning
-        user_id: Användare
       assembly_user_role:
         email: E-post
         name: Namn
@@ -249,7 +247,6 @@ sv:
         update: "%{user_name} uppdaterade inställningarna för församlingarna"
       assembly_type:
         create: "%{user_name} skapade grupptypen %{resource_name}"
-        delete: "%{user_name} tog bort medlemmen %{resource_name} från grupptypen %{space_name}"
         publish: "%{user_name} publicerade grupptypen %{resource_name}"
         unpublish: "%{user_name} avpublicerade grupptypen %{resource_name}"
         update: "%{user_name} uppdaterade grupptypen %{resource_name}"
@@ -386,7 +383,6 @@ sv:
         comments_count: Kommentarer
         debates_count: Debatter
         endorsements_count: Instämmanden
-        headline: Aktivitet
         meetings_count: Möten
         orders_count: Stöd
         pages_count: Sidor
@@ -443,8 +439,6 @@ sv:
       home:
         hero:
           participate_title: Delta i plattformens dialoger
-        sub_hero:
-          register_title: Skapa ett konto på plattformen genom att logga in
     participatory_processes:
       pages:
         home:

data/config/locales/tr-TR.yml

@@ -249,7 +249,6 @@ tr:
         update: "%{user_name}, kurul ayarlarını güncelledi"
       assembly_type:
         create: "%{user_name},%{resource_name} kurul türünü oluşturdu"
-        delete: "%{user_name},%{resource_name} üyesini %{space_name} kurul türünden kaldırdı"
         publish: "%{user_name}, %{resource_name} kurul türünü yayınladı"
         unpublish: "%{user_name}, %{resource_name} kurul türünü yayından kaldırdı"
         update: "%{user_name}, %{resource_name} kurul türünü güncelledi"
@@ -386,7 +385,6 @@ tr:
         comments_count: Yorumlar
         debates_count: Tartışmalar
         endorsements_count: Onaylar
-        headline: Aktivite
         meetings_count: Toplantılar
         orders_count: Destekler
         pages_count: Sayfalar
@@ -443,8 +441,6 @@ tr:
       home:
         hero:
           participate_title: Platformun süreçlerine katılın
-        sub_hero:
-          register_title: Platformda bir hesap oluşturmak için kaydolun
     participatory_processes:
       pages:
         home:

data/config/locales/uk.yml

@@ -307,11 +307,10 @@ uk:
         target: Хто бере участь
       statistics:
         answers_count: Відповідей
-        assemblies_count: Збори
+        assemblies_count: Зборів
         comments_count: Коментарів
         debates_count: Обговорень
         endorsements_count: Проявів підтримки
-        headline: Діяльність
         meetings_count: Зустрічей
         orders_count: Голосів
         pages_count: Сторінок

data/config/locales/zh-CN.yml

@@ -243,7 +243,6 @@ zh-CN:
         update: "%{user_name} 更新了程序集设置"
       assembly_type:
         create: "%{user_name} 创建了 %{resource_name} 组装类型"
-        delete: "%{user_name} 将 %{resource_name} 成员从 %{space_name} 组装类型中移除"
         publish: "%{user_name} 发布了 %{resource_name} 组装类型"
         unpublish: "%{user_name} 未发布的 %{resource_name} 组装类型"
         update: "%{user_name} 更新了 %{resource_name} 装配体类型"
@@ -377,7 +376,6 @@ zh-CN:
         comments_count: 评论
         debates_count: 辩论
         endorsements_count: 授权
-        headline: 活动
         meetings_count: 会议
         orders_count: 支持
         pages_count: 页 次
@@ -434,8 +432,6 @@ zh-CN:
       home:
         hero:
           participate_title: 参与平台进程
-        sub_hero:
-          register_title: 注册在平台上创建帐户
     participatory_processes:
       pages:
         home:

data/db/migrate/20210204152393_add_weight_field_to_assembly.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWeightFieldToAssembly < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_assemblies, :weight, :integer, null: false, default: true
+  end
+end

data/lib/decidim/api/assemblies_type_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents an AssembliesType.
+    class AssembliesTypeType < Decidim::Api::Types::BaseObject
+      description "An assemblies type"
+
+      field :id, GraphQL::Types::ID, "The assemblies type's unique ID", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this assemblies type.", null: false
+      field :created_at, Decidim::Core::DateTimeType, "The time this assemblies type was created", null: false
+      field :updated_at, Decidim::Core::DateTimeType, "The time this assemblies type was updated", null: false
+      field :assemblies, [Decidim::Assemblies::AssemblyType, { null: true }], "Assemblies with this assemblies type", null: false
+    end
+  end
+end

data/lib/decidim/api/assembly_member_type.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    class AssemblyMemberType < Decidim::Api::Types::BaseObject
+      description "An assembly member"
+
+      field :id, GraphQL::Types::ID, "Internal ID of the member", null: false
+      field :full_name, GraphQL::Types::String, "Full name of the member", null: true
+      field :position, GraphQL::Types::String, "Position of the member in the assembly", null: true
+
+      field :user, Decidim::Core::UserType, "The corresponding decidim user", null: true
+
+      field :created_at, Decidim::Core::DateTimeType, "The time this member was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "The time this member was updated", null: true
+
+      field :weight, GraphQL::Types::Int, "Order of appearance in which it should be represented", null: true
+      field :gender, GraphQL::Types::String, "Gender of the member", null: true
+      # field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
+      field :birthplace, GraphQL::Types::String, "Birthplace of the member", null: true
+      field :designation_date, Decidim::Core::DateType, "Date of designation of the member", null: true
+      # field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
+      field :position_other, GraphQL::Types::String, "Custom position name", null: true
+      field :ceased_date, Decidim::Core::DateType, "Date of cease for the member", null: true
+    end
+  end
+end

data/lib/decidim/api/assembly_type.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    class AssemblyType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ParticipatorySpaceInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::ParticipatorySpaceResourceableInterface
+
+      description "An assembly"
+
+      field :id, ID, "The internal ID for this assembly", null: false
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly", null: true
+      field :short_description, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly", null: true
+      field :slug, String, "The slug of this assembly", null: false
+      field :hashtag, String, "The hashtag for this assembly", null: true
+      field :created_at, Decidim::Core::DateTimeType, "The time this assembly was created", null: false
+      field :updated_at, Decidim::Core::DateTimeType, "The time this assembly was updated", null: false
+      field :published_at, Decidim::Core::DateTimeType, "The time this assembly was published", null: false
+      field :reference, String, "Reference for this assembly", null: false
+      field :categories, [Decidim::Core::CategoryType, { null: true }], "Categories for this assembly", null: false
+
+      field :hero_image, String, "The hero image for this assembly", null: true
+      field :banner_image, String, "The banner image for this assembly", null: true
+      field :promoted, Boolean, "If this assembly is promoted (therefore in the homepage)", null: true
+      field :developer_group, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", null: true
+      field :meta_scope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", null: true
+      field :local_area, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", null: true
+      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly", null: true
+      field :participatory_scope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", null: true
+      field :participatory_structure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", null: true
+      field :show_statistics, Boolean, "If this assembly should show statistics", null: true
+      field :scopes_enabled, Boolean, "If this assembly has scopes enabled", null: true
+      field :private_space, Boolean, "If this assembly is a private space", null: true
+      field :area, Decidim::Core::AreaApiType, "Area of this assembly", null: true
+      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly", null: true
+      field :parents_path, String, "Assembly hierarchy representation", null: true
+      field :children_count, Integer, "Number of children assemblies", null: true
+      field :purpose_of_action, Decidim::Core::TranslatedFieldType, "Purpose of action", null: true
+      field :composition, Decidim::Core::TranslatedFieldType, "Composition of this assembly", null: true
+      field :assembly_type, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", null: true
+      field :creation_date, Decidim::Core::DateType, "Creation date of this assembly", null: true
+      field :created_by, String, "The creator of this assembly", null: true
+      field :created_by_other, Decidim::Core::TranslatedFieldType, "Custom creator", null: true
+      field :duration, Decidim::Core::DateType, "Duration of this assembly", null: true
+      field :included_at, Decidim::Core::DateType, "Included at", null: true
+      field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
+      field :closing_date_reason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", null: true
+      field :internal_organisation, Decidim::Core::TranslatedFieldType, "Internal organisation of this assembly", null: true
+      field :is_transparent, Boolean, "If this assembly is transparent", null: true
+      field :special_features, Decidim::Core::TranslatedFieldType, "Special features of this assembly", null: true
+      field :twitter_handler, String, "Twitter handler", null: true
+      field :instagram_handler, String, "Instagram handler", null: true
+      field :facebook_handler, String, "Facebook handler", null: true
+      field :youtube_handler, String, "Youtube handler", null: true
+      field :github_handler, String, "Github handler", null: true
+
+      field :members, [Decidim::Assemblies::AssemblyMemberType, { null: true }], "Members of this assembly", null: false
+      field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Childrens of this assembly", null: false
+    end
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -50,6 +50,7 @@ module Decidim
               get :share
             end
             resources :exports, only: :create
+            resources :imports, only: [:new, :create]
           end
 
           resources :moderations do
@@ -58,6 +59,7 @@ module Decidim
               put :hide
               put :unhide
             end
+            resources :reports, controller: "moderations/reports", only: [:index, :show]
           end
 
           resources :participatory_space_private_users, controller: "participatory_space_private_users" do
@@ -81,6 +83,12 @@ module Decidim
         end
       end
 
+      initializer "decidim_assemblies.action_controller" do |_app|
+        ActiveSupport.on_load :action_controller do
+          helper Decidim::Assemblies::Admin::AssembliesAdminMenuHelper if respond_to?(:helper)
+        end
+      end
+
       initializer "decidim_assemblies.admin_assets" do |app|
         app.config.assets.precompile += %w(admin/decidim_assemblies_manifest.js)
       end
@@ -90,11 +98,33 @@ module Decidim
           menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
                     decidim_admin_assemblies.assemblies_path,
                     icon_name: "dial",
-                    position: 3.5,
+                    position: 2.2,
                     active: :inclusive,
                     if: allowed_to?(:enter, :space_area, space_name: :assemblies)
         end
       end
+
+      initializer "decidim_assemblies.admin_assemblies_menu" do
+        Decidim.menu :admin_assemblies_menu do |menu|
+          menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
+                    decidim_admin_assemblies.assemblies_path,
+                    position: 1.0,
+                    active: is_active_link?(decidim_admin_assemblies.assemblies_path),
+                    if: allowed_to?(:read, :assembly_list)
+
+          menu.item I18n.t("menu.assemblies_types", scope: "decidim.admin"),
+                    decidim_admin_assemblies.assemblies_types_path,
+                    active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
+                    position: 1.1,
+                    if: allowed_to?(:manage, :assemblies_type)
+
+          menu.item I18n.t("menu.assemblies_settings", scope: "decidim.admin"),
+                    decidim_admin_assemblies.edit_assemblies_settings_path,
+                    active: is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path),
+                    position: 1.3,
+                    if: allowed_to?(:read, :assemblies_setting)
+        end
+      end
     end
   end
 end

data/lib/decidim/assemblies/api.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    autoload :AssemblyType, "decidim/api/assembly_type"
+    autoload :AssemblyMemberType, "decidim/api/assembly_member_type"
+    autoload :AssembliesTypeType, "decidim/api/assemblies_type_type"
+  end
+end

data/lib/decidim/assemblies/engine.rb

@@ -58,8 +58,8 @@ module Decidim
         Decidim.menu :menu do |menu|
           menu.item I18n.t("menu.assemblies", scope: "decidim"),
                     decidim_assemblies.assemblies_path,
-                    position: 2.5,
-                    if: Decidim::Assembly.where(organization: current_organization).published.any?,
+                    position: 2.2,
+                    if: OrganizationPublishedAssemblies.new(current_organization, current_user).any?,
                     active: :inclusive
         end
       end
@@ -111,9 +111,7 @@ module Decidim
       end
 
       initializer "decidim_assemblies.query_extensions" do
-        Decidim::Api::QueryType.define do
-          QueryExtensions.define(self)
-        end
+        Decidim::Api::QueryType.include Decidim::Assemblies::QueryExtensions
       end
     end
   end

data/lib/decidim/assemblies/participatory_space.rb

@@ -55,15 +55,15 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
 
     2.times do |n|
       params = {
-        title: Decidim::Faker::Localized.sentence(5),
-        slug: Faker::Internet.unique.slug(nil, "-"),
-        subtitle: Decidim::Faker::Localized.sentence(2),
+        title: Decidim::Faker::Localized.sentence(word_count: 5),
+        slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
+        subtitle: Decidim::Faker::Localized.sentence(word_count: 2),
         hashtag: "##{Faker::Lorem.word}",
         short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.sentence(3)
+          Decidim::Faker::Localized.sentence(word_count: 3)
         end,
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
         hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
@@ -71,17 +71,17 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         promoted: true,
         published_at: 2.weeks.ago,
         meta_scope: Decidim::Faker::Localized.word,
-        developer_group: Decidim::Faker::Localized.sentence(1),
-        local_area: Decidim::Faker::Localized.sentence(2),
-        target: Decidim::Faker::Localized.sentence(3),
-        participatory_scope: Decidim::Faker::Localized.sentence(1),
-        participatory_structure: Decidim::Faker::Localized.sentence(2),
+        developer_group: Decidim::Faker::Localized.sentence(word_count: 1),
+        local_area: Decidim::Faker::Localized.sentence(word_count: 2),
+        target: Decidim::Faker::Localized.sentence(word_count: 3),
+        participatory_scope: Decidim::Faker::Localized.sentence(word_count: 1),
+        participatory_structure: Decidim::Faker::Localized.sentence(word_count: 2),
         scope: n.positive? ? Decidim::Scope.reorder(Arel.sql("RANDOM()")).first : nil,
         purpose_of_action: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         composition: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         assembly_type: Decidim::AssembliesType.create!(organization: organization, title: Decidim::Faker::Localized.word),
         creation_date: 1.day.from_now,
@@ -90,13 +90,13 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         duration: 2.days.from_now,
         included_at: 5.days.from_now,
         closing_date: 5.days.from_now,
-        closing_date_reason: Decidim::Faker::Localized.sentence(3),
+        closing_date_reason: Decidim::Faker::Localized.sentence(word_count: 3),
         internal_organisation: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         is_transparent: true,
         special_features: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         twitter_handler: Faker::Lorem.word,
         facebook_handler: Faker::Lorem.word,
@@ -138,15 +138,15 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
       end
 
       child = Decidim::Assembly.create!(
-        title: Decidim::Faker::Localized.sentence(5),
-        slug: Faker::Internet.unique.slug(nil, "-"),
-        subtitle: Decidim::Faker::Localized.sentence(2),
+        title: Decidim::Faker::Localized.sentence(word_count: 5),
+        slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
+        subtitle: Decidim::Faker::Localized.sentence(word_count: 2),
         hashtag: "##{Faker::Lorem.word}",
         short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.sentence(3)
+          Decidim::Faker::Localized.sentence(word_count: 3)
         end,
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
         hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
@@ -154,11 +154,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         promoted: true,
         published_at: 2.weeks.ago,
         meta_scope: Decidim::Faker::Localized.word,
-        developer_group: Decidim::Faker::Localized.sentence(1),
-        local_area: Decidim::Faker::Localized.sentence(2),
-        target: Decidim::Faker::Localized.sentence(3),
-        participatory_scope: Decidim::Faker::Localized.sentence(1),
-        participatory_structure: Decidim::Faker::Localized.sentence(2),
+        developer_group: Decidim::Faker::Localized.sentence(word_count: 1),
+        local_area: Decidim::Faker::Localized.sentence(word_count: 2),
+        target: Decidim::Faker::Localized.sentence(word_count: 3),
+        participatory_scope: Decidim::Faker::Localized.sentence(word_count: 1),
+        participatory_structure: Decidim::Faker::Localized.sentence(word_count: 2),
         scope: n.positive? ? Decidim::Scope.reorder(Arel.sql("RANDOM()")).first : nil,
         parent: assembly
       )
@@ -167,37 +167,37 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         current_assembly.add_to_index_as_search_resource
         attachment_collection = Decidim::AttachmentCollection.create!(
           name: Decidim::Faker::Localized.word,
-          description: Decidim::Faker::Localized.sentence(5),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           collection_for: current_assembly
         )
 
         Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           attachment_collection: attachment_collection,
           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),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           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),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: current_assembly,
           file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
 
         2.times do
           Decidim::Category.create!(
-            name: Decidim::Faker::Localized.sentence(5),
+            name: Decidim::Faker::Localized.sentence(word_count: 5),
             description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(3)
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
             end,
             participatory_space: current_assembly
           )
@@ -207,9 +207,9 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
           Decidim::AssemblyMember.create!(
             full_name: Faker::Name.name,
             gender: Faker::Lorem.word,
-            birthday: Faker::Date.birthday(18, 65),
+            birthday: Faker::Date.birthday(min_age: 18, max_age: 65),
             birthplace: Faker::Demographic.demonym,
-            designation_date: Faker::Date.between(1.year.ago, 1.month.ago),
+            designation_date: Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
             designation_mode: Faker::Lorem.word,
             position: position,
             position_other: position == "other" ? Faker::Job.position : nil,
@@ -220,9 +220,9 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         Decidim::AssemblyMember.create!(
           user: current_assembly.organization.users.first,
           gender: Faker::Lorem.word,
-          birthday: Faker::Date.birthday(18, 65),
+          birthday: Faker::Date.birthday(min_age: 18, max_age: 65),
           birthplace: Faker::Demographic.demonym,
-          designation_date: Faker::Date.between(1.year.ago, 1.month.ago),
+          designation_date: Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
           designation_mode: Faker::Lorem.word,
           position: "other",
           position_other: Faker::Job.position,

data/lib/decidim/assemblies/query_extensions.rb

@@ -10,31 +10,50 @@ module Decidim
       # type - A GraphQL::BaseType to extend.
       #
       # Returns nothing.
-      def self.define(type)
-        type.field :assembliesTypes do
-          type !types[AssembliesTypeType]
-          description "Lists all assemblies types"
+      def self.included(type)
+        type.field :assemblies_types, [AssembliesTypeType], null: false, description: "Lists all assemblies types"
 
-          resolve lambda { |_obj, _args, ctx|
-            Decidim::AssembliesType.where(
-              organization: ctx[:current_organization]
-            )
-          }
+        type.field :assemblies_type, AssembliesTypeType, null: true, description: "Finds an assemblies type group" do
+          argument :id, GraphQL::Types::ID, description: "The ID of the Assemblies type", required: true
+        end
+        type.field :assemblies,
+                   [Decidim::Assemblies::AssemblyType],
+                   null: true,
+                   description: "Lists all assemblies" do
+          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument let's you filter the results", required: false
+          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument let's you order the results", required: false
         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]
-            )
-          }
+        type.field :assembly,
+                   Decidim::Assemblies::AssemblyType,
+                   null: true,
+                   description: "Finds a assembly" do
+          argument :id, GraphQL::Types::ID, "The ID of the participatory space", required: false
         end
       end
+
+      def assemblies_types(*)
+        Decidim::AssembliesType.where(
+          organization: context[:current_organization]
+        )
+      end
+
+      def assemblies_type(id:)
+        Decidim::AssembliesType.find_by(
+          organization: context[:current_organization],
+          id: id
+        )
+      end
+
+      def assemblies(filter: {}, order: {})
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :assemblies }.first
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+      end
+
+      def assembly(id: nil)
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :assemblies }.first
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
+      end
     end
   end
 end

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

@@ -5,7 +5,7 @@ require "decidim/dev"
 
 FactoryBot.define do
   sequence(:assembly_slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}"
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}"
   end
 
   factory :assemblies_setting, class: "Decidim::AssembliesSetting" do
@@ -53,6 +53,7 @@ FactoryBot.define do
     instagram_handler { "others" }
     youtube_handler { "others" }
     github_handler { "others" }
+    weight { 1 }
 
     trait :with_type do
       assembly_type { create :assemblies_type, organization: organization }
@@ -162,14 +163,14 @@ FactoryBot.define do
 
     full_name { Faker::Name.name }
     gender { Faker::Lorem.word }
-    birthday { Faker::Date.birthday(18, 65) }
+    birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
     birthplace { Faker::Lorem.word }
     position { Decidim::AssemblyMember::POSITIONS.first }
-    designation_date { Faker::Date.between(1.year.ago, 1.month.ago) }
+    designation_date { Faker::Date.between(from: 1.year.ago, to: 1.month.ago) }
     designation_mode { Faker::Lorem.word }
 
     trait :ceased do
-      ceased_date { Faker::Date.between(1.day.ago, 5.days.ago) }
+      ceased_date { Faker::Date.between(from: 1.day.ago, to: 5.days.ago) }
     end
 
     trait :with_user do