update decidim fix comparison branch

Gemfile

@@ -15,6 +15,7 @@ gem "decidim-templates", DECIDIM_VERSION
 # gem "decidim-term_customizer"
 gem "decidim-analytics", git: "https://github.com/digidemlab/decidim-module-analytics"
 gem "decidim-calendar"
+gem "decidim-conferences", DECIDIM_VERSION
 gem "decidim-direct_verifications"
 gem "decidim-extra_user_fields", git: "https://github.com/PopulateTools/decidim-module-extra_user_fields"
 

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/Platoniq/decidim
-  revision: 8851e320b955bbfc11dd0b67546749fc167e2774
+  revision: df1655b969119ba7554be02005339c8e31ef230b
   tag: fix/comparisons
   specs:
     decidim (0.24.2)
@@ -61,6 +61,11 @@ GIT
       decidim-core (= 0.24.2)
       jquery-rails (~> 4.4)
       redcarpet (~> 3.5, >= 3.5.1)
+    decidim-conferences (0.24.2)
+      decidim-core (= 0.24.2)
+      decidim-meetings (= 0.24.2)
+      wicked_pdf (~> 1.4)
+      wkhtmltopdf-binary (~> 0.12)
     decidim-core (0.24.2)
       active_link_to (~> 1.0)
       anchored (~> 1.1)
@@ -461,7 +466,7 @@ GEM
       rest-client (>= 1.6)
     eventmachine (1.2.7)
     eventmachine_httpserver (0.2.1)
-    excon (0.81.0)
+    excon (0.82.0)
     execjs (2.7.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
@@ -470,16 +475,20 @@ GEM
       railties (>= 3.0.0)
     faker (2.17.0)
       i18n (>= 1.6, < 2)
-    faraday (1.4.1)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.1.0)
-    ffi (1.15.0)
+    ffi (1.15.1)
     figaro (1.2.0)
       thor (>= 0.14.0, < 2)
     file_validators (2.3.0)
@@ -509,7 +518,7 @@ GEM
     graphiql-rails (1.4.11)
       railties
       sprockets-rails
-    graphql (1.12.9)
+    graphql (1.12.10)
     hashdiff (1.0.1)
     hashie (4.1.0)
     highline (2.0.3)
@@ -611,7 +620,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.5.7)
     nobspw (0.6.2)
-    nokogiri (1.11.3)
+    nokogiri (1.11.6)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth (0.5.6)
@@ -833,7 +842,7 @@ GEM
       coffee-rails
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
-    spreadsheet (1.2.8)
+    spreadsheet (1.2.9)
       ruby-ole
     spring (2.1.0)
     spring-watcher-listen (2.0.1)
@@ -894,11 +903,11 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.12.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (1.0.0)
@@ -928,6 +937,7 @@ DEPENDENCIES
   decidim!
   decidim-analytics!
   decidim-calendar
+  decidim-conferences!
   decidim-decidim_awesome (~> 0.7.0)
   decidim-dev!
   decidim-direct_verifications

config/initializers/decidim.rb

@@ -35,12 +35,11 @@
   # Map and Geocoder configuration
   #
   # == HERE Maps ==
-  #  config.maps = {
-  #    provider: :here,
-  #    api_key: Rails.application.secrets.maps[:api_key],
-  #   static: { url: "https://image.maps.ls.hereapi.com/mia/1.6/mapview" }
-  #    static: false,
-  #  }
+  config.maps = {
+    provider: :here,
+    api_key: Rails.application.secrets.maps[:api_key],
+    static: { url: "https://image.maps.ls.hereapi.com/mia/1.6/mapview" }
+  }
   #
   # == OpenStreetMap (OSM) services ==
   # To use the OSM map service providers, you will need a service provider for

