Simplify code and make fetch function private

Author: momo3404

app/presenters/api/v2/plan_presenter.rb

@@ -4,9 +4,9 @@ module Api
   module V2
     # Helper class for the API V2 project / DMP
     class PlanPresenter
-      attr_reader :data_contact, :contributors, :costs
+      attr_reader :data_contact, :contributors, :costs, :complete_plan_data
 
-      def initialize(plan:)
+      def initialize(plan:, complete: false)
         @contributors = []
         return unless plan.present?
 
@@ -22,6 +22,8 @@ def initialize(plan:)
         end
 
         @costs = plan_costs(plan: @plan)
+
+        @complete_plan_data = fetch_all_q_and_a if complete
       end
 
       # Extract the ARK or DOI for the DMP OR use its URL if none exists
@@ -35,6 +37,8 @@ def identifier
         Identifier.new(value: Rails.application.routes.url_helpers.api_v2_plan_url(@plan))
       end
 
+      private
+
       # Fetch all questions and answers from a plan, regardless of theme
       def fetch_all_q_and_a
         return [] unless @plan.questions.present?
@@ -51,8 +55,6 @@ def fetch_all_q_and_a
         end
       end
 
-      private
-
       # Retrieve the answers that have the Budget theme
       def plan_costs(plan:)
         theme = Theme.where(title: 'Cost').first

app/views/api/v2/plans/_show.json.jbuilder

@@ -4,7 +4,7 @@
 
 json.schema 'https://github.com/RDA-DMP-Common/RDA-DMP-Common-Standard/tree/master/examples/JSON/JSON-schema/1.0'
 
-presenter = Api::V2::PlanPresenter.new(plan: plan)
+presenter = Api::V2::PlanPresenter.new(plan: plan, complete: @complete)
 
 # Note the symbol of the dmproadmap json object
 # nested in extensions which is the container for the json template object, etc.
@@ -71,7 +71,7 @@ unless @minimal
 
     if @complete
       json.complete_plan do
-        q_and_a = presenter.send(:fetch_all_q_and_a)
+        q_and_a = presenter.complete_plan_data
         next if q_and_a.blank?
 
         json.array! q_and_a do |item|