decidim-conferences 0.23.3 → 0.24.0.rc1

data/lib/decidim/conferences/api.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    autoload :ConferenceType, "decidim/api/conference_type"
+    autoload :ConferenceMediaLinkType, "decidim/api/conference_media_link_type"
+    autoload :ConferencePartnerType, "decidim/api/conference_partner_type"
+    autoload :ConferenceSpeakerType, "decidim/api/conference_speaker_type"
+  end
+end

data/lib/decidim/conferences/engine.rb

@@ -5,6 +5,8 @@ require "active_support/all"
 require "decidim/core"
 require "wicked_pdf"
 
+require "decidim/conferences/query_extensions"
+
 module Decidim
   module Conferences
     # Decidim's Conferences Rails Engine.
@@ -67,7 +69,7 @@ module Decidim
         Decidim.menu :menu do |menu|
           menu.item I18n.t("menu.conferences", scope: "decidim"),
                     decidim_conferences.conferences_path,
-                    position: 6,
+                    position: 2.8,
                     if: Decidim::Conference.where(organization: current_organization).published.any?,
                     active: :inclusive
         end
@@ -79,6 +81,10 @@ module Decidim
           content_block.public_name_key = "decidim.conferences.content_blocks.highlighted_conferences.name"
         end
       end
+
+      initializer "decidim_conferences.query_extensions" do
+        Decidim::Api::QueryType.include Decidim::Conferences::QueryExtensions
+      end
     end
   end
 end

data/lib/decidim/conferences/participatory_space.rb

@@ -53,15 +53,15 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
 
     2.times do |_n|
       conference = Decidim::Conference.create!(
-        title: Decidim::Faker::Localized.sentence(5),
-        slogan: Decidim::Faker::Localized.sentence(2),
-        slug: Faker::Internet.unique.slug(nil, "-"),
+        title: Decidim::Faker::Localized.sentence(word_count: 5),
+        slogan: Decidim::Faker::Localized.sentence(word_count: 2),
+        slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
         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
@@ -69,14 +69,14 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
         promoted: true,
         published_at: 2.weeks.ago,
         objectives: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         start_date: Time.current,
         end_date: 2.months.from_now.at_midnight,
         registrations_enabled: [true, false].sample,
         available_slots: (10..50).step(10).to_a.sample,
         registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end
       )
       conference.add_to_index_as_search_resource
@@ -106,37 +106,37 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
 
       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: conference
       )
 
       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: conference,
         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: conference,
         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: conference,
         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: conference
         )
@@ -147,9 +147,9 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
           user: conference.organization.users.sample,
           full_name: Faker::Name.name,
           position: Decidim::Faker::Localized.word,
-          affiliation: Decidim::Faker::Localized.paragraph(3),
+          affiliation: Decidim::Faker::Localized.paragraph(sentence_count: 3),
           short_bio: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
           twitter_handle: Faker::Twitter.unique.screen_name,
           personal_url: Faker::Internet.url,
@@ -161,7 +161,7 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
         4.times do
           Decidim::Conferences::Partner.create!(
             name: Faker::Name.name,
-            weight: Faker::Number.between(1, 10),
+            weight: Faker::Number.between(from: 1, to: 10),
             link: Faker::Internet.url,
             partner_type: type,
             conference: conference,
@@ -172,20 +172,20 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
 
       5.times do
         Decidim::Conferences::MediaLink.create!(
-          title: Decidim::Faker::Localized.sentence(2),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
           link: Faker::Internet.url,
           date: Date.current,
-          weight: Faker::Number.between(1, 10),
+          weight: Faker::Number.between(from: 1, to: 10),
           conference: conference
         )
       end
 
       5.times do
         Decidim::Conferences::RegistrationType.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          weight: Faker::Number.between(1, 10),
-          price: Faker::Number.between(1, 300),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
+          weight: Faker::Number.between(from: 1, to: 10),
+          price: Faker::Number.between(from: 1, to: 300),
           published_at: 2.weeks.ago,
           conference: conference
         )

data/lib/decidim/conferences/query_extensions.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # 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.included(type)
+        type.field :conferences,
+                   [Decidim::Conferences::ConferenceType],
+                   null: true,
+                   description: "Lists all conferences" do
+          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument lets you filter the results", required: false
+          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument lets you order the results", required: false
+        end
+
+        type.field :conference,
+                   Decidim::Conferences::ConferenceType,
+                   null: true,
+                   description: "Finds a conference" do
+          argument :id, GraphQL::Types::ID, "The ID of the participatory space", required: false
+        end
+      end
+
+      def conferences(filter: {}, order: {})
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :conferences }.first
+
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+      end
+
+      def conference(id: nil)
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :conferences }.first
+
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ require "decidim/dev"
 
 FactoryBot.define do
   sequence(:conference_slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}"
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}"
   end
 
   factory :conference, class: "Decidim::Conference" do
@@ -19,7 +19,7 @@ FactoryBot.define do
     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 }
