decidim-challenges 0.6.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6741d5f3e2e1eec682344b9ed01dc6ea9b1c98c60c7c239eecd50b39b7b28b
-  data.tar.gz: 724e8cb63ca6ee7cb8e13eae897850fa2cad889246f6894e36118d92e3997b3b
+  metadata.gz: 95e745fe3d49e802946f403938a6b11603b9110cb08f81407c8fa5810c51dfbf
+  data.tar.gz: a24fcfa528d1023b365122e17ea937da6f0e5fb807b5b30fcfad2feed0acdb43
 SHA512:
-  metadata.gz: 372cbf8488a77d85974463a7b992860b2c5aa54e1bb7bbd46d1971d5e1a38f6ff1b05a5e5bdbab35a9df562ebcf9466b900531e912e4b5e313068e34e59cbf57
-  data.tar.gz: d52802d6d03a1fceb5dee5dcbfacacba2a37ac54eedc4efc45435e7a1bb12ff9b3664c9ffa8bc06701f44ede84a4fc95faff62e7a3dbf3667556d6907cd0ffd2
+  metadata.gz: 24385b67ade44975efb0eb9cea8d2f976e6dbc14f66a23dc6cbb309fb932bacfdd5ca8496309032482c142c9f3e6e0a71f31b5339e3adab78d3b93879dc68771
+  data.tar.gz: 0e748da2b962e8e22c88526c6f608d6f72452c10800a6d88e4a791f91332e0896c2d6b3c719c4fbf2eb549119d11e8f41313fba6648984c51f625a0bc653229e

data/app/cells/decidim/solutions/solution_g/show.erb

@@ -7,7 +7,7 @@
     <% end %>
     <div class="card__list-text">
       <%= description %>
-      <% if resource_sdg %>
+      <% if has_sdgs? %>
         <div class="card__sdg">
           <div class="card_text--sdg--image">
             <div class="ods challenges">

data/app/cells/decidim/solutions/solution_g_cell.rb

@@ -6,7 +6,9 @@ module Decidim
     # for an given instance of a Solution
     class SolutionGCell < Decidim::CardGCell
       include ActiveSupport::NumberHelper
+      include Decidim::Solutions::SolutionsHelper
       include Decidim::Sdgs::SdgsHelper
+      include Decidim::Solutions::SolutionCellsHelper
 
       private
 

data/app/commands/decidim/challenges/survey_challenge.rb

@@ -41,7 +41,7 @@ module Decidim
       def answer_questionnaire
         return unless questionnaire?
 
-        Decidim::Forms::AnswerQuestionnaire.call(survey_form, user, challenge.questionnaire) do
+        Decidim::Forms::AnswerQuestionnaire.call(survey_form, challenge.questionnaire) do
           on(:invalid) do
             raise ActiveRecord::Rollback
           end
@@ -51,7 +51,7 @@ module Decidim
       def create_survey
         @survey = Decidim::Challenges::Survey.create!(
           challenge:,
-          user:
+          author: user
         )
       end
 
@@ -60,7 +60,10 @@ module Decidim
       end
 
       def can_answer_survey?
-        Decidim::Challenges::Survey.where(decidim_user_id: user, decidim_challenge_id: challenge).none?
+        Decidim::Challenges::Survey.where(
+          decidim_author_id: user.id,
+          decidim_challenge_id: challenge.id
+        ).none?
       end
     end
   end

data/app/forms/decidim/solutions/solutions_form.rb

@@ -32,7 +32,7 @@ module Decidim
         self.description = translated_attribute(model.description)
 
         self.documents = model.attachments
-        return unless model.categorization
+        nil unless model.categorization
       end
 
       # Finds the Challenge from the given decidim_challenges_challenge_id

data/app/helpers/decidim/solutions/solution_cells_helper.rb

@@ -13,6 +13,7 @@ module Decidim
       include Decidim::ResourceReferenceHelper
       include Decidim::TranslatableAttributes
       include Decidim::CardHelper
+      include WithSdgs
 
       delegate :title, :state, :published_state?, :withdrawn?, :amendable?, :emendation?, to: :model
 

data/app/models/decidim/challenges/challenge.rb

@@ -25,7 +25,7 @@ module Decidim
       has_many :surveys, class_name: "Decidim::Challenges::Survey", foreign_key: "decidim_challenge_id", dependent: :destroy
 
       VALID_STATES = [:proposal, :execution, :finished].freeze
