12193 remove json blob for Answers, remove internal_name etc, and use nested forms to save Answers

Gemfile

@@ -79,6 +79,8 @@ group :development, :test do
   # Load environment variables from .env file in development
   gem "dotenv-rails"
 
+  # gem 'active_record_query_trace'
+
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem "byebug"
   gem "pry"

app/controllers/admin/questions_controller.rb

@@ -11,7 +11,7 @@ def index
     @question_sets = QuestionSet.find_for_division(selected_division_or_root)
     if @question_sets.any?
       @question_set = params.key?(:qset) ? QuestionSet.find(params[:qset]) : @question_sets.first
-      @questions = ActiveModel::Serializer::CollectionSerializer.new(top_level_questions(@question_set))
+      @questions = ActiveModel::Serializer::CollectionSerializer.new(top_level_questions(@question_set), for_questions_view: true)
       @selected_division_depth = selected_division.depth
     end
   end

app/controllers/admin/response_sets_controller.rb

@@ -35,6 +35,7 @@ def update
 
     # Add updater id to params
     adjusted_params = response_set_params.merge(updater_id: current_user.id)
+    #adjusted_params = handle_json_attr_values(adjusted_params, params)
     # If there was a conflict and "Overwrite" was clicked, update the lock version to the one pulled
     # from the database when the warning was displayed. We do this instead of just ignoring the
     # lock_version in case someone made further changes since the warning was displayed. This way,
@@ -60,6 +61,10 @@ def destroy
 
   private
 
+  def handle_json_attr_values(adjusted_params, params)
+
+  end
+
   def handle_conflict
     @conflict = true
     @tab = 'questions'
@@ -74,7 +79,32 @@ def resolve_polymorphic(type, id)
   end
 
   def response_set_params
-    params.require(:response_set).permit!
+    params.require(:response_set).permit(:id, :loan_id, :question_set_id, :lock_version,
+      answers_attributes: [:id,
+        :question_id,
+        :text_data,
+        :numeric_data,
+        :not_applicable,
+        :boolean_data,
+        linked_document_data: [:url, :start_cell, :end_cell],
+        business_canvas_data: [
+          :key_partners,
+          :key_activities,
+          :key_resources,
+          :value_propositions,
+          :customer_relationships,
+          :channels,
+          :customer_segments,
+          :cost_structure,
+          :revenue_streams
+        ],
+        breakeven_data: [
+          :periods,
+          :units,
+          fixed_costs: [:name, :amount],
+          products: [:name, :description, :unit, :price, :percentage_of_sales, :quantity, :cost]
+        ]
+      ])
   end
 
   def display_path

app/controllers/concerns/questionnaire_renderable.rb

@@ -9,8 +9,9 @@ def prep_questionnaire(json: true)
     @question_sets = QuestionSet.find_for_division(@loan_division)
     unless @question_sets.empty?
       @question_set ||= params.key?(:qset) ? QuestionSet.find(params[:qset]) : @question_sets.first
-      @response_set ||= ResponseSet.find_or_initialize_by(loan: @loan, question_set: @question_set)
-      @root = LoanFilteredQuestion.new(@question_set.root_group_preloaded, loan: @loan)
+      @response_set ||= ResponseSet.includes(:answers).find_or_initialize_by(loan: @loan, question_set: @question_set)
+      #@root = LoanFilteredQuestion.new(@question_set.root_group_preloaded, loan: @loan)
+      @root = LoanFilteredQuestion.new(@question_set.root_group_preloaded, loan: @loan, response_set: @response_set)
       @questions_json = @root.children.map { |q| FilteredQuestionSerializer.new(q) }.to_json if json
     end
   end

app/helpers/responses_helper.rb

@@ -1,25 +1,25 @@
 module ResponsesHelper
-  def display_value_for_number(response)
-    return if !response.has_number?
-    if response.has_currency?
-      "#{prefix(response)}#{number_with_delimiter(response.number)} #{postfix(response)}"
-    elsif response.has_percentage?
-      "#{number_with_delimiter(response.number)}%"
+  def display_value_for_number(question, answer: nil, response_set: nil)
+    return if !question.has_number? || answer.nil?
+    if question.has_currency?
+      "#{prefix(question, response_set)}#{number_with_delimiter(answer.number)} #{postfix(question, response_set)}"
+    elsif question.has_percentage?
+      "#{number_with_delimiter(answer.number)}%"
     else
-      number_with_delimiter(response.number)
+      number_with_delimiter(answer.number)
     end
   end
 