db/migrate/20210528030401_add_conferences.decidim_conferences.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20180626151505)
+
+class AddConferences < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences do |t|
+      t.jsonb :title, null: false
+      t.jsonb :slogan, null: false
+      t.string :slug, null: false
+      t.string :hashtag
+      t.string :reference
+      t.string :location
+      t.integer :decidim_organization_id,
+                foreign_key: true,
+                index: { name: "index_decidim_conferences_on_decidim_organization_id" }
+
+      t.jsonb :short_description, null: false
+      t.jsonb :description, null: false
+      t.string :hero_image
+      t.string :banner_image
+      t.boolean :promoted, default: false
+      t.datetime :published_at
+      t.jsonb :objectives, null: false
+      t.boolean :show_statistics, default: false
+      t.date :start_date
+      t.date :end_date
+      t.boolean :scopes_enabled, null: false, default: true
+      t.integer :decidim_scope_id
+
+      t.boolean :registrations_enabled, null: false, default: false
+      t.integer :available_slots, null: false, default: 0
+      t.jsonb :registration_terms
+
+      t.index [:decidim_organization_id, :slug],
+              name: "index_unique_conference_slug_and_organization",
+              unique: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20210528030402_add_conference_user_roles.decidim_conferences.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20180626152015)
+
+class AddConferenceUserRoles < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conference_user_roles do |t|
+      t.integer :decidim_user_id
+      t.integer :decidim_conference_id
+      t.string :role
+      t.timestamps
+    end
+
+    add_index :decidim_conference_user_roles,
+              [:decidim_conference_id, :decidim_user_id, :role],
+              unique: true,
+              name: "index_unique_user_and_conference_role"
+  end
+end

db/migrate/20210528030403_add_conference_speakers.decidim_conferences.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20180702084256)
+
+class AddConferenceSpeakers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conference_speakers do |t|
+      t.references :decidim_conference, index: true
+      t.string :full_name
+      t.jsonb :position
+      t.jsonb :affiliation
+      t.string :twitter_handle
+      t.jsonb :short_bio
+      t.string :personal_url
+      t.string :avatar
+      t.references :decidim_user, index: { name: "index_decidim_conference_speaker_on_decidim_user_id" }
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20210528030404_add_conference_invites.decidim_conferences.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20180706104306)
+
+class AddConferenceInvites < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences_conference_invites do |t|
+      t.references :decidim_user, null: false, index: true
+      t.references :decidim_conference, null: false,
+                                        index: { name: "idx_decidim_conferences_invites_on_conference_id" }
+      t.datetime :sent_at
+      t.datetime :accepted_at
+      t.datetime :rejected_at
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20210528030405_add_conference_registrations.decidim_conferences.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20180706104825)
+
+class AddConferenceRegistrations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences_conference_registrations do |t|
+      t.references :decidim_user, null: false, index: { name: "index_decidim_conferences_registrations_on_decidim_user_id" }
+      t.references :decidim_conference, null: false, index: { name: "index_conferences_registrations_on_decidim_conference" }
+
+      t.timestamps
+    end
+
+    add_index :decidim_conferences_conference_registrations,
+              [:decidim_user_id, :decidim_conference_id],
+              unique: true,
+              name: "decidim_conferences_registrations_user_conference_unique"
+  end
+end

db/migrate/20210528030406_add_conferences_partner.decidim_conferences.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181004144411)
+
+class AddConferencesPartner < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences_partners do |t|
+      t.references :decidim_conference, index: true
+      t.string :name, null: false
+      t.string :partner_type, null: false
+      t.integer :weight, null: false, default: 0
+      t.string :link
+      t.string :logo, null: false
+
+      t.timestamps
+    end
+
+    add_index :decidim_conferences_partners, [:weight, :partner_type]
+  end
+end

db/migrate/20210528030407_add_relation_between_speaker_and_meeting.decidim_conferences.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181010133930)
+
+class AddRelationBetweenSpeakerAndMeeting < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conference_speaker_conference_meetings do |t|
+      t.belongs_to :conference_speaker, null: false, index: { name: "index_meetings_on_decidim_conference_speaker_id" }
+      t.belongs_to :conference_meeting, null: false, index: { name: "index_meetings_on_decidim_conference_meeting_id" }
+    end
+  end
+end