-      enum state: VALID_STATES
+      enum :state, VALID_STATES
 
       has_many :problems,
                class_name: "Decidim::Problems::Problem",

data/app/models/decidim/challenges/survey.rb

@@ -7,9 +7,9 @@ module Decidim
       include Decidim::DownloadYourData
 
       belongs_to :challenge, foreign_key: "decidim_challenge_id", class_name: "Decidim::Challenges::Challenge"
-      belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
 
-      validates :user, uniqueness: { scope: :challenge }
+      validates :decidim_author_id, uniqueness: { scope: :decidim_challenge_id }
 
       def self.export_serializer
         Decidim::Challenges::DownloadYourDataSurveySerializer

data/app/models/decidim/problems/problem.rb

@@ -16,7 +16,7 @@ module Decidim
       include Decidim::Randomable
 
       VALID_STATES = [:proposal, :execution, :finished].freeze
-      enum state: VALID_STATES
+      enum :state, VALID_STATES
 
       component_manifest_name "problems"
 

data/app/serializers/decidim/challenges/survey_serializer.rb

@@ -8,9 +8,9 @@ module Decidim
       def serialize
         {
           id: resource.id,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email,
+          author: {
+            name: resource.author.name,
+            email: resource.author.email,
           },
           survey_form_answers: serialize_answers,
         }
@@ -20,7 +20,7 @@ module Decidim
 
       def serialize_answers
         questions = resource.challenge.questionnaire.questions
-        answers = resource.challenge.questionnaire.answers.where(user: resource.user)
+        answers = resource.challenge.questionnaire.answers.where(user: resource.author)
         questions.each_with_index.inject({}) do |serialized, (question, idx)|
           answer = answers.find_by(question:)
           serialized.update("#{idx + 1}. #{translated_attribute(question.body)}" => normalize_body(answer))

data/app/serializers/decidim/solutions/solution_serializer.rb

@@ -11,11 +11,13 @@ module Decidim
 
       def serialize
         {
-          title_label => resource.title[I18n.locale.to_s],
+          title_label => localized(resource.title),
           description_label => sanitized_description,
           status_label => resource&.project_status,
           challenge_label => translated_challenge_title,
           url_label => resource&.project_url,
+          author_name_label => resource.author.name,
+          author_email_label => resource.author.email,
           created_at_label => resource.created_at,
           published_at_label => resource&.published_at,
         }
@@ -23,6 +25,14 @@ module Decidim
 
       private
 
+      def localized(value)
+        if value.is_a?(Hash)
+          value[I18n.locale.to_s] || ""
+        else
+          value.to_s
+        end
+      end
+
       def sanitize(text)
         ActionController::Base.helpers.strip_tags(text)
       end
@@ -55,12 +65,20 @@ module Decidim
         I18n.t("export.published_at", scope: "decidim.solutions.admin.exports").to_s
       end
 
+      def author_name_label
+        I18n.t("export.author_name", scope: "decidim.solutions.admin.exports").to_s
+      end
+
+      def author_email_label
+        I18n.t("export.author_email", scope: "decidim.solutions.admin.exports").to_s
+      end
+
       def translated_challenge_title
         resource&.challenge&.title.present? ? resource&.challenge&.title&.[](I18n.locale.to_s) : ""
       end
 
       def sanitized_description
-        sanitize(resource.description[I18n.locale.to_s])
+        sanitize(localized(resource.description))
       end
     end
   end

data/app/views/decidim/challenges/admin/challenges/edit.html.erb

@@ -11,7 +11,7 @@
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
-      
+
           <% if challenge.published? %>
             <%= link_to t("actions.unpublish", scope: "decidim.challenges.admin"), challenge_publish_path(challenge), method: :delete, class: "button button__sm button__secondary" %>
           <% else %>

data/app/views/decidim/problems/admin/problems/edit.html.erb

@@ -11,7 +11,7 @@
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
-      
+
           <% if problem.published? %>
             <%= link_to t("actions.unpublish", scope: "decidim.problems.admin"), problem_publish_path(problem), method: :delete, class: "button button__sm button__secondary" %>
           <% else %>

data/app/views/decidim/problems/problems/_sidebar_data.html.erb

@@ -36,14 +36,14 @@
     <% if @problem.decidim_sectorial_scope_id.present? %>
       <div class="text-sm flex flex-col items-center gap-1">
         <p class="uppercase text-xs"><%= t("decidim_sectorial_scope_id", scope: "activemodel.attributes.problem") %></p>
