decidim-challenges 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bea652eb21f13814310b3f2010678bf606a89eb0b6f643d52b7618ada9b22f
-  data.tar.gz: 0b54f8699e24dbdb5960300a36fad5d42e0c5a52dfa67d4302a4fc2395a58623
+  metadata.gz: 95e745fe3d49e802946f403938a6b11603b9110cb08f81407c8fa5810c51dfbf
+  data.tar.gz: a24fcfa528d1023b365122e17ea937da6f0e5fb807b5b30fcfad2feed0acdb43
 SHA512:
-  metadata.gz: d5aeda521250172c335e590e38a3375ce529c2553db76348dd291829fd42ef8cd6dd5d5d19a67a7b15c20906c6e50315e652a9ab12e4b5e86ab45df30abb21a7
-  data.tar.gz: 62661ef946f28d42006ebb6d1a29f296955bbed4672aaf07295bf0b92e9b0dd6ebd1200e9dc26721eb27cae04819f0a5a1055b2dcace77ff0be28877f4dd7b56
+  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

@@ -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/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/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/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

@@ -16,6 +16,8 @@ module Decidim
           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,
         }
@@ -63,6 +65,14 @@ 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

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,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Challenges
     def self.version
-      "0.7.0"
+      "0.7.3"
     end
 
     def self.decidim_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-challenges
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -240,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