-  def prefix(response)
-    if response.has_currency?
-      response.loan.currency.try(:short_symbol)
+  def prefix(question, response_set)
+    if question.has_currency?
+      response_set.loan.currency.try(:short_symbol)
     end
   end
 
-  def postfix(response)
-    if response.has_currency?
-      response.loan.currency.try(:code)
-    elsif response.has_percentage?
+  def postfix(question, response_set)
+    if question.has_currency?
+      response_set.loan.currency.try(:code)
+    elsif question.has_percentage?
       "%"
     end
   end

app/helpers/translations_helper.rb

@@ -24,7 +24,7 @@ def locale_options
   end
 
   def translate_boolean(bool)
-    t(bool ? "reply_yes" : "reply_no")
+    t(bool ? "reply_true" : "reply_false")
   end
 end
 

app/models/answer.rb

@@ -0,0 +1,179 @@
+class Answer < ApplicationRecord
+  belongs_to :response_set,  optional: false
+  belongs_to :question, optional: false
+  delegate :data_type, to: :question
+  validate :question_is_not_group
+  validates_presence_of :question_id
+  validate :question_set_matches
+
+  before_save :ensure_json_format
+  before_save :clean_breakeven
+
+
+  def ensure_json_format
+    business_canvas_data = business_canvas_data.to_json
+    breakeven_data = breakeven_data.to_json
+  end
+
+  def clean_breakeven
+    return unless breakeven_data
+    clean_breakeven_products = []
+    if breakeven_data["products"]
+      breakeven_data["products"].each do |p|
+        clean_breakeven_products << p unless p.values.reject(&:blank?).empty?
+      end
+      breakeven_data["products"] = clean_breakeven_products
+    end
+    if breakeven_data["fixed_costs"]
+      clean_fixed_costs = []
+      breakeven_data["fixed_costs"].each do |fc|
+        clean_fixed_costs << fc unless fc.values.reject(&:blank?).empty?
+      end
+      breakeven_data["fixed_costs"] = clean_fixed_costs
+    end
+    unless question.question_set_id == response_set.question_set_id
+      raise "ERROR for answer #{id}: question set has id #{question.question_set_id}, response set has qset id #{response_set.question_set_id}"
+    end
+  end
+
+  def self.json_answer_blank?(answer_json)
+    answer_json.values.all?{|v| v.blank?}
+  end
+
+  def json_answer_blank?(answer_json)
+    answer_json.values.all?{|v| v.blank?}
+  end
+
+  def to_s
+    "RS: #{response_set.question_set.kind}, Q id: #{question.id}, Q: #{question.label.to_s} | NA: #{not_applicable}; text: #{text_data}; numeric: #{numeric_data}; boolean: #{boolean_data}; doc: #{linked_document_data}; breakeven: #{breakeven_data}; canvas: #{business_canvas_data}"
+  end
+
+  def blank?
+    !not_applicable &&
+    text_data.blank? &&
+    numeric_data.blank? &&
+    boolean_data.nil? &&
+    linked_document_data_blank? &&
+    business_canvas_blank? &&
+    breakeven_data_blank?
+  end
+
+  def applicable?
+    !not_applicable
+  end
+
+  def text
+    text_data
+  end
+
+  def boolean
+    boolean_data
+  end
+
+  def number
+    numeric_data
+  end
+  # can we get rid of rating as a concept? its very confusing. no it is limited to 1-5.
+  def rating
+    numeric_data
+  end
+
+  def breakeven_table
+    @breakeven_table ||= BreakevenTableQuestion.new(breakeven_data)
+  end
+
+  def breakeven_hash
+    @breakeven_hash ||= breakeven_table.data_hash
+  end
+
+  def business_canvas
+    business_canvas_data.symbolize_keys if business_canvas_data
+  end
+
+  def breakeven_report
+    @breakeven_report ||= breakeven_table.report
+  end
+
+  def linked_document_data_blank?
+    linked_document_data.blank? || linked_document_data.values.all?{ |v| v.blank? }
+  end
+
+  def business_canvas_blank?
+    business_canvas_data.blank? || self.json_answer_blank?(business_canvas_data)
+  end
+
+  def breakeven_data_blank?
+    breakeven_data.blank? || self.json_answer_blank?(breakeven_data)
+  end
+
+  def linked_document
+    if linked_document_data.present?
+      LinkedDocument.new(linked_document_data.symbolize_keys)
+    else
+      nil
+    end
+  end
+
+  #TODO: can remove after answers migration?
+  def question_set_matches
+    question.question_set_id == response_set.question_set_id
+  end
+
+  # temp method for spr 2022 overhaul
+  def raw_value
+    json = {}
+    json["not_applicable"] = self.not_applicable ? "yes" : "no"
+    if self.text_data.present?
+      json["text"] = self.text_data
+    end
+    unless self.boolean_data.nil?
+      json["boolean"] =  self.boolean_data ? "yes" : "no"
+    end
+    if self.breakeven_data.present?
+      json["breakeven"] = self.breakeven_data
+    end
+    if self.business_canvas_data.present?
+      json["business_canvas"] = self.business_canvas_data
+    end
+    if self.numeric_data.present?
+      if self.question.data_type == "range"
+        json["rating"] = self.numeric_data
+      else
+        json["number"] = self.numeric_data
+      end
+    end
+    if self.linked_document_data.present?
+      json["url"] = self.linked_document_data["url"]
+      json["start_cell"] = self.linked_document_data["start_cell"]
+      json["end_cell"] = self.linked_document_data["end_cell"]
+    end
+  end
+
+  def question_is_not_group
+    question.data_type != "group"
+  end
+
+  def question_set_matches
+    question.question_set_id == response_set.question_set_id
+  end
+
+  def answer_for_csv(allow_text_like_numeric: false)
+    return nil if not_applicable
+
+    case question.data_type
+    when "text"
+      text_data
+    when "number", "currency", "percentage", "range"
+      if allow_text_like_numeric || (true if Float(numeric_data) rescue false)
+       numeric_data.to_s
+      else
+        nil
+      end
+    when "boolean"
+      boolean_data.nil? ? nil : (boolean_data ? "yes" : "no")
+    # "breakeven" and "business_canvas" never exported to csv
+    else
+      raise "invalid question data type #{question.data_type}"
+    end
+  end
+end