-        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_sectorial_scope_id).name  %></p>
+        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_sectorial_scope_id).name %></p>
       </div>
     <% end %>
 
     <% if @problem.decidim_technological_scope_id.present? %>
       <div class="text-sm flex flex-col items-center gap-1">
         <p class="uppercase text-xs"><%= t("decidim_sectorial_scope_id", scope: "activemodel.attributes.problem") %></p>
-        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_technological_scope_id).name  %></p>
+        <p class="uppercase mb-4"><%= translated_attribute current_organization.scopes.find_by(id: @problem.decidim_technological_scope_id).name %></p>
       </div>
     <% end %>
   </div>

data/app/views/decidim/problems/problems/show.html.erb

@@ -35,4 +35,3 @@
     <%= render partial: "sidebar_data" %>
   <% end %>
 <% end %>
-

data/app/views/decidim/sdgs/sdgs/index.html.erb

@@ -25,11 +25,11 @@
         </div>
       </div>
     </div>
-    
+
     <div id="ods-container">
       <%= render partial: "ods" %>
     </div>
-    
+
     <div id="objective-container">
       <%= render partial: "objectives" %>
     </div>

data/app/views/decidim/sdgs/sdgs_filter/_modal.html.erb

@@ -15,7 +15,7 @@
           idx+= 1
           idx_str= idx.to_s.rjust(2, "0") %>
           <div class="sdg-cell" data-value="<%= sdg_code %>">
-          <%= image_pack_tag "media/images/ods-#{idx_str}.svg", alt: "Logo SDG #{idx_str}"%>
+          <%= image_pack_tag "media/images/ods-#{idx_str}.svg", alt: "Logo SDG #{idx_str}" %>
             <div class="text">
               <p><%= "#{idx_str}. #{t_sdg(sdg_code)}" %></p>
             </div>
@@ -28,8 +28,5 @@
         <a class="button button__sm md:button__lg button__secondary" data-close="" role="button"><%= t(".close") %></a>
       </div>
     </div>
-  
   </div>
 </div>
-
-

data/app/views/decidim/solutions/admin/solutions/_form.html.erb

@@ -56,7 +56,7 @@
       <%= form.hidden_field :decidim_challenges_challenge_id, value: @form.try(:challenge) ? @form.try(:challenge).id : '' %>
     <% else %>
       <%= form.hidden_field :decidim_problems_problem_id, value: @form.try(:problem) ? @form.try(:problem).id : '' %>
-      <div class="card-section"">
+      <div class="card-section">
         <div class="row column">
           <%= form.select :decidim_challenges_challenge_id,
                             @form.select_challenge_collection,

data/app/views/decidim/solutions/admin/solutions/edit.html.erb

@@ -11,7 +11,7 @@
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
-      
+
           <% if solution.published? %>
             <%= link_to t("actions.unpublish", scope: "decidim.solutions.admin"), solution_publish_path(solution), method: :delete, class: "button button__sm button__secondary" %>
           <% else %>

data/app/views/decidim/solutions/admin/solutions/show.html.erb

@@ -42,7 +42,7 @@
           <div class="row column">
             <span class="component__show-description"><%= t ".description" %></span>
             <p class="component__show-text">
-              <%= decidim_sanitize_editor_admin translated_attribute solution.description  %>
+              <%= decidim_sanitize_editor_admin translated_attribute solution.description %>
             </p>
           </div>
         </div>
@@ -111,4 +111,3 @@
     <% end %>
   </div>
 </div>
-

data/app/views/decidim/solutions/solutions/_sidebar_data.html.erb

@@ -14,7 +14,7 @@
             <p class="uppercase mb-4"><%= t(@solution.challenge.state, scope: "decidim.challenges.states") %></p>
           <% else %>
             <p class="uppercase mb-4"><%= t(@solution.project_status, scope: "decidim.solutions.solutions.form.project_statuses") %></p>
-          <% end %>  
+          <% end %>
         </div>
       <% end %>
     </div>
@@ -77,7 +77,7 @@
       </div>
     <% end %>
   </div>
-  
+
   <% if has_problem? %>
     <% if @solution.problem.challenge.sdg_code %>
       <div class="text-sm flex flex-col items-center gap-1">

data/app/views/decidim/solutions/solutions/show.html.erb

@@ -14,7 +14,7 @@
     <% if has_problem? %>
       <h3 class="h4">
         <span class="title"><%= t("problem", scope: "activemodel.attributes.solution") %></span>:
