decidim-assemblies 0.23.3 → 0.24.1

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

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -82,6 +82,10 @@ files:
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form_cell.rb
+- app/cells/decidim/assemblies/statistic/show.erb
+- app/cells/decidim/assemblies/statistic_cell.rb
+- app/cells/decidim/assemblies/statistics/show.erb
+- app/cells/decidim/assemblies/statistics_cell.rb
 - app/cells/decidim/assembly_activity_cell.rb
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assemblies_type.rb
@@ -121,6 +125,8 @@ files:
 - app/controllers/decidim/assemblies/admin/components_controller.rb
 - app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
 - app/controllers/decidim/assemblies/admin/exports_controller.rb
+- app/controllers/decidim/assemblies/admin/imports_controller.rb
+- app/controllers/decidim/assemblies/admin/moderations/reports_controller.rb
 - app/controllers/decidim/assemblies/admin/moderations_controller.rb
 - app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
 - app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb
@@ -137,6 +143,7 @@ files:
 - app/forms/decidim/assemblies/admin/assembly_import_form.rb
 - app/forms/decidim/assemblies/admin/assembly_member_form.rb
 - app/forms/decidim/assemblies/admin/assembly_user_role_form.rb
+- app/helpers/decidim/assemblies/admin/assemblies_admin_menu_helper.rb
 - app/helpers/decidim/assemblies/admin/assemblies_helper.rb
 - app/helpers/decidim/assemblies/assemblies_helper.rb
 - app/helpers/decidim/assemblies/filter_assemblies_helper.rb
@@ -177,9 +184,6 @@ files:
 - app/serializers/decidim/assemblies/assembly_importer.rb
 - app/serializers/decidim/assemblies/assembly_serializer.rb
 - app/services/decidim/assemblies/assembly_search.rb
-- app/types/decidim/assemblies/assemblies_type_type.rb
-- app/types/decidim/assemblies/assembly_member_type.rb
-- app/types/decidim/assemblies/assembly_type.rb
 - app/views/decidim/assemblies/_assembly.html.erb
 - app/views/decidim/assemblies/_filter_by_type.html.erb
 - app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -208,7 +212,6 @@ files:
 - app/views/decidim/assemblies/assemblies/_nav_breadcumb.html.erb
 - app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb
 - app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb
-- app/views/decidim/assemblies/assemblies/_statistics.html.erb
 - app/views/decidim/assemblies/assemblies/index.html.erb
 - app/views/decidim/assemblies/assemblies/index.js.erb
 - app/views/decidim/assemblies/assemblies/show.html.erb
@@ -306,13 +309,19 @@ files:
 - db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb
 - db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb
 - db/migrate/20200430202456_create_decidim_assemblies_settings.rb
+- db/migrate/20210204152393_add_weight_field_to_assembly.rb
+- db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
 - db/seeds/homepage_image.jpg
+- lib/decidim/api/assemblies_type_type.rb
+- lib/decidim/api/assembly_member_type.rb
+- lib/decidim/api/assembly_type.rb
 - lib/decidim/assemblies.rb
 - lib/decidim/assemblies/admin.rb
 - lib/decidim/assemblies/admin_engine.rb
+- lib/decidim/assemblies/api.rb
 - lib/decidim/assemblies/engine.rb
 - lib/decidim/assemblies/participatory_space.rb
 - lib/decidim/assemblies/query_extensions.rb
@@ -330,14 +339,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim assemblies module