app/models/calendar_event.rb

@@ -22,7 +22,6 @@ class CalendarEvent
   alias_method :has_precedent?, :has_precedent
 
   def self.build_for(item)
-    puts "item: #{item.inspect}"
     case item
     when BasicProject
       [new_project_start(item), new_project_end(item)]

app/models/concerns/progress_calculable.rb

@@ -18,46 +18,4 @@ def progress_pct
   def progress_type
     required? ? "normal" : "optional"
   end
-
-  protected
-
-  # If this is a required node, the numerator is the number of answered, required child questions,
-  # plus the numerators of any required child groups.
-  # If this is an optional node, the numerator is just the number of answered child questions,
-  # plus the numerators of any child groups.
-  def progress_numerator
-    return @progress_numerator if @progress_numerator
-    return @progress_numerator = 0 unless active?
-
-    @progress_numerator = progress_applicable_children.sum do |c|
-      (c.answered? && !c.group? ? 1 : 0) + c.progress_numerator
-    end
-  end
-
-  # If this is a required node, the denominator is the number of required child questions,
-  # plus the denominators of any required child groups.
-  # If this is an optional node, the denominator is just the total number of child questions,
-  # plus the denominators of any child groups.
-  def progress_denominator
-    return @progress_denominator if @progress_denominator
-    return @progress_denominator = 0 unless active?
-
-    @progress_denominator = progress_applicable_children.sum do |c|
-      (!c.group? ? 1 : 0) + c.progress_denominator
-    end
-  end
-
-  # Inactive questions should be ignored. Inactive questions only show when they are
-  # answered, and they are never required, so progress makes no sense. Retired questions should
-  # never show, so they should be excluded as well.
-  # If the current response is required, only count children that are also required.
-  def progress_applicable_children
-    children.select do |c|
-      if self.required?
-        c.active? && c.required?
-      else
-        c.active?
-      end
-    end
-  end
 end

app/models/data_export.rb

@@ -76,7 +76,12 @@ def task
   protected
 
   def insert_in_row(header_symbol, row_array, value)
-    row_array[header_symbols_to_indices[header_symbol]] = value
+    index = header_symbols_to_indices[header_symbol]
+    if index.nil?
+      raise "Header symbol #{header_symbol} not found in #{header_symbols_to_indices}. Failed to add #{value}"
+    else
+      row_array[index] = value
+    end
   end
 
   private
@@ -89,7 +94,7 @@ def hash_to_row(hash)
 
   # Builds a hash of header symbols to their appropriate indices in the row arrays.
   def header_symbols_to_indices
-    @header_symbols_to_indices = header_symbols.each_with_index.to_h
+    @header_symbols_to_indices ||= header_symbols.each_with_index.to_h
   end
 
   def set_name