app/commands/decidim/proposals/admin/import_proposals.rb in decidim-proposals-0.24.3 vs app/commands/decidim/proposals/admin/import_proposals.rb in decidim-proposals-0.25.0.rc1

@@ -37,19 +37,21 @@
               original_proposal,
               author: proposal_author,
               action_user: form.current_user,
               extra_attributes: {
                 "component" => target_component
-              }
+              }.merge(proposal_answer_attributes(original_proposal))
             )
           end.compact
         end
 
         def proposals
-          Decidim::Proposals::Proposal
-            .where(component: origin_component)
-            .where(state: proposal_states)
+          @proposals = Decidim::Proposals::Proposal
+                       .where(component: origin_component)
+                       .where(state: proposal_states)
+          @proposals = @proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
+          @proposals
         end
 
         def proposal_states
           @proposal_states = @form.states
 
@@ -59,10 +61,14 @@
           end
 
           @proposal_states
         end
 
+        def proposal_scopes
+          @form.scopes
+        end
+
         def origin_component
           @form.origin_component
         end
 
         def target_component
@@ -75,9 +81,20 @@
           end
         end
 
         def proposal_author
           form.keep_authors ? nil : @form.current_organization
+        end
+
+        def proposal_answer_attributes(original_proposal)
+          return {} unless form.keep_answers
+
+          {
+            answer: original_proposal.answer,
+            answered_at: original_proposal.answered_at,
+            state: original_proposal.state,
+            state_published_at: original_proposal.state_published_at
+          }
         end
       end
     end
   end
 end