-    location { Faker::Lorem.sentence(3) }
+    location { Faker::Lorem.sentence(word_count: 3) }
     show_statistics { true }
     start_date { 1.month.ago }
     end_date { 1.month.ago + 3.days }
@@ -133,8 +133,8 @@ FactoryBot.define do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     published_at { Time.current }
-    price { Faker::Number.between(1, 300) }
-    weight { Faker::Number.between(1, 10) }
+    price { Faker::Number.between(from: 1, to: 300) }
+    weight { Faker::Number.between(from: 1, to: 10) }
 
     trait :unpublished do
       published_at { nil }
@@ -181,7 +181,7 @@ FactoryBot.define do
     conference
 
     name { Faker::Name.name }
-    weight { Faker::Number.between(1, 10) }
+    weight { Faker::Number.between(from: 1, to: 10) }
     link { Faker::Internet.url }
     partner_type { "main_promotor" }
     logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
@@ -198,7 +198,7 @@ FactoryBot.define do
   factory :media_link, class: "Decidim::Conferences::MediaLink" do
     conference
     title { generate_localized_title }
-    weight { Faker::Number.between(1, 10) }
+    weight { Faker::Number.between(from: 1, to: 10) }
     link { Faker::Internet.url }
     date { 1.month.ago }
   end

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.23.3"
+      "0.24.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com
@@ -186,7 +186,9 @@ files:
 - app/controllers/decidim/conferences/admin/conferences_controller.rb
 - app/controllers/decidim/conferences/admin/diplomas_controller.rb
 - app/controllers/decidim/conferences/admin/exports_controller.rb
+- app/controllers/decidim/conferences/admin/imports_controller.rb
 - app/controllers/decidim/conferences/admin/media_links_controller.rb
+- app/controllers/decidim/conferences/admin/moderations/reports_controller.rb
 - app/controllers/decidim/conferences/admin/moderations_controller.rb
 - app/controllers/decidim/conferences/admin/partners_controller.rb
 - app/controllers/decidim/conferences/admin/registration_type_publications_controller.rb
@@ -268,10 +270,6 @@ files:
 - app/serializers/decidim/conferences/conference_registration_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
-- app/types/decidim/conferences/conference_media_link_type.rb
-- app/types/decidim/conferences/conference_partner_type.rb
-- app/types/decidim/conferences/conference_speaker_type.rb
-- app/types/decidim/conferences/conference_type.rb
 - app/uploaders/decidim/conferences/diploma_uploader.rb
 - app/uploaders/decidim/conferences/partner_logo_uploader.rb
 - app/views/decidim/conference_speakers/_conference_speaker.html.erb
@@ -425,11 +423,17 @@ files:
 - db/seeds/city2.jpeg
 - db/seeds/homepage_image.jpg
 - db/seeds/logo.png
+- lib/decidim/api/conference_media_link_type.rb
+- lib/decidim/api/conference_partner_type.rb
+- lib/decidim/api/conference_speaker_type.rb
+- lib/decidim/api/conference_type.rb
 - lib/decidim/conferences.rb
 - lib/decidim/conferences/admin.rb
 - lib/decidim/conferences/admin_engine.rb
+- lib/decidim/conferences/api.rb
 - lib/decidim/conferences/engine.rb
 - lib/decidim/conferences/participatory_space.rb
+- lib/decidim/conferences/query_extensions.rb
 - lib/decidim/conferences/test/factories.rb
 - lib/decidim/conferences/version.rb
 homepage: https://github.com/decidim/decidim
@@ -444,14 +448,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'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim conferences module

data/app/types/decidim/conferences/conference_media_link_type.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Conferences
-    # This type represents a conference.
-    ConferenceMediaLinkType = GraphQL::ObjectType.define do
-      name "ConferenceMediaLink"
-      description "A conference media link"
-
-      field :id, !types.ID, "Internal ID for this media link"
-      field :title, Decidim::Core::TranslatedFieldType, "Title for this media link"
-      field :link, types.String, "URL for this media link"
-      field :date, Decidim::Core::DateType, "Relevant date for the media link"
-      field :weight, types.Int, "Order of appearance in which it should be presented"
-      field :createdAt, Decidim::Core::DateTimeType, "The time this entry was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "The time this entry was updated", property: :updated_at
-    end
-  end
-end

data/app/types/decidim/conferences/conference_partner_type.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Conferences
-    # This type represents a conference.
-    ConferencePartnerType = GraphQL::ObjectType.define do
-      name "ConferencePartner"
-      description "A conference partner"
-
-      field :id, !types.ID, "ID of the resource"
-      field :name, types.String, "Partner name"
-      field :partnerType, types.String, "Partner type", property: :partner_type
-      field :weight, types.Int, "Order of appearance in which it should be presented"
-      field :link, types.String, "Relevant URL for this partner"
-      field :logo, types.String, "Link to the partner's logo"
-      field :createdAt, Decidim::Core::DateTimeType, "The time this partner was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "The time this partner was updated", property: :updated_at
-    end
-  end
-end