-        <%= link_to translated_attribute(@solution.problem.title), Decidim::ResourceLocatorPresenter.new(@solution.problem).path %><br />
+        <%= link_to translated_attribute(@solution.problem.title), Decidim::ResourceLocatorPresenter.new(@solution.problem).path %><br>
         <span class="title"><%= t("challenge", scope: "activemodel.attributes.problem") %></span>:
         <%= link_to translated_attribute(@solution.problem.challenge.title), Decidim::ResourceLocatorPresenter.new(@solution.problem.challenge).path %></strong>
       </h3>

data/config/locales/ca.yml

@@ -1136,7 +1136,8 @@ ca:
         exports:
           solutions: "Solucions"
           export:
-            author: "Autor"
+            author_name: "Nom autor"
+            author_email: "Email autor"
             title: "Títol"
             description: "Descripció"
             status: "Estat"

data/config/locales/en.yml

@@ -1138,7 +1138,8 @@ en:
         exports:
           solutions: "Solutions"
           export:
-            author: "Author"
+            author_name: "Author name"
+            author_email: "Author email"
             title: "Title"
             description: "Description"
             status: "Status"

data/config/locales/es.yml

@@ -1143,7 +1143,8 @@ es:
         exports:
           solutions: "Soluciones"
           export:
-            author: "Autor"
+            author_name: "Nombre autor"
+            author_email: "Email autor"
             title: "Título"
             description: "Descripción"
             status: "Estado"

data/db/migrate/20250902145427_change_user_to_author_in_challenges_surveys.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class ChangeUserToAuthorInChallengesSurveys < ActiveRecord::Migration[6.1]
+  class ChallengeSurvey < ApplicationRecord
+    self.table_name = "decidim_challenges_surveys"
+  end
+
+  def up
+    rename_column :decidim_challenges_surveys, :decidim_user_id, :decidim_author_id
+
+    remove_index :decidim_challenges_surveys, name: "decidim_challenges_surveys_user_challenge_unique", if_exists: true
+    remove_index :decidim_challenges_surveys, name: "index_decidim_challenges_surveys_on_decidim_user_id", if_exists: true
+
+    add_index :decidim_challenges_surveys,
+              [:decidim_author_id, :decidim_challenge_id],
+              unique: true,
+              name: "decidim_challenges_surveys_author_challenge_unique"
+  end
+
+  def down
+    remove_index :decidim_challenges_surveys, name: "decidim_challenges_surveys_author", if_exists: true
+    remove_index :decidim_challenges_surveys, name: "decidim_challenges_surveys_author_challenge_unique", if_exists: true
+
+    rename_column :decidim_challenges_surveys, :decidim_author_id, :decidim_user_id
+
+    add_index :decidim_challenges_surveys,
+              [:decidim_user_id, :decidim_challenge_id],
+              unique: true,
+              name: "decidim_challenges_surveys_user_challenge_unique"
+
+    add_index :decidim_challenges_surveys,
+              :decidim_user_id,
+              name: "index_decidim_challenges_surveys_on_decidim_user_id"
+  end
+end

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

@@ -54,6 +54,6 @@ FactoryBot.define do
 
   factory :survey, class: "Decidim::Challenges::Survey" do
     challenge
-    user
+    author factory: [:user]
   end
 end

data/lib/decidim/challenges/version.rb

@@ -4,11 +4,11 @@ module Decidim
   # This holds the decidim-meetings version.
   module Challenges
     def self.version
-      "0.6.0"
+      "0.7.3"
     end
 
     def self.decidim_version
-      "~> 0.27"
+      "~> 0.29"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-challenges
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-07 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,42 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-- !ruby/object:Gem::Dependency
-  name: decidim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-- !ruby/object:Gem::Dependency
-  name: decidim-dev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.29'
 description: Articulates the collective action of diverse actors in order to address
   shared challenges and the problems that derive from them across the territory.
 email:
@@ -268,6 +240,7 @@ files:
 - db/migrate/20210427091033_remove_require_null_in_problems_for_solutions.rb
 - db/migrate/20220407110503_add_card_image_to_challenges.rb
 - db/migrate/20240919094714_add_public_fields_to_solutions.rb
+- db/migrate/20250902145427_change_user_to_author_in_challenges_surveys.rb
 - lib/decidim/challenges.rb
 - lib/decidim/challenges/admin.rb
 - lib/decidim/challenges/admin_engine.rb
@@ -303,14 +276,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.1
+      version: 3.2.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A decidim challenges module