db/migrate/20210528030408_add_conference_media_link.decidim_conferences.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181015100301)
+
+class AddConferenceMediaLink < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences_media_links do |t|
+      t.references :decidim_conference, index: true
+      t.jsonb :title, null: false
+      t.string :link, null: false
+      t.date :date
+      t.integer :weight, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20210528030409_add_conference_registration_types.decidim_conferences.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181023142325)
+
+class AddConferenceRegistrationTypes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences_registration_types do |t|
+      t.references :decidim_conference, index: { name: "idx_registration_types_on_decidim_conference_id" }
+      t.jsonb :title, null: false
+      t.jsonb :description, null: false
+      t.decimal :price, null: false, default: 0, precision: 8, scale: 2
+      t.integer :weight, null: false, default: 0
+      t.datetime :published_at, index: true
+
+      t.timestamps
+    end
+
+    create_table :decidim_conferences_conference_meeting_registration_types do |t|
+      t.belongs_to :registration_type, null: false, index: { name: "index_meetings_on_decidim_registration_type_id" }
+      t.belongs_to :conference_meeting, null: false, index: { name: "index_registrations_on_decidim_conference_meeting_id" }
+    end
+  end
+end

db/migrate/20210528030410_add_reference_registration_type_to_conference_registration.decidim_conferences.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181030090202)
+
+class AddReferenceRegistrationTypeToConferenceRegistration < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_conferences_conference_registrations, :decidim_conference_registration_type_id,
+               :integer, index: { name: "idx_conference_registration_to_registration_type_id" }
+    add_column :decidim_conferences_conference_registrations, :confirmed_at, :datetime, index: true
+  end
+end

db/migrate/20210528030411_add_registration_type_to_conference_invite.decidim_conferences.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181030153614)
+
+class AddRegistrationTypeToConferenceInvite < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_conferences_conference_invites, :decidim_conference_registration_type_id,
+               :integer, index: { name: "idx_conference_invite_to_registration_type_id" }
+  end
+end

db/migrate/20210528030412_add_diploma_fields_to_conference.decidim_conferences.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181106092826)
+
+class AddDiplomaFieldsToConference < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_conferences, :signature_name, :string
+    add_column :decidim_conferences, :signature, :string
+    add_column :decidim_conferences, :main_logo, :string
+    add_column :decidim_conferences, :sign_date, :date, index: true
+    add_column :decidim_conferences, :diploma_sent_at, :datetime, index: true
+  end
+end

db/migrate/20210528030413_make_price_optional_conference_registration_type.decidim_conferences.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20181123124424)
+
+class MakePriceOptionalConferenceRegistrationType < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null(:decidim_conferences_registration_types, :price, true)
+  end
+end

db/migrate/20210528030414_index_foreign_keys_in_decidim_conferences.decidim_conferences.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20200320105913)
+
+class IndexForeignKeysInDecidimConferences < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_conferences, :decidim_scope_id
+  end
+end

db/migrate/20210528030415_index_foreign_keys_in_decidim_conferences_conference_invites.decidim_conferences.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20200320105914)
+
+class IndexForeignKeysInDecidimConferencesConferenceInvites < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_conferences_conference_invites, :decidim_conference_registration_type_id, name: "ixd_conferences_on_registration_type_id"
+  end
+end

db/migrate/20210528030416_index_foreign_keys_in_decidim_conferences_conference_registrations.decidim_conferences.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# This migration comes from decidim_conferences (originally 20200320105915)
+
+class IndexForeignKeysInDecidimConferencesConferenceRegistrations < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_conferences_conference_registrations, :decidim_conference_registration_type_id, name: "idx_conferences_registrations_on_registration_type_id"
+